问题处理

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/vo/PurchaseDetailVo.java

@@ -68,7 +68,7 @@ public class PurchaseDetailVo extends PurchaseDetail {
     /**
      * 发货记录列表
      */
-    private List<Object> deliverGoodsDetailList;
+    private Object deliverGoodsDetailList;
     /**
      * 到货记录列表
      */
@@ -80,5 +80,10 @@ public class PurchaseDetailVo extends PurchaseDetail {
     /**
      * 采购退货列表
      */
-    private List<Object> purchaseBackDetailsList;
+    private Object purchaseBackDetailsList;
+
+    /**
+     * 质检数量
+     */
+    private BigDecimal qualityQuantity;
 }

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/dto/SubscribeDetailSelectDto.java

@@ -48,4 +48,9 @@ public class SubscribeDetailSelectDto extends BaseSelectDto {
      */
     private Long deptId;
 
+    /**
+     * 不显示指定状态
+     */
+    private String neStatus;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -79,6 +79,10 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         // 维多利亚扩展根据到货仓库id过滤
         wrapper.eq("json_unquote(t2.victoriatourist_json -> '$.receiptWarehouseId')", dto.getReceiptWarehouseId());
         wrapper.eq("json_unquote(pi.victoriatourist_json -> '$.deptId')", dto.getDeptId());
+        //待采购过滤掉指定状态 例如不要 99 作废
+        wrapper.notIn("t1", SubscribeDetail::getStatus, dto.getNeStatus().split(","));
+
+
         wrapper.orderByDesc("t1", SubscribeDetail::getCreateTime);
 
         Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -166,7 +170,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
             List<Long> productIds = list.stream().map(SubscribeDetail::getBussinessId).collect(Collectors.toList());
             List<ProductInfoVo> productInfoVos = productInfoService.getListByProductIds(productIds);
             Map<Long, List<ProductInfoVo>> productMap = productInfoVos.stream().collect(Collectors.groupingBy(ProductInfoVo::getId));
-            for (SubscribeDetailVo  s: list) {
+            for (SubscribeDetailVo s : list) {
                 if (MapUtils.isNotEmpty(productMap)) {
                     ProductInfoVo p = productMap.get(s.getBussinessId()).get(0);
                     s.setProductCategory(p.getClassifyName());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -228,10 +228,12 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                 if (ObjectUtil.isEmpty(qualityDetails)) {
                     purchaseDetailVo.setQualifiedCount(BigDecimal.ZERO);
                     purchaseDetailVo.setNoQualifiedCount(BigDecimal.ZERO);
+                    purchaseDetailVo.setQualityQuantity(BigDecimal.ZERO);
                     continue;
                 }
                 purchaseDetailVo.setQualifiedCount(qualityDetails.getQualifiedCount());
                 purchaseDetailVo.setNoQualifiedCount(qualityDetails.getNoQualifiedCount());
+                purchaseDetailVo.setQualityQuantity(qualityDetails.getQualifiedCount().add(qualityDetails.getNoQualifiedCount()));
             }
         }
         //赋值发货信息
@@ -251,7 +253,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                         .map(DeliverGoodsDetailsVo::getDeliverGoodsQuantity)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
                 purchaseDetailVo.setDeliverGoodsQuantity(dgdCount);
-                purchaseDetailVo.setDeliverGoodsDetailList(Collections.singletonList(list1));
+                purchaseDetailVo.setDeliverGoodsDetailList(list1);
             }
         }
         //赋值到货信息
@@ -300,7 +302,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
                         .map(PurchaseBackDetails::getQuantity)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
                 purchaseDetailVo.setPurchaseBackQuantity(backCount);
-                purchaseDetailVo.setPurchaseBackDetailsList(Collections.singletonList(purchaseBackDetails));
+                purchaseDetailVo.setPurchaseBackDetailsList(purchaseBackDetails);
             }
         }
         result.setPurchaseDetailVoList(purchaseDetailVoList);