Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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() {
+	}
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2431,4 +2431,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;
+    }
 }