Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -412,7 +412,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             List<String> batchNumberList = Arrays.asList(apsBlankOrderDo.getPreparematerialbatchno().split(","));
             apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                     .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)
-                    .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
+                    .setSql("WORKINPROCESSSTATUS = IF(IF(PREVIOUSWORKINPROCESSSTATUS != '' && PREVIOUSWORKINPROCESSSTATUS is not null,PREVIOUSWORKINPROCESSSTATUS,'备料中') = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
 
@@ -3099,7 +3099,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             List<String> batchNumberList = Arrays.asList(apsBlankOrderDo.getPreparematerialbatchno().split(","));
             apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                     .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)
-                    .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
+                    .setSql("WORKINPROCESSSTATUS = IF(IF(PREVIOUSWORKINPROCESSSTATUS != '' && PREVIOUSWORKINPROCESSSTATUS is not null,PREVIOUSWORKINPROCESSSTATUS,'备料中') = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
             //更新坯料计划该字段为空
@@ -4025,7 +4025,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if (ObjectUtil.isNotEmpty(delBatchNumberList)) {
                 apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                         .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)
-                        .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
+                        .setSql("WORKINPROCESSSTATUS = IF(IF(PREVIOUSWORKINPROCESSSTATUS != '' && PREVIOUSWORKINPROCESSSTATUS is not null,PREVIOUSWORKINPROCESSSTATUS,'备料中') = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, delBatchNumberList));
 //            //更新坯料计划该字段为空

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -2951,6 +2951,9 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 if (StringUtils.isNotBlank(equDo.getProcessdeviceid())) {
                     wrapper.set(ApsProcessOperationProcessEquDo::getProcessdeviceid, equDo.getProcessdeviceid());
                 }
+                if (StringUtils.isNotBlank(equDo.getProcessdevicecode())) {
+                    wrapper.set(ApsProcessOperationProcessEquDo::getProcessdevicecode, equDo.getProcessdevicecode());
+                }
                 if (StringUtils.isNotBlank(equDo.getProcessdevice())) {
                     wrapper.set(ApsProcessOperationProcessEquDo::getProcessdevice, equDo.getProcessdevice());
                 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -1340,7 +1340,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 List<String> batchNumberList = Arrays.asList(apsBlankOrderDo.getPreparematerialbatchno().split(","));
                 apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                         .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)
-                        .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
+                        .setSql("WORKINPROCESSSTATUS = IF(IF(PREVIOUSWORKINPROCESSSTATUS != '' && PREVIOUSWORKINPROCESSSTATUS is not null,PREVIOUSWORKINPROCESSSTATUS,'备料中') = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -2241,9 +2241,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
     }
 
     private void insertReportNew(ApsReportRecordsDo apsReportRecordsDo, ApsProductionOrderDo apsProductionOrderDo, ApsBlankOrderDo apsBlankOrderDo, ApsProcessOperationDo apsProcessOperationDo, ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo, AspCheckItemsDo aspCheckItemsDo) {
-        apsReportRecordsDo.setReportorderno(apsProductionOrderDo.getOrderno());
-        apsReportRecordsDo.setReportcustomorderno(apsProductionOrderDo.getCustomorderno());
-        apsReportRecordsDo.setReportcustomname(apsProductionOrderDo.getCustomname());
+        apsReportRecordsDo.setReportorderno(apsBlankOrderDo.getOrderno());
+        apsReportRecordsDo.setReportcustomorderno(apsBlankOrderDo.getCustomorderno());
+        apsReportRecordsDo.setReportcustomname(apsBlankOrderDo.getCustomname());
         apsReportRecordsDo.setReportoutputorderproduct(apsBlankOrderDo.getOutputorderproduct());
         apsReportRecordsDo.setReportblanknumber(apsBlankOrderDo.getBlanknumber());
         apsReportRecordsDo.setReportprocessdevice(apsProcessOperationProcessEquDo.getProcessdevice());