aps-领料后，坯料计划所有作业明细的坯料批次号都提前更新为领料批次号，取消领料后需要清空坯料批次号

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

@@ -3904,6 +3904,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             });
             if (ObjectUtil.isNotEmpty(clearBachMaterialProcessEquList)) {
                 apsProcessOperationProcessEquService.updateBatchById(clearBachMaterialProcessEquList);
+                //删除所有的坯料批次号
+                List<String> needDelIdList = clearBachMaterialProcessEquList.stream().map(ApsProcessOperationProcessEquDo::getId).collect(Collectors.toList());
+                apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                        .set(ApsProcessOperationProcessEquDo::getBlankbatchnumber, "")
+                        .in(ApsProcessOperationProcessEquDo::getRoottaskid, needDelIdList));
             }
             updateOperationProcessEquList.forEach(equDo -> {
                 //剩余待开工卷数 =计划加工卷数-已开工卷数-已取消卷数
@@ -3918,6 +3923,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             });
             if (ObjectUtil.isNotEmpty(needUpdateProcessEquList)) {
                 apsProcessOperationProcessEquService.updateBatchById(needUpdateProcessEquList);
+                //更新所有的坯料批次号
+                for (ApsProcessOperationProcessEquDo equDo : needUpdateProcessEquList) {
+                    apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
+                            .set(ApsProcessOperationProcessEquDo::getBlankbatchnumber, equDo.getBachmaterialprocess())
+                            .eq(ApsProcessOperationProcessEquDo::getRoottaskid, equDo.getId()));
+                }
             }