问题处理

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -142,6 +142,10 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
         );
         //计算完工率
         salesContractDetailsVos.forEach(item -> {
+            if(ObjectUtil.isEmpty(item.getProductionQuantity())){
+                item.setCompletionRate(BigDecimal.ZERO);
+                return;
+            }
             BigDecimal multiply = BigDecimal.valueOf(100);
             if (item.getProductionQuantity().compareTo(BigDecimal.ZERO) != 0) {
                 multiply = item.getCompletedQuantity()

hx-jxst/src/main/resources/mapper/sales/SalesContractDetailsMapper.xml

@@ -6,7 +6,7 @@
             scd.id,
             scd.sales_contract_id,
             scd.product_id,
-            IFNULL( wo.production_quantity, 0 ) AS productionQuantity,
+            wo.production_quantity AS productionQuantity,
             (
                 SELECT
                     count( ptd.id )

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -225,6 +225,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         if(ObjectUtil.isNotEmpty(productBom)) {
             List<WorkOrderBom> workOrderBomList = BeanUtil.copyToList(productBom.getBomDetailVoList(), WorkOrderBom.class);
             if (ObjectUtil.isNotEmpty(workOrderBomList)) {
+                workOrderBomList.forEach(item->item.setId(null));
                 workOrderBomService.saveBatch(workOrderBomList);
             }
         }
@@ -485,7 +486,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         ObsFileUtil.editFile(dto.getFileList(), dto.getId());
 
         //发消息
-        if (ObjectUtil.isNotEmpty(workOrder.getResearchStatus()) && workOrder.getResearchStatus() == 0 && dto.getResearchStatus() == 1) {
+        if (ObjectUtil.isNotEmpty(workOrder.getResearchStatus()) && workOrder.getResearchStatus() == 0 && Objects.equals(dto.getResearchStatus(),1)) {
             if ("1".equals(workOrder.getIsCustomized())) {
                 //定制工单 推送消息给工单配置的负责人
                 DynamicDataSourceContextHolder.push(SourceConstant.BASE);