|
@@ -1104,14 +1104,19 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
* 物理删除排程备份(工序作业备份【aps_process_operation_backup】、加工设备备份【aps_process_operation_process_equ_backup】)
|
|
|
* 更新状态
|
|
|
*/
|
|
|
- private void deleteBackup(List<String> blankids, List<String> apsProductionOrderIds) {
|
|
|
+ public void deleteBackup(List<String> blankids, List<String> apsProductionOrderIds) {
|
|
|
// 删除工序作业和工序作业明备份数据
|
|
|
apsProcessOperationBackupDao.deletedByBlankId(blankids, null);
|
|
|
apsProcessOperationProcessEquBackupDao.deletedByBlankId(blankids, null);
|
|
|
// 更工序作业生产状态=待排程,是否锁定=否,
|
|
|
- apsProcessOperationService.remove(new LambdaQueryWrapper<ApsProcessOperationDo>().in(ApsProcessOperationDo::getBlankid, blankids));
|
|
|
+ apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
|
|
|
+ .in(ApsProcessOperationDo::getBlankid, blankids)
|
|
|
+ .set(ApsProcessOperationDo::getProcessstatus,TO_BE_SCHEDULED)
|
|
|
+ .set(ApsProcessOperationDo::getLockmark,LOCKMARK_N)
|
|
|
+ );
|
|
|
// 清空作业明细
|
|
|
- processOperationProcessEquService.remove(new LambdaQueryWrapper<ApsProcessOperationProcessEquDo>().in(ApsProcessOperationProcessEquDo::getBlankid, blankids));
|
|
|
+ processOperationProcessEquService.remove(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
+ .in(ApsProcessOperationProcessEquDo::getBlankid, blankids));
|
|
|
// 更新订单的排程状态
|
|
|
List<ApsProductionOrderDo> productionOrderDos = new ArrayList<>();
|
|
|
for (String apsProductionOrderId : apsProductionOrderIds) {
|