From 483b93cb9fc5373fb7af4e3f071a271d2853b28c Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 9 Jul 2019 11:47:03 +0800
Subject: [PATCH] bug #4939 #4914

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java   | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index 3ba7285..8ef0841 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("手机")
     private String vendorPhone;
+
+    @Transient
+    @ApiParam("前端信息")
+    private String message;
 }
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 8e91752..56f947c 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
@@ -974,6 +974,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
+
+        DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
+                wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
+        DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
+                wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result;