|
@@ -71,6 +71,8 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
@Autowired
|
|
@Autowired
|
|
private ApsBlankOrderDao apsBlankOrderDao;
|
|
private ApsBlankOrderDao apsBlankOrderDao;
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private ApsBlankOrderService apsBlankOrderService;
|
|
|
|
+ @Autowired
|
|
private ApsProcessOperationProcessEquServiceImpl processOperationProcessEquService;
|
|
private ApsProcessOperationProcessEquServiceImpl processOperationProcessEquService;
|
|
@Autowired
|
|
@Autowired
|
|
private ApsScheduleConfigService apsScheduleConfigService;
|
|
private ApsScheduleConfigService apsScheduleConfigService;
|
|
@@ -412,11 +414,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
processOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
.set(ApsProcessOperationProcessEquDo::getLockmark, lockMark)
|
|
.set(ApsProcessOperationProcessEquDo::getLockmark, lockMark)
|
|
.in(ApsProcessOperationProcessEquDo::getBlankid, blackOrderId));
|
|
.in(ApsProcessOperationProcessEquDo::getBlankid, blackOrderId));
|
|
|
|
+ // 解锁
|
|
if (LOCKMARK_N.equals(lockMark)) {
|
|
if (LOCKMARK_N.equals(lockMark)) {
|
|
// 更新坯料计划对应工序作业的生产状态为待发布
|
|
// 更新坯料计划对应工序作业的生产状态为待发布
|
|
apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
|
|
apsProcessOperationService.update(new LambdaUpdateWrapper<ApsProcessOperationDo>()
|
|
.in(ApsProcessOperationDo::getBlankid, blackOrderId)
|
|
.in(ApsProcessOperationDo::getBlankid, blackOrderId)
|
|
- .set(ApsProcessOperationDo::getProcessstatus, "20"));
|
|
|
|
|
|
+ .set(ApsProcessOperationDo::getProcessstatus, "20")
|
|
|
|
+ );
|
|
|
|
+ apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
|
|
|
|
+ .eq(ApsBlankOrderDo::getId,blackOrderId)
|
|
|
|
+ .set(ApsBlankOrderDo::getSchedulingstatus,"20"));
|
|
}
|
|
}
|
|
// 回传坯料计划ID 用于前段更新锁定状态
|
|
// 回传坯料计划ID 用于前段更新锁定状态
|
|
return R.ok(blackOrderId);
|
|
return R.ok(blackOrderId);
|