aps-订单评审表单校验

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -1379,7 +1379,6 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //============校验工序作业=============
         Map<String, Object> params = new HashMap<>();
         params.put("BLANKID", apsBlankOrderDo.getId());
-        params.put("checkDeviceAndOrgCode", true);
         R r = apsProcessOperationService.checkOperation(params);
         if (!(r.getCode().equals("200"))) {
             return R.error(r.getMsg());
@@ -1574,7 +1573,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
         //============校验工序作业=============
         Map<String, Object> params = new HashMap<>();
         params.put("BLANKID", apsBlankOrderDo.getId());
-        params.put("checkDeviceAndOrgCode", true);
+        if (req.getCheckDevice()) {
+            params.put("checkDeviceAndOrgCode", true);
+        }
         R r = apsProcessOperationService.checkOperation(params);
         if (!(r.getCode().equals("200"))) {
             return R.error("第" + j + "个坯料计划 " + r.getMsg());

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

@@ -255,6 +255,9 @@ 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);
+            if (checkSchedule) {
+                checkAndSaveOrUpdateBlankReq.setCheckDevice(true);
+            }
             R r = apsBlankOrderService.checkBlankOrder(checkAndSaveOrUpdateBlankReq, i + 1);
             if (!r.getCode().equals("200")) {
                 return R.error(r.getMsg());
@@ -307,7 +310,7 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
             CXCommonUtils.sendNotify(ORDEROUTTIMEAUDIT_TITLE, String.format(ORDEROUTTIME_AUDIT_CONTENT, apsProductionOrderDo.getOrderno()), null, Arrays.asList(apsProductionOrderDo.getCreateuserid().split(",")), apsProductionOrderDo.getId(), ORDEROUTTIME_AUDIT, false);
 
             //邮件提醒
-            if(StringUtils.isNotEmpty(apsProductionOrderDo.getModifyusername())){
+            if (StringUtils.isNotEmpty(apsProductionOrderDo.getModifyusername())) {
                 MailDo mailDo = new MailDo();
                 mailDo.setReceiveEmail(apsProductionOrderDo.getModifyusername().split(","));
                 mailDo.setNeedTransReceive(false);

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/CheckAndSaveOrUpdateBlankReq.java

@@ -24,4 +24,7 @@ public class CheckAndSaveOrUpdateBlankReq {
 
     //在制品ID
     private String progressId;
+
+    //是否需要检验坯料计划的工序作业的加工设备
+    private Boolean checkDevice = false;
 }