Merge branch 'dev' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -74,6 +74,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
         }
+
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.model.wms;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -27,7 +26,6 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("作业类型名称")
     public String opTypeName;
 
-    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
@@ -37,30 +35,33 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "关联单据业务类型")
     private String busiTypeDesc;
 
-    @Column(name = "ZDATE")
     @ApiParam(value = "计划日期")
     private String zdate;
 
-    @Column(name = "ZTIME")
     @ApiParam(value = "计划时间")
     private String ztime;
 
-    @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;
 
-    @Column(name = "VENDOR_NO")
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
     @ApiParam(value = "样式")
     private WmsMessageStyleModel wmsMessageStyleModel;
 
+    @ApiParam(value = "源存储区代码")
+    private String srcZoneNo;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
     public WmsTaskInfoModel() {
     }
 
     public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc,
-                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) {
+                            String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo,
+                            String createDatetime, String srcZoneNo) {
         this.orderNo = orderNo;
         this.taskStatus = taskStatus;
         this.opTypeName = opTypeName;
@@ -71,5 +72,7 @@ public class WmsTaskInfoModel implements Serializable {
         this.ztime = ztime;
         this.custNo = custNo;
         this.vendorNo = vendorNo;
+        this.createDatetime = createDatetime;
+        this.srcZoneNo = srcZoneNo;
     }
 }