rev:维护销售订单、工艺路线、产品工艺路线功能

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java

@@ -175,7 +175,7 @@ public class WmsToSapServiceImpl implements WmsToSapService {
             }
             //sale_jo.setPlandeliver_date(row.getString("Edatu"));
             sale_jo.setCreate_id(SecurityUtils.getCurrentUserId());
-            sale_jo.setCreate_time(new Date());
+            sale_jo.setCreate_time(DateUtil.now());
             sale_jo.setCreate_name(SecurityUtils.getCurrentNickName());
             if (need_update) {
                 saleOrderService.updateById(sale_jo);

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java

@@ -1,16 +1,13 @@
 package org.nl.wms.mps_manage.saleorder.service.dao;
 
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 生产订单表
@@ -94,7 +91,7 @@ public class MpsSaleOrder implements Serializable{
       * 计划交期
       */
      @ApiModelProperty(value = "/**计划交期*/")
-     private Date plandeliver_date;
+     private String plandeliver_date;
      /**
       * 创建人
       */
@@ -110,7 +107,7 @@ public class MpsSaleOrder implements Serializable{
       */
      @ApiModelProperty(value = "/**创建时间*/")
      @TableField(fill = FieldFill.INSERT)
-     private Date create_time;
+     private String create_time;
      /**
       * 提交人
       */
@@ -216,5 +213,5 @@ public class MpsSaleOrder implements Serializable{
       * aps变更时间
       */
      @ApiModelProperty(value = "/**aps变更时间*/")
-     private Date aps_update_time;
+     private String aps_update_time;
 }

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml

@@ -26,6 +26,12 @@
             <if test="query.cust_code  != null">
                 and der.cust_code >= #{query.cust_code}
             </if>
+            <if test="query.start_time != null and query.start_time  != ''">
+                and der.create_time >=  #{query.start_time}
+            </if>
+            <if test="query.end_time != null and query.end_time  != ''">
+                and #{query.end_time} >= der.create_time
+            </if>
 
         </where>
 

mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java

@@ -112,7 +112,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
         mpsSaleOrder.setStatus("10");
         mpsSaleOrder.setCreate_id(SecurityUtils.getCurrentUserId());
         mpsSaleOrder.setCreate_name(SecurityUtils.getCurrentNickName());
-        mpsSaleOrder.setCreate_time(new Date());
+        mpsSaleOrder.setCreate_time(DateUtil.now());
         MdCsCustomerbase cust = icustomerbaseService.getOne(new QueryWrapper<MdCsCustomerbase>().eq("cust_code", mpsSaleOrder.getCust_code()));
         mpsSaleOrder.setCust_id(cust.getCust_id());
         mpsSaleOrder.setCust_name(cust.getCust_name());
@@ -147,7 +147,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                 MpsSaleOrder mpsSaleOrder = new MpsSaleOrder();
                 mpsSaleOrder.setSale_type("01");
                 mpsSaleOrder.setStatus("10");
-                mpsSaleOrder.setCreate_time(new Date());
+                mpsSaleOrder.setCreate_time(DateUtil.now());
                 mpsSaleOrder.setConfirm_time(DateUtil.now());
                 mpsSaleOrder.setCreate_id(SecurityUtils.getCurrentUserId());
                 mpsSaleOrder.setCreate_name(SecurityUtils.getCurrentUsername());
@@ -227,7 +227,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
                             if(StringUtils.isBlank(col)) {
                                 throw new BadRequestException("订单交期不能为空");
                             }
-                            mpsSaleOrder.setPlandeliver_date(DateUtil.parse(col));
+                            mpsSaleOrder.setPlandeliver_date(String.valueOf(DateUtil.parse(col)));
                         }
                         if(j == 8) {
                             //备注

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/dao/PdmBiProductprocessroute.java

@@ -84,12 +84,12 @@ public class PdmBiProductprocessroute implements Serializable {
     /**
      * 审核人
      */
-    private String audit_id;
+    private String audit_optid;
 
     /**
      * 审核人姓名
      */
-    private String audit_name;
+    private String audit_optname;
 
     /**
      * 审核时间

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java

@@ -185,12 +185,12 @@ public class PdmBiProductprocessrouteServiceImpl extends ServiceImpl<PdmBiProduc
 
     @Override
     public void submit(JSONObject whereJson) {
-        this.update(new UpdateWrapper<PdmBiProductprocessroute>().set("productprocess_status", "20").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_id", SecurityUtils.getCurrentUserId()).set("audit_name", SecurityUtils.getCurrentNickName()).set("audit_time", DateUtil.now()).eq("processroute_id", whereJson.getString("processroute_id")));
+        this.update(new UpdateWrapper<PdmBiProductprocessroute>().set("productprocess_status", "20").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_optid", SecurityUtils.getCurrentUserId()).set("audit_optname", SecurityUtils.getCurrentNickName()).set("audit_time", DateUtil.now()).eq("productprocess_id", whereJson.getString("productprocess_id")));
     }
 
     @Override
     public void unSubmit(JSONObject whereJson) {
-        this.update(new UpdateWrapper<PdmBiProductprocessroute>().set("productprocess_status", "10").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_id", " ").set("audit_name", " ").set("audit_time", " ").eq("processroute_id", whereJson.getString("processroute_id")));
+        this.update(new UpdateWrapper<PdmBiProductprocessroute>().set("productprocess_status", "10").set("update_id", SecurityUtils.getCurrentUserId()).set("update_name", SecurityUtils.getCurrentNickName()).set("update_time", DateUtil.now()).set("audit_optid", " ").set("audit_optname", " ").set("audit_time", " ").eq("productprocess_id", whereJson.getString("productprocess_id")));
     }
 
     @Override