From 1eb12350b285f0fb94fc8d9e687d8d97e7b83c26 Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Thu, 22 Nov 2018 20:12:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=99=82=E9=96=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index a29ad39..8c26bfa 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -181,8 +181,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true);
-        HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true);
+        HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), wmsIbCheckPlan.getEndDate(), "startDate", result, true);
 
         getStringBuilderPack(wmsIbCheckPlan, result);
 

From 7b71b349a70ac603ca18eb49be3be351d9f84190 Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Fri, 23 Nov 2018 11:11:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index cdb2be6..d78eb17 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -448,7 +448,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
-        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus().toString(), "asnStatus", result);
+        HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);

From f99d4e4dc6cf5f4e18de3e4e9a176fa003fd8394 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Fri, 23 Nov 2018 13:57:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=95=B0=E6=8D=AE=E5=BA=93=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java     | 4 +---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java     | 9 +--------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
index 33c4b57..9972172 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
@@ -1,11 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Entity;
 import java.util.List;
 
 /**
@@ -17,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("返回前端数据实体")
-public class WmsActionResponseBean extends BaseBean {
+public class WmsActionResponseBean {
 
     @ApiParam("进度")
     public Double percent;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
index 9f9d6c2..eeb7643 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java
@@ -1,16 +1,9 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.List;
 
 /**
@@ -22,7 +15,7 @@ import java.util.List;
  **/
 @Data
 @Api("接受前端数据实体")
-public class WmsOperationBean extends BaseBean {
+public class WmsOperationBean {
 
     @ApiParam("扫描内容")
     public String barCode;