问题处理

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

@@ -185,7 +185,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
             item.setProductHeight(rawMaterial.getHeight());
             item.setProductColor(rawMaterial.getColor());
         });
-        Map<Long, ContractProductBomVo> rawMaterialMap = contractProductBomVoList.stream().collect(Collectors.toMap(ContractProductBomVo::getContractProductId, Function.identity()));
+//        Map<Long, ContractProductBomVo> rawMaterialMap = contractProductBomVoList.stream().collect(Collectors.toMap(ContractProductBomVo::getContractProductId, Function.identity()));
 
         //获取生产进度列表
         List<Long> tIds = records.stream().map(ProductionOrderDetail::getId).collect(Collectors.toList());
@@ -233,12 +233,12 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
             }
 
-            //赋值原材料信息
-            ContractProductBomVo rawMaterial = rawMaterialMap.get(record.getContractDetailId());
-            if (ObjectUtil.isNotEmpty(rawMaterial)) {
-                record.setRawMaterialCode(rawMaterial.getProductCode());
-                record.setRawMaterialName(rawMaterial.getProductName());
-            }
+//            //赋值原材料信息
+//            ContractProductBomVo rawMaterial = rawMaterialMap.get(record.getContractDetailId());
+//            if (ObjectUtil.isNotEmpty(rawMaterial)) {
+//                record.setRawMaterialCode(rawMaterial.getProductCode());
+//                record.setRawMaterialName(rawMaterial.getProductName());
+//            }
 
             //赋值生产用时
             record.setUsageTime(0L);

hx-sale/src/main/java/com/fjhx/sale/flow/ContractFlow.java

@@ -67,10 +67,12 @@ public class ContractFlow extends FlowDelegate {
             contractProductList.forEach(item -> item.setExpendQuantity(item.getQuantity()));
         }
 
+        Long contractId = start(contract);
+
         //将code赋值给流程引擎
         submitData.put("code", contract.getCode());
 
-        return start(contract);
+        return contractId;
     }
 
     /**