aps-坯料计划字段增加，校验订单评审时可以选择是否只校验

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

@@ -261,23 +261,25 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
         }
 
         //================校验通过，保存或更新订单相关信息=====================
-        //获取当前用户的所属工厂
-        SysUserVo currentUser = CXCommonUtils.getCurrentUser();
-        String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
+        if (req.getIsNeedSave()) {
+            //获取当前用户的所属工厂
+            SysUserVo currentUser = CXCommonUtils.getCurrentUser();
+            String tenantId = currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1];
 
-        //保存主表信息
-        apsProductionOrderDo.setTenantid(tenantId);
-        this.saveOrUpdate(apsProductionOrderDo);
+            //保存主表信息
+            apsProductionOrderDo.setTenantid(tenantId);
+            this.saveOrUpdate(apsProductionOrderDo);
 
-        //保存产品明细子表
-        for (ApsProductDetailVo apsProductDetailVo : apsProductDetailVoList) {
-            apsProductDetailVo.setTenantid(tenantId);
-        }
-        apsProductDetailService.saveOrUpdateBatch(productDetailDoList);
+            //保存产品明细子表
+            for (ApsProductDetailVo apsProductDetailVo : apsProductDetailVoList) {
+                apsProductDetailVo.setTenantid(tenantId);
+            }
+            apsProductDetailService.saveOrUpdateBatch(productDetailDoList);
 
-        //保存合并订单子表
-        for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDoList) {
-            apsProductionMergeOrderDo.setTenantid(tenantId);
+            //保存合并订单子表
+            for (ApsProductionMergeOrderDo apsProductionMergeOrderDo : apsProductionMergeOrderDoList) {
+                apsProductionMergeOrderDo.setTenantid(tenantId);
+            }
         }
 
         if (checkSchedule) {

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsBlankOrderDo.java

@@ -1,6 +1,8 @@
 package com.rongwei.bsentity.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -182,4 +184,34 @@ public class ApsBlankOrderDo extends BaseDo {
      */
     @TableField("SCHEDULINGSTATUS")
     private String schedulingstatus;
+
+    /**
+     * 期望交货日期
+     */
+    @TableField("DELIVERYDATE")
+    private Date deliverydate;
+
+    /**
+     * 排程交货日期-起
+     */
+    @TableField("SCHEDULEDATESTART")
+    private Date scheduledatestart;
+
+    /**
+     * 排程交货日期-止
+     */
+    @TableField("SCHEDULEDATEEND")
+    private Date scheduledateend;
+
+    /**
+     * 承诺交货日期-起
+     */
+    @TableField("PROMISEDATESTART")
+    private Date promisedatestart;
+
+    /**
+     * 承诺交货日期-止
+     */
+    @TableField("PROMISEDATEEND")
+    private Date promisedateend;
 }

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

@@ -28,4 +28,7 @@ public class CheckAndSaveOrUpdateOrderReq {
 
     //是否需要检验坯料计划是否已排程
     private Boolean checkSchedule = false;
+
+    //是否需要保存
+    private Boolean isNeedSave = true;
 }