aps-在制品库存状态修改

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(IFNULL(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(IFNULL(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(IFNULL(PREVIOUSWORKINPROCESSSTATUS,'备料中') = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, delBatchNumberList));
 //            //更新坯料计划该字段为空

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(IFNULL(PREVIOUSWORKINPROCESSSTATUS,'备料中') = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));