aps-撤回订单时，释放备料或领料信息

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

@@ -2397,6 +2397,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .setSql("WORKINPROCESSSTATUS = IF(REMARK = '待加工','备料中',REMARK)")
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
+            //更新坯料计划该字段为空
+            apsBlankOrderService.update(new UpdateWrapper<ApsBlankOrderDo>().lambda()
+                    .set(ApsBlankOrderDo::getPreparematerialbatchno, null)
+                    .eq(ApsBlankOrderDo::getId, apsBlankOrderDo.getId()));
         }
 
         //查询此订单的其他任一一个坯料计划的Id，重新更新订单的状态
@@ -3268,6 +3272,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .setSql("WORKINPROCESSSTATUS = IF(REMARK = '待加工','备料中',REMARK)")
                     .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                     .in(ApsWorkInProgressInventoryDo::getBatchnumber, delBatchNumberList));
+            //更新坯料计划该字段为空
+            apsBlankOrderService.update(new UpdateWrapper<ApsBlankOrderDo>().lambda()
+                    .set(ApsBlankOrderDo::getPreparematerialbatchno, null)
+                    .eq(ApsBlankOrderDo::getId, apsBlankOrderDo.getId()));
         }
 
         //更新坯料计划的第一道工序作业的所有工序作业明细的待加工料卷批次号=领料批次号逗号拼接

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

@@ -1032,6 +1032,11 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                         .setSql("WORKINPROCESSSTATUS = IF(REMARK = '待加工','备料中',REMARK)")
                         .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
                         .in(ApsWorkInProgressInventoryDo::getBatchnumber, batchNumberList));
+
+                //更新坯料计划该字段为空
+                apsBlankOrderService.update(new UpdateWrapper<ApsBlankOrderDo>().lambda()
+                        .set(ApsBlankOrderDo::getPreparematerialbatchno, null)
+                        .eq(ApsBlankOrderDo::getId, apsBlankOrderDo.getId()));
             }
         }
         return R.ok();