【8441 收货回执打印功能完善】

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

@@ -73,6 +73,35 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String containerNo;
 
+    @ApiParam("道口")
+    @Transient
+    public String dock;
+
+    @ApiParam("泊位")
+    @Transient
+    public String zdoc;
+
+    @Transient
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @Transient
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @Transient
+    @ApiParam(value = "创建日期查询用，查询起始日期", example = "2018-01-01 01:00:00")
+    @AnnoOutputColumn(hidden = true)
+    public String createDateTimeStart;
+
+    @Transient
+    @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
+    @AnnoOutputColumn(hidden = true)
+    public String createDateTimeEnd;
+
+    @Transient
+    public String createDateTime;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java

@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -115,10 +119,14 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam("备注")
     public String remark;
 
-    @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
+    @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")
     @ApiParam("道口")
     public String dock;
 
+    @ApiParam("泊位")
+    @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
+    public String zdoc;
+
     @Transient
     @ApiParam("供应商电话")
     private String vendorCall;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -10,7 +10,11 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -159,10 +163,14 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     private List<String> orderNoList;
 
-    @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'")
+    @Column(name = "DOCK", columnDefinition = "varchar(50) default ''")
     @ApiParam("道口")
     public String dock;
 
+    @ApiParam("泊位")
+    @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
+    public String zdoc;
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -279,6 +279,12 @@ public class WmsHqlPack {
             DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
         }
 
+        //按创建时间查询单据信息
+        if (StringUtils.isNotBlank(wmsPOMaster.getCreateDateTimeStart())) {
+            DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),
+                    wmsPOMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        }
+
         getStringBuilderPack(wmsPOMaster, result);
 
         return result;
@@ -693,6 +699,12 @@ public class WmsHqlPack {
             DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result);
         }
 
+        //按创建时间查询单据信息
+        if (StringUtils.isNotBlank(wmsASNMaster.getCreateDateTimeStart())) {
+            DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),
+                    wmsASNMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
+        }
+
         getStringBuilderPack(wmsASNMaster, result);
 
         return result;