|
@@ -355,10 +355,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
.set(ApsProcessOperationDo::getLockmark, LOCKMARK_N));
|
|
|
|
|
|
if (bool1 && bool2) {
|
|
|
- R r = new R();
|
|
|
- r.setCode("200");
|
|
|
- r.setMsg("正在插单重排,并已自动备份排程结果,如果重排结果不满意,可以恢复排程结果");
|
|
|
- return r;
|
|
|
+ return R.ok();
|
|
|
} else {
|
|
|
return R.error();
|
|
|
}
|
|
@@ -1896,7 +1893,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
|
|
|
apsProcessOutputProductDo.setBlankid(apsBlankOrderDo.getId());
|
|
|
apsProcessOutputProductDo.setTenantid(tenantId);
|
|
|
}
|
|
|
- if(ObjectUtil.isNotEmpty(apsProcessOutputProductDoList)) {
|
|
|
+ if (ObjectUtil.isNotEmpty(apsProcessOutputProductDoList)) {
|
|
|
apsProcessOutputProductService.saveOrUpdateBatch(apsProcessOutputProductDoList);
|
|
|
}
|
|
|
|