解决冲突

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;
 }

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

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

@@ -669,6 +669,28 @@ public class WmsHqlPack {
     }
 
     /**
+     * 根据条件查询打印机队列信息封装类
+     * @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();
+    }
+
+    /**
      * 盘点库位 条件封装
      * @param wmsCSLocate
      * @return