From f1d14c9e3a2b3bba6e226572445c0f20cac26d2b Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 13 May 2020 14:49:12 +0800
Subject: [PATCH] =?UTF-8?q?bug:=E3=80=908385=E3=80=91-=E6=8A=A5=E5=B7=A5?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=9F=A5=E8=AF=A2=E8=81=94=E8=B0=83=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java  |  9 ++++++++-
 .../i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java  | 11 +++++++++--
 .../i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java  | 11 +++++++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java
index 460ec08..2b2fed2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsReportTransDetailModel.java
@@ -63,10 +63,16 @@ public class WmsReportTransDetailModel extends BaseBean {
     @ApiParam(value = "收货批次")
     private String lotNo;
 
+    @ApiParam(value = "查询开始时间")
+    private String startDateTime;
+
+    @ApiParam(value = "查询结束时间")
+    private String endDateTime;
+
     // , String createUser, String createDateTime
     public WmsReportTransDetailModel(String organizeCode, String lineNo, String actualReportLine, String shiftNo, String shiftName,
                                      String zoneNo, String locateNo, String sn, String partNo, String partNameRdd, String custNo,
-                                     String unit, Double qty, String dateCode, Double snp, String lotNo) {
+                                     String unit, Double qty, String dateCode, Double snp, String lotNo, String createDateTime) {
         this.organizeCode = organizeCode;
         this.lineNo = lineNo;
         this.reportLine = actualReportLine;
@@ -83,6 +89,7 @@ public class WmsReportTransDetailModel extends BaseBean {
         this.dateCode = dateCode;
         this.snp = snp;
         this.lotNo = lotNo;
+        this.createDatetime = createDateTime;
     }
 
     public WmsReportTransDetailModel() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java
index beca2d3..915567e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayDetailModel.java
@@ -52,8 +52,14 @@ public class WmsVendorDelayDetailModel extends BaseBean {
     @ApiParam(value = "供应商名称")
     private String vendorName;
 
+    @ApiParam(value = "查询开始时间")
+    private String startDateTime;
+
+    @ApiParam(value = "查询结束时间")
+    private String endDateTime;
+
     public WmsVendorDelayDetailModel(String orderNo, Integer itemStatus, String partNo, String partName, Double qty,
-                                     String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode) {
+                                     String planDate, String planTime, String recDate, String recTime, String vendorNo, String vendorName, String organizeCode, String createDateTime) {
         this.orderNo = orderNo;
         this.itemStatus = itemStatus;
         this.partNo = partNo;
@@ -65,7 +71,8 @@ public class WmsVendorDelayDetailModel extends BaseBean {
         this.recTime = recTime;
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
-        setOrganizeCode(organizeCode);
+        this.organizeCode = organizeCode;
+        this.createDatetime = createDateTime;
     }
 
     public WmsVendorDelayDetailModel() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
index d0b14b6..3166ac2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java
@@ -28,11 +28,18 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long delayCount;
 
-    public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode) {
+    @ApiParam(value = "查询开始时间")
+    private String startDateTime;
+
+    @ApiParam(value = "查询结束时间")
+    private String endDateTime;
+
+    public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) {
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
         this.delayCount = count;
-        setOrganizeCode(organizeCode);
+        this.organizeCode = organizeCode;
+        this.createDatetime = createDateTime;
     }
 
     public WmsVendorDelayMasterModel() {