From 0fa1ffa23b009535522db781bc3e80169797353b Mon Sep 17 00:00:00 2001
From: "bleakney.liu" <bleakney.liu@estsh.com>
Date: Wed, 9 Oct 2019 09:17:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E7=89=A9=E6=B5=81=E7=BA=BF=E8=B7=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
index 0b9f58c..af87b92 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
@@ -53,10 +53,18 @@ public class WmsRouting extends BaseBean {
 
     @Column(name = "FOR_PRODUCT")
     @ApiParam(value = "适用产品")
+    
+     
     private Integer forProduct;
 
-   
+	@Transient
+	@ApiParam(value = "补货规则列表")
+	List<WmsRoutingRule> replenishList;
+	@Transient
+	@ApiParam(value = "推动规则列表补")
+	List<WmsRoutingRule> promotionList;
 
-    public WmsRouting(){}
+	public WmsRouting() {
+	}
 
 }

From 4ac7bae38bc3530ea1e43697847935de0467a40f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Wed, 9 Oct 2019 09:18:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9Ehql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 b6cafeb..6dc696d 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
@@ -2408,4 +2408,21 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 接口映射分页查询条件
+     *
+     * @param wmsPrinterConfigure
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPrinterConfigure(WmsPrinterConfigure wmsPrinterConfigure) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getIp(), "ip", result);
+        DdlPreparedPack.getStringLikerPack(wmsPrinterConfigure.getPrinterNo(), "printerNo", result);
+
+        getStringBuilderPack(wmsPrinterConfigure, result);
+
+        return result;
+    }
 }