From 1917c01c09486729c40f5b570829cea9a7fea2c7 Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Sat, 17 Nov 2018 17:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java  | 20 ++++++++++----------
 .../pojo/wms/repository/WmsSnPrintRepository.java  | 20 ++++++++++++++++++++
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 22 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java
index 52b3d07..61d3b3e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java
@@ -13,7 +13,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description : 待打印信息
+ * @Description : 打印队列信息
  * @Reference :
  * @Author : silliter.yuan
  * @CreateDate : 2018-11-06 15:58
@@ -25,16 +25,16 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="WMS_SN_PRINT")
-@Api("待打印信息")
+@Api("打印队列信息")
 public class WmsSnPrint extends BaseBean {
 
-    @Column(name="SRC_TYPE")
+    @Column(name="REF_TYPE")
     @ApiParam("来源单据类型")
-    public String srcType;
+    public String refType;
 
-    @Column(name="SRC_NO")
+    @Column(name="REF_NO")
     @ApiParam("来源单据编号")
-    public String srcNo;
+    public String refNo;
 
     @Column(name="PRINT_CONTEXT")
     @ApiParam("打印内容")
@@ -51,11 +51,11 @@ public class WmsSnPrint extends BaseBean {
     @ApiParam(value = "状态", example = "0")
     public Integer status;
 
-    @Column(name="PRINT_TEMPLET")
+    @Column(name="PRINT_TEMPLATE")
     @ApiParam("打印模板")
-    public String printTemplet;
+    public String printTemplete;
 
-    @Column(name="PRINT_MACHINE")
+    @Column(name="PRINTER")
     @ApiParam("打印机")
-    public String printMachine;
+    public String printer;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java
new file mode 100644
index 0000000..5ea9042
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSnPrintRepository.java
@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrint;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransCode;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 打印机队列数据操作类
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-17 14:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsSnPrintRepository extends BaseRepository<WmsSnPrint, Long> {
+
+}
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 67388a3..09af532 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
@@ -667,4 +667,26 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 根据条件查询打印机队列信息封装类
+     * @param wmsSnPrint 打印机队列信息
+     * @return 打印机队列信息
+     */
+    public static String packHqlWmsSnPrint(WmsSnPrint wmsSnPrint) {
+        StringBuffer result = new StringBuffer();
+
+        // 来源单据类型
+        HqlPack.getStringLikerPack(wmsSnPrint.getRefType(), "refType", result);
+        // 来源单据号
+        HqlPack.getStringEqualPack(wmsSnPrint.getRefNo(), "refNo", result);
+        // 打印机
+        HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
+        // 打印机状态
+        HqlPack.getNumEqualPack(wmsSnPrint.getStatus(), "status", result);
+
+        getStringBuilderPack(wmsSnPrint, result);
+
+        return result.toString();
+    }
 }