Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -3449,4 +3449,73 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 打印类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_TYPE {
+        SN(10, "SN");
+
+        private int value;
+        private String description;
+
+        PRINT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 打印状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ETC_PRINT_STATUS {
+        NOT_HIT (10, "未打"),
+        ALREADY_HIT(20, "已打");
+
+        private int value;
+        private String description;
+
+        ETC_PRINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrintingQueue.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 待打印队列表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-27 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PRINTING_QUEUE")
+@Api("待打印队列表")
+public class WmsPrintingQueue extends BaseBean{
+
+    private static final long serialVersionUID = 1111639813072592779L;
+    @Column(name="PRINT_IDENTIFICATION")
+    @ApiParam("打印标识")
+    private String printIdentification;
+
+    @Column(name="PRINT_TYPE")
+    @ApiParam("打印类型")
+    private Integer printType;
+
+    @Column(name="PRINT_NO")
+    @ApiParam("打印机编号")
+    private String printNo;
+
+    @Column(name="PRINT_MUMBER")
+    @ApiParam("打印机张数")
+    private Integer printNumber;
+
+    @Column(name="TEMPLATE_NO")
+    @ApiParam("模板编号")
+    private String templateNo;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrintingQueueRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasVendor;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :待打印配置表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-27 14:49
+ * @Modify:
+ **/
+@Repository
+public interface WmsPrintingQueueRepository extends BaseRepository<WmsPrintingQueue, Long> {
+}