浏览代码

aps-订单评审、坯料计划保存校验修改,坯料计划校验增加校验等级

sucheng 1 年之前
父节点
当前提交
06519b2ba7

+ 4 - 0
cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -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());

+ 3 - 0
cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/CheckAndSaveOrUpdateOrderReq.java

@@ -34,4 +34,7 @@ public class CheckAndSaveOrUpdateOrderReq {
 
     //是否需要发布
     private Boolean isNeedPublish = false;
+
+    //坯料计划 校验等级
+    private Integer checkLevel = 3;
 }