From da9b042cf0c99d921f9a731d21590559f58463b2 Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Fri, 2 Nov 2018 15:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java       | 6 +++---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java    | 2 +-
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
index 70f7448..8519f11 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTrans.java
@@ -14,7 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description : 仓库交易记录表
+ * @Description : 库存交易记录表
  * @Reference :
  * @Author : jimmy.zeng
  * @CreateDate : 2018-11-01 13:21
@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @Table(name="WMS_TRANS")
 @DynamicInsert
 @DynamicUpdate
-@Api(value="仓库交易记录表",description = "仓库交易记录表")
+@Api(value="库存交易记录表",description = "库存交易记录表")
 public class WmsTrans extends BaseBean{
 
     @Column(name="ORDER_NO")
@@ -51,7 +51,7 @@ public class WmsTrans extends BaseBean{
 
     @Column(name="TRANS_STATUS")
     @ApiParam(value ="交易状态")
-    private String Trans_status;
+    private Integer transStatus;
 
     @Column(name="QTY")
     @ApiParam(value ="需求数")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
index 4a3a8f8..b27dfb8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransRcd.java
@@ -51,7 +51,7 @@ public class WmsTransRcd extends BaseBean{
 
     @Column(name="TRANS_STATUS")
     @ApiParam(value ="交易状态")
-    private Integer TransStatus;
+    private Integer transStatus;
 
     @Column(name="QTY")
     @ApiParam(value ="需求数")
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 8634073..092edb1 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
@@ -46,7 +46,8 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getNumEqualPack(wmsTransType.getTransCode(),"transCode",result);
+        HqlPack.getStringEqualPack(wmsTransType.getTransCode(),"transCode",result);
+        HqlPack.getStringEqualPack(wmsTransType.getTransName(),"transName",result);
 
         return result.toString();
     }