Kaynağa Gözat

aps-订单评审时,校验 交期时,增加指定功能

sucheng 1 yıl önce
ebeveyn
işleme
58e6618f5b

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

@@ -1615,14 +1615,16 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
          * 如果有任一坯料计划的承诺交货期-起或止为空,错误提示:请填写所有坯料计划的承诺交货期
          * 如果有坯料计划的承诺交货期-止 < 排程交货期,错误提示:第{几}个坯料计划的承诺交货期-止不能早于排程交货期{排程交货期}
          */
-        if (ObjectUtil.isEmpty(apsBlankOrderDo.getPromisedateend())) {
-            return R.error("请填写所有坯料计划的承诺交货期-止");
-        }
-        if (ObjectUtil.isEmpty(apsBlankOrderDo.getScheduledateend())) {
-            return R.error("第" + j + "个坯料计划 排程交货期-止不能为空");
-        }
-        if (apsBlankOrderDo.getPromisedateend().compareTo(apsBlankOrderDo.getScheduledateend()) < 0) {
-            return R.error("第" + j + "个坯料计划的承诺交货期-止不能早于排程交货期-止" + DateUtil.format(apsBlankOrderDo.getScheduledateend(), "yyyy-MM-dd"));
+        if (req.getCheckDevice()) {
+            if (ObjectUtil.isEmpty(apsBlankOrderDo.getPromisedateend())) {
+                return R.error("请填写所有坯料计划的承诺交货期-止");
+            }
+            if (ObjectUtil.isEmpty(apsBlankOrderDo.getScheduledateend())) {
+                return R.error("第" + j + "个坯料计划 排程交货期-止不能为空");
+            }
+            if (apsBlankOrderDo.getPromisedateend().compareTo(apsBlankOrderDo.getScheduledateend()) < 0) {
+                return R.error("第" + j + "个坯料计划的承诺交货期-止不能早于排程交货期-止" + DateUtil.format(apsBlankOrderDo.getScheduledateend(), "yyyy-MM-dd"));
+            }
         }