|
@@ -397,10 +397,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
apsProcessOperationDos = new ArrayList<>(apsProcessOperationService.listByIds(processIds));
|
|
apsProcessOperationDos = new ArrayList<>(apsProcessOperationService.listByIds(processIds));
|
|
//解锁的情况下校验 工序作业对应的生产状态
|
|
//解锁的情况下校验 工序作业对应的生产状态
|
|
if (LOCKMARK_N.equals(lockMark)) {
|
|
if (LOCKMARK_N.equals(lockMark)) {
|
|
- boolean b = apsProcessOperationDos.stream().anyMatch(info -> COMPLETED.equals(info.getProcessstatus()) ||
|
|
|
|
|
|
+ boolean b = apsProcessOperationDos.stream().allMatch(info -> COMPLETED.equals(info.getProcessstatus()) ||
|
|
PROCESSING.equals(info.getProcessstatus()));
|
|
PROCESSING.equals(info.getProcessstatus()));
|
|
if(b){
|
|
if(b){
|
|
- return R.error("所选工序作业生产状态为加工或已完工,不能锁定");
|
|
|
|
|
|
+ return R.error("所选作业都已开工,不可以解锁,不能锁定");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|