feature 代码提交

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

@@ -253,7 +253,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         List<String> collect = apsBlankOrderDos.stream().map(ApsBlankOrderDo::getProductionorderid).distinct().collect(Collectors.toList());
         // 更新工序作业的状态
         apsProcessOperationDao.publishCancel(collect);
-
+        // 根据坯料ID 删除 备份数据
+        apsProcessOperationBackupDao.deletedByBlankId(blankIds,null);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIds,null);
         return R.ok();
     }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.*;
 import com.rongwei.bscommon.sys.service.ApsProductionOrderService;
+import com.rongwei.bsentity.domain.ApsBlankOrderDo;
 import com.rongwei.bsentity.domain.ApsProductionOrderDo;
 import com.rongwei.rwcommon.base.R;
 import org.slf4j.Logger;
@@ -29,6 +30,10 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private ApsProductDetailDao apsProductDetailDao;
     @Autowired
     private ApsProcessOperationProcessEquDao apsProcessOperationProcessEquDao;
+    @Autowired
+    private ApsProcessOperationBackupDao apsProcessOperationBackupDao;
+    @Autowired
+    private ApsProcessOperationProcessEquBackupDao apsProcessOperationProcessEquBackupDao;
 
     public static final String ERROR_MSG ="%s上诉订单的排程交货期大于承诺交货期";
 
@@ -64,6 +69,12 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         apsProductDetailDao.publish(productionOrderIds);
         // 更新订单的生产状态
         this.baseMapper.publish(productionOrderIds);
+        // 根据坯料ID 删除 备份数据
+        List<ApsBlankOrderDo> apsBlankOrderDos = apsBlankOrderDao.selectList(new LambdaQueryWrapper<ApsBlankOrderDo>()
+                .in(ApsBlankOrderDo::getProductionorderid, productionOrderIds));
+        List<String> blankIds = apsBlankOrderDos.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
+        apsProcessOperationBackupDao.deletedByBlankId(blankIds,null);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIds,null);
         return R.ok();
     }
 
@@ -83,6 +94,12 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         apsProductDetailDao.publish(productionOrderIds);
         // 更新订单的生产状态
         this.baseMapper.publishCancel(productionOrderIds);
+        List<ApsBlankOrderDo> apsBlankOrderDos = apsBlankOrderDao.selectList(new LambdaQueryWrapper<ApsBlankOrderDo>()
+                .in(ApsBlankOrderDo::getProductionorderid, productionOrderIds));
+        List<String> blankIds = apsBlankOrderDos.stream().map(ApsBlankOrderDo::getId).collect(Collectors.toList());
+        // 根据坯料ID 删除 备份数据
+        apsProcessOperationBackupDao.deletedByBlankId(blankIds,null);
+        apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankIds,null);
         return R.ok();
     }