aps-订单评审表单校验

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

@@ -1379,6 +1379,7 @@ 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());
@@ -1573,6 +1574,7 @@ 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("第" + j + "个坯料计划 " + r.getMsg());

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

@@ -701,7 +701,7 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
                                 return R.error("铸轧坯料加工设备" + equDo.getProcessworkshop() + "/" + equDo.getProcessdevice() + "的代号需要是2位");
                             }
                             //如果坯料计划的坯料类型=热轧，并且（工序作业的加工设备代号为空，或者加工设备代号不是1位）
-                            if (apsBlankOrderDo.getBlanktype().equals("铸轧")
+                            if (apsBlankOrderDo.getBlanktype().equals("热轧")
                                     && (ObjectUtil.isEmpty(deviceCode) || deviceCode.length() != 1)) {
                                 return R.error("热轧坯料加工设备" + equDo.getProcessworkshop() + "/" + equDo.getProcessdevice() + "的代号需要是1位");
                             }