aps-撤回发布时不要退回领料，取消排程时再退回备料在制品

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

@@ -333,10 +333,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         for (String productionOrderId : productionOrderIds) {
             apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
         }
-        //退料
-        for (String blankId : blankIds) {
-            removeBatchNumberByBlankId(blankId);
-        }
+//        //退料
+//        for (String blankId : blankIds) {
+//            removeBatchNumberByBlankId(blankId);
+//        }
         // 根据坯料ID 删除 备份数据
         ApsUtils.clearBackup(null);
         return R.ok();
@@ -2542,12 +2542,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             return R.error("坯料Id不能为空");
         }
         ApsBlankOrderDo apsBlankOrderDo = this.getById(req.getId());
-        removeBlankOrderAndChild(apsBlankOrderDo);
-
-        //物理删除相关的工序作业备份
-        this.baseMapper.deleteProcessBackupByBlankId(req.getId());
-        //物理删除相关的作业明细备份
-        this.baseMapper.deleteProcessEquBackupByBlankId(req.getId());
 
         //如果是否备料=是，备料对应在制品的备料计划ID=(空)，在制品状态=备料中
         if (ObjectUtil.isNotEmpty(apsBlankOrderDo.getPreparematerialbatchno())) {
@@ -2566,6 +2560,12 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     .set(ApsBlankOrderDo::getPreparematerialbatchno, null)
                     .eq(ApsBlankOrderDo::getId, apsBlankOrderDo.getId()));
         }
+        removeBlankOrderAndChild(apsBlankOrderDo);
+
+        //物理删除相关的工序作业备份
+        this.baseMapper.deleteProcessBackupByBlankId(req.getId());
+        //物理删除相关的作业明细备份
+        this.baseMapper.deleteProcessEquBackupByBlankId(req.getId());
 
         //查询此订单的其他任一一个坯料计划的Id，重新更新订单的状态
         CommonUpdateProductionStatusReq commonUpdateProductionStatusReq = new CommonUpdateProductionStatusReq();