|
@@ -608,9 +608,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
.in(ApsProcessOperationDo::getId, processIds)
|
|
|
.set(ApsProcessOperationDo::getLockmark, LOCKMARK_N));
|
|
|
// 作业明细解锁
|
|
|
- /*apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
+ apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
.in(ApsProcessOperationProcessEquDo::getProcessid, processIds)
|
|
|
- .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, LOCKMARK_N));*/
|
|
|
+ .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, LOCKMARK_N));
|
|
|
|
|
|
// 判断当前工序作业是否存在加工中或已完工的数据
|
|
|
boolean b = unlockProcessInfo.stream().anyMatch(info -> COMPLETED.equals(info.getProcessstatus()) || PROCESSING.equals(info.getProcessstatus()));
|
|
@@ -641,9 +641,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
.in(ApsProcessOperationDo::getId, unlockedIds)
|
|
|
.set(ApsProcessOperationDo::getLockmark, LOCKMARK_Y));
|
|
|
// 作业明细锁定
|
|
|
- /*apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
+ apsProcessOperationProcessEquService.update(new LambdaUpdateWrapper<ApsProcessOperationProcessEquDo>()
|
|
|
.in(ApsProcessOperationProcessEquDo::getProcessid, unlockedIds)
|
|
|
- .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, LOCKMARK_Y));*/
|
|
|
+ .set(ApsProcessOperationProcessEquDo::getLockmarkdetail, LOCKMARK_Y));
|
|
|
return R.ok("200", "锁定成功", unlockedIds);
|
|
|
}
|
|
|
|