Merge remote-tracking branch 'origin/master'

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

@@ -194,10 +194,10 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     public Page<ProductInfoVo> getPageByEhsd(ProductInfoSelectDto dto, IWrapper<ProductInfo> wrapper) {
         //根据产品名称/产品编号过滤
         if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
-            wrapper.and(q -> q.like("pi", ProductInfo::getName, dto.getKeyword()))
+            wrapper.and(q -> q.like("pi", ProductInfo::getName, dto.getKeyword())
                     .or().like("json_unquote(pi.ehsd_json -> '$.nameEnglish')", dto.getKeyword())
                     .or().like("pi", ProductInfo::getCode, dto.getKeyword())//产品编号
-                    .or().like("c.name", dto.getKeyword());//客户名称
+                    .or().like("c.name", dto.getKeyword()));//客户名称
         }
         //根据产品分类id过滤
         wrapper.eq("pi", ProductInfo::getProductClassifyId, dto.getProductClassifyId());
@@ -214,7 +214,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
             Map<Long, String> customerMap = customerService.mapKV(Customer::getId, Customer::getName, q -> q.in(Customer::getId, customerIds));
             for (ProductInfoVo record : records) {
                 ProductInfoEhsdJson productInfoEhsdJson = JSONObject.parseObject(record.getEhsdJson(), ProductInfoEhsdJson.class);
-                String customerName = customerMap.get(productInfoEhsdJson.getCustomerId());
+                String customerName = customerMap.get(Long.parseLong(productInfoEhsdJson.getCustomerId()));
                 productInfoEhsdJson.setCustomerName(customerName);
                 record.setEhsdJson(JSONObject.toJSONString(productInfoEhsdJson));
             }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionPlanServiceImpl.java

@@ -64,19 +64,23 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
 
         //获取工单信息
         List<Long> workOrderIds = records.stream().map(ProductionPlanVo::getWorkOrderId).collect(Collectors.toList());
-        List<WorkOrder> workOrderList = workOrderService.list(q -> q.in(WorkOrder::getId, workOrderIds));
-        Map<Long, WorkOrder> workOrderMap = workOrderList.stream().collect(Collectors.groupingBy(WorkOrder::getId,
-                Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-        //获取产品信息
-        List<Long> productIds = workOrderList.stream().map(WorkOrder::getProductId).collect(Collectors.toList());
-        List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
-        Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
-                Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-        for (ProductionPlanVo productionPlanVo : records) {
-            WorkOrder workOrder = workOrderMap.get(productionPlanVo.getWorkOrderId());
-            ProductInfo productInfo = productInfoMap.get(workOrder.getProductId());
-            if (ObjectUtil.isNotEmpty(productInfo)) {
-                productionPlanVo.setProductName(productInfo.getName());
+        if(ObjectUtil.isNotEmpty(workOrderIds)) {
+            List<WorkOrder> workOrderList = workOrderService.list(q -> q.in(WorkOrder::getId, workOrderIds));
+            Map<Long, WorkOrder> workOrderMap = workOrderList.stream().collect(Collectors.groupingBy(WorkOrder::getId,
+                    Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+            //获取产品信息
+            List<Long> productIds = workOrderList.stream().map(WorkOrder::getProductId).collect(Collectors.toList());
+            if(ObjectUtil.isNotEmpty(productIds)) {
+                List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
+                Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
+                        Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+                for (ProductionPlanVo productionPlanVo : records) {
+                    WorkOrder workOrder = workOrderMap.get(productionPlanVo.getWorkOrderId());
+                    ProductInfo productInfo = productInfoMap.get(workOrder.getProductId());
+                    if (ObjectUtil.isNotEmpty(productInfo)) {
+                        productionPlanVo.setProductName(productInfo.getName());
+                    }
+                }
             }
         }
         //赋值待排程数量