From f67e7df17f83f14b927f046a346ba3e8772bb6a1 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 19:48:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=97=E4=BD=99=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java    | 12 ++++++++++++
 .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 20 +++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 37201b2..4aa554a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -244,6 +244,18 @@ public class WmsStockSn extends BaseBean {
     private String snapshotTime;
 
     @Transient
+    @ApiParam(value = "模板编号")
+    private String templateNo;
+
+    @Transient
+    @ApiParam(value = "客户物料号")
+    private String customerPartNo;
+
+    @Transient
+    @ApiParam(value = "箱号")
+    private String boxNo;
+
+    @Transient
     private Integer isSnapshot;
 
     public WmsStockSn() {
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 d4e7e0c..144ab5c 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
@@ -2433,7 +2433,7 @@ public class WmsHqlPack {
     }
 
     /**
-     * 接口映射分页查询条件
+     * 打印机管理信息分页查询条件
      *
      * @param wmsPrinterConfigure
      * @return
@@ -2448,4 +2448,22 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 待打印队列信息分页查询条件
+     *
+     * @param wmsPrintingQueue
+     * @return
+     */
+    public static DdlPackBean packHqlwmsPrintingQueueByPrintNo(WmsPrintingQueue wmsPrintingQueue) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result);
+
+        getStringBuilderPack(wmsPrintingQueue, result);
+
+        return result;
+    }
 }