|
@@ -147,6 +147,8 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
List<ApsBlankOrderDo> apsBlankOrderDoList = apsBlankOrderDao.selectList(new QueryWrapper<ApsBlankOrderDo>().lambda().eq(ApsBlankOrderDo::getProductionorderid, apsProductionOrderDo.getId()).orderByDesc(ApsBlankOrderDo::getModifydate));
|
|
|
//是否需要检验坯料计划是否已排程
|
|
|
Boolean checkSchedule = req.getCheckSchedule();
|
|
|
+ //坯料计划校验等级
|
|
|
+ Integer checkLevel = req.getCheckLevel();
|
|
|
|
|
|
//=========检查坯料计划的个数和状态=============
|
|
|
if (ObjectUtil.isEmpty(apsBlankOrderDoList)) {
|
|
@@ -251,9 +253,11 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
|
|
|
checkAndSaveOrUpdateBlankReq.setApsBlankOrderDo(apsBlankOrderDoList.get(i));
|
|
|
checkAndSaveOrUpdateBlankReq.setApsProcessOutputProductDoList(apsProcessOutputProductService.list(new QueryWrapper<ApsProcessOutputProductDo>().lambda().eq(ApsProcessOutputProductDo::getBlankid, apsBlankOrderDoList.get(i).getId())));
|
|
|
checkAndSaveOrUpdateBlankReq.setApsProductDetailDoList(productDetailDoList);
|
|
|
+ checkAndSaveOrUpdateBlankReq.setCheckLevel(checkLevel);
|
|
|
if (checkSchedule) {
|
|
|
checkAndSaveOrUpdateBlankReq.setCheckDevice(true);
|
|
|
}
|
|
|
+
|
|
|
R r = apsBlankOrderService.checkBlankOrder(checkAndSaveOrUpdateBlankReq, i + 1);
|
|
|
if (!r.getCode().equals("200")) {
|
|
|
return R.error(r.getMsg());
|