aps-在制品库存增加字段记录上一个在制品状态，方便恢复原状态

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

@@ -355,7 +355,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(REMARK = '待加工','备料中',REMARK)")
+                    .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
 
@@ -2229,7 +2229,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 //            apsWorkInProgressInventoryService.updateById(apsWorkInProgressInventoryDo);
             apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                     .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, apsBlankOrderDo.getId())
-                    .setSql("REMARK = WORKINPROCESSSTATUS")
+                    .setSql("PREVIOUSWORKINPROCESSSTATUS = WORKINPROCESSSTATUS")
                     .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, SaveConstans.WorkInProgressStatus.WAIT_WORK)
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .eq(ApsWorkInProgressInventoryDo::getId, req.getProgressId()));
@@ -2622,7 +2622,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(REMARK = '待加工','备料中',REMARK)")
+                    .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
             //更新坯料计划该字段为空
@@ -3531,7 +3531,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(REMARK = '待加工','备料中',REMARK)")
+                        .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, delBatchNumberList));
 //            //更新坯料计划该字段为空
@@ -3591,7 +3591,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             if (ObjectUtil.isNotEmpty(addBatchNumberList)) {
                 apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                         .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, req.getBlankId())
-                        .setSql("REMARK = WORKINPROCESSSTATUS")
+                        .setSql("PREVIOUSWORKINPROCESSSTATUS = WORKINPROCESSSTATUS")
                         .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, "待加工")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));

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

@@ -1198,7 +1198,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(REMARK = '待加工','备料中',REMARK)")
+                        .setSql("WORKINPROCESSSTATUS = IF(PREVIOUSWORKINPROCESSSTATUS = '待加工','备料中',PREVIOUSWORKINPROCESSSTATUS)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
 

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsWorkInProgressInventoryDo.java

@@ -174,6 +174,11 @@ public class ApsWorkInProgressInventoryDo extends BaseDo implements Serializable
      */
     private BigDecimal actualsinglerollweight;
 
+    /**
+     * 上一个在制品状态
+     */
+    private String previousworkinprocessstatus;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }