合并代码

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

@@ -1868,7 +1868,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMMON_SN {
-        PO_SN("PO_SN", "PO条码");
+        PO_SN("PO_SN", "PO条码"),
+        VDA_SN("VDA_SN", "VDA条码");
 
         private String code;
         private String description;
@@ -3449,6 +3450,75 @@ 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;
+        }
+    }
+
+    /**
      * 物料关系信息 关联类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -147,6 +147,22 @@ public class WmsPart extends BaseBean {
     @ApiParam("保质期天数")
     private Integer qualityDays;
 
+    @Column(name = "IS_REPORT_PARTNO")
+    @ApiParam("是否报工零件")
+    private Integer isReportPartNo;
+
+    @Column(name = "REPORT_LOCATE_NO")
+    @ApiParam("报工库位")
+    private String reportLocateNo;
+
+    @Column(name = "REPORT_ZONE_NO")
+    @ApiParam("报工存储区")
+    private String reportZoneNo;
+
+    @Column(name = "PRODUCT_LINES")
+    @ApiParam("报工产线")
+    private String productLines;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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

@@ -0,0 +1,59 @@
+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-26 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PRINTER_CONFIGURE")
+@Api("打印机配置表")
+public class WmsPrinterConfigure extends BaseBean{
+
+    private static final long serialVersionUID = 1234639813072592779L;
+    @Column(name="PRINTER_NO")
+    @ApiParam("打印机编号")
+    private String printerNo;
+
+    @Column(name="PRINTER_NAME")
+    @ApiParam("打印机名称")
+    private String printerName;
+
+    @Column(name="IP")
+    @ApiParam("IP")
+    private String ip;
+
+    @Column(name="PORT")
+    @ApiParam("端口")
+    private Integer port;
+
+    @Column(name="OBJECT_DESCRIPTION")
+    @ApiParam(value ="描述")
+    private String objectDescription;
+
+    @Column(name="POSITION")
+    @ApiParam("位置")
+    private String position;
+
+    @Column(name="TYPE")
+    @ApiParam("类型")
+    private Integer type;
+}

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/WmsPrinterConfigureRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure;
+
+/**
+ * @Description : 打印机配置
+ * @Reference   :
+ * @Author      : jessica.chen
+ * @Date        : 2019-09-26 12:03:00
+ * @Modify      :
+ **/
+public interface WmsPrinterConfigureRepository extends BaseRepository<WmsPrinterConfigure, Long> {
+}

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