|
@@ -114,6 +114,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
private ApsProcessOperationProcessEquBackupService apsProcessOperationProcessEquBackupService;
|
|
|
@Autowired
|
|
|
private ReportCheckService reportCheckService;
|
|
|
+ @Autowired
|
|
|
+ private ApsProcessOperationProcessEquServiceImpl apsProcessOperationProcessEquServiceImpl;
|
|
|
|
|
|
|
|
|
@Override
|
|
@@ -252,10 +254,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
.set(ApsBlankOrderDo::getProductstatus, producttStatus)
|
|
|
.set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
|
|
|
});
|
|
|
- // 更新产品明细的生产状态
|
|
|
- apsProductDetailDao.publishCancel(blankIds);
|
|
|
+// // 更新产品明细的生产状态
|
|
|
+// apsProductDetailDao.publishCancel(blankIds);
|
|
|
// 更新订单的生产状态
|
|
|
apsProcessOperationDao.publishCancel(productionOrderIds);
|
|
|
+ //更新产品明细的生产状态
|
|
|
+ for (String productionOrderId : productionOrderIds) {
|
|
|
+ apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
|
|
|
+ }
|
|
|
// 根据坯料ID 删除 备份数据
|
|
|
ApsUtils.clearBackup(null);
|
|
|
return R.ok();
|
|
@@ -316,10 +322,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
.set(ApsBlankOrderDo::getProductstatus, producttStatus)
|
|
|
.set(ApsBlankOrderDo::getSchedulingstatus, schedulingstatus));
|
|
|
});
|
|
|
- // 更新产品明细的生产状态
|
|
|
- apsProductDetailDao.publishCancel(blankIds);
|
|
|
+// // 更新产品明细的生产状态
|
|
|
+// apsProductDetailDao.publishCancel(blankIds);
|
|
|
// 更新订单的生产状态
|
|
|
apsProcessOperationDao.publishCancel(productionOrderIds);
|
|
|
+ for (String productionOrderId : productionOrderIds) {
|
|
|
+ apsProcessOperationProcessEquServiceImpl.updateProductDetail(productionOrderId);
|
|
|
+ }
|
|
|
// 根据坯料ID 删除 备份数据
|
|
|
ApsUtils.clearBackup(null);
|
|
|
return R.ok();
|