问题处理

hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java

@@ -46,6 +46,14 @@ public class ProductInfoController {
     }
 
     /**
+     * 产品库组合产品分页
+     */
+    @PostMapping("/getCombinationPage")
+    public Page<ProductInfoVo> getCombinationPage(@RequestBody ProductInfoSelectDto dto) {
+        return productInfoService.getCombinationPage(dto);
+    }
+
+    /**
      * 产品库明细
      */
     @PostMapping("/detail")

hx-item/src/main/java/com/fjhx/item/entity/product/dto/ProductInfoSelectDto.java

@@ -29,7 +29,14 @@ public class ProductInfoSelectDto extends BaseSelectDto {
      */
     private Long productClassifyId;
 
-    /**维多利亚当前周期*/
+    /**
+     * 维多利亚当前周期
+     */
     private Integer lifeCycle;
 
+    /**
+     * 过滤组合
+     */
+    private Integer combination;
+
 }

hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -32,6 +32,11 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
     Page<ProductInfoVo> getPageByWdly(ProductInfoSelectDto dto);
 
     /**
+     * 获取产品分组
+     */
+    Page<ProductInfoVo> getCombinationPage(ProductInfoSelectDto dto);
+
+    /**
      * 产品库明细
      */
     ProductInfoVo detail(Long id);

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -30,7 +30,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -68,6 +67,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         );
         //计算并根据生命周期过滤
         wrapper.eq("IF(DATEDIFF(now(),json_unquote( victoriatourist_json -> '$.growUpDay' ))> 0,3,IF(DATEDIFF(now(), json_unquote(victoriatourist_json -> '$.newProductsDay' ))> 0, 2, 1 ))", dto.getLifeCycle());
+        wrapper.eq("json_unquote( victoriatourist_json -> '$.combination' )", dto.getCombination());
         Page<ProductInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<ProductInfoVo> records = page.getRecords();
@@ -146,6 +146,13 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     }
 
     @Override
+    public Page<ProductInfoVo> getCombinationPage(ProductInfoSelectDto dto) {
+        dto.setCombination(1);
+        Page<ProductInfoVo> page = getPage(dto);
+        return page;
+    }
+
+    @Override
     public ProductInfoVo detail(Long id) {
         ProductInfo ProductInfo = this.getById(id);
         ProductInfoVo result = BeanUtil.toBean(ProductInfo, ProductInfoVo.class);

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -5,6 +5,7 @@
     <select id="getPage" resultType="com.fjhx.item.entity.product.vo.ProductInfoVo">
         SELECT
             pi.id,
+            pi.definition,
             pi.product_classify_id,
             pi.CODE,
             pi.type,

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

@@ -157,27 +157,27 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
                 }
             }
             //赋值到货状态
-            List<Long> pids = list.stream().map(PurchaseVo::getId).collect(Collectors.toList());
-            List<Arrival> arrivalList = arrivalService.list(q -> q.in(Arrival::getPurchaseId, pids));
-            Map<Long, List<Arrival>> arrivalMap = arrivalList.stream().collect(Collectors.groupingBy(Arrival::getPurchaseId));
-            for (PurchaseVo purchaseVo : list) {
-                List<Arrival> list1 = arrivalMap.get(purchaseVo.getId());
-                if(ObjectUtils.isEmpty(list1)){
-                    purchaseVo.setArrivalStatus(0);
-                    continue;
-                }
-                List<Arrival> arrivalCount = list1.stream().filter(q -> q.equals(1)).collect(Collectors.toList());
-                if(arrivalCount.size()==0){
-                    //未到货
-                    purchaseVo.setArrivalStatus(0);
-                }else if(arrivalCount.size()<=list1.size()){
-                    //部分到货
-                    purchaseVo.setArrivalStatus(1);
-                }else{
-                    //完全到货
-                    purchaseVo.setArrivalStatus(2);
-                }
-            }
+//            List<Long> pids = list.stream().map(PurchaseVo::getId).collect(Collectors.toList());
+//            List<Arrival> arrivalList = arrivalService.list(q -> q.in(Arrival::getPurchaseId, pids));
+//            Map<Long, List<Arrival>> arrivalMap = arrivalList.stream().collect(Collectors.groupingBy(Arrival::getPurchaseId));
+//            for (PurchaseVo purchaseVo : list) {
+//                List<Arrival> list1 = arrivalMap.get(purchaseVo.getId());
+//                if(ObjectUtils.isEmpty(list1)){
+//                    purchaseVo.setArrivalStatus(0);
+//                    continue;
+//                }
+//                List<Arrival> arrivalCount = list1.stream().filter(q -> q.equals(1)).collect(Collectors.toList());
+//                if(arrivalCount.size()==0){
+//                    //未到货
+//                    purchaseVo.setArrivalStatus(0);
+//                }else if(arrivalCount.size()<=list1.size()){
+//                    //部分到货
+//                    purchaseVo.setArrivalStatus(1);
+//                }else{
+//                    //完全到货
+//                    purchaseVo.setArrivalStatus(2);
+//                }
+//            }
         }
         return page;
     }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/deliver/vo/DeliverGoodsDetailsVo.java

@@ -17,6 +17,11 @@ import java.math.BigDecimal;
 public class DeliverGoodsDetailsVo extends DeliverGoodsDetails {
 
     /**
+     * 产品id
+     */
+    private Long productId;
+
+    /**
      * 产品类型
      */
     private String type;

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

@@ -96,6 +96,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
             Long goodid = goodidmap.get(deliverGoodsDetailsVo.getPurchaseDetailId());
             ProductInfo productInfo = productInfoMap.get(goodid);
             if (ObjectUtil.isNotEmpty(productInfo)) {
+                deliverGoodsDetailsVo.setProductId(productInfo.getId());
                 deliverGoodsDetailsVo.setType(productInfo.getType());
                 deliverGoodsDetailsVo.setCode(productInfo.getCode());
                 deliverGoodsDetailsVo.setName(productInfo.getName());

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -186,6 +186,11 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             item.setVictoriatouristJson(json.toJSONString());
         });
 
+        //赋值产品分类
+        productClassifyService.attributeAssign(stockVos, StockVo::getProductClassifyId, (item, productClassify) -> {
+            item.setProductClassifyName(productClassify.getName());
+        });
+
         //赋值仓库名称
         warehouseService.attributeAssign(stockVos, StockVo::getWarehouseId, (item, warehouse) -> {
             item.setWarehouseName(warehouse.getName());

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -268,6 +268,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 3, stockList, stockWaitDto.getWarehouseId());
         //保存出入库明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
+
+        //创建待质检记录
     }
 
     @Override