1011 生成条码工步

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

@@ -1255,4 +1255,41 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PCN_SN_TYPE {
+
+        NORMAL(10, "不过期"),
+        FIRST_INSPECTION(20, "一分钟");
+
+        private int value;
+        private String description;
+
+        PCN_SN_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java

@@ -75,11 +75,14 @@ public class MesEquipment extends BaseBean {
     @ApiParam("启用日期")
     private String enableDate;
 
-
     @Column(name="CONNECT_TYPE")
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
     @Transient
     @ApiParam(value ="名称")
     private String name;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/10 8:37 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FI_CFG")
+@Api("首检件配置")
+public class MesFiCfg extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="FI_QTY")
+    @ApiParam("首检数量")
+    private String fiQty;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java

@@ -63,6 +63,10 @@ public class MesPcn extends BaseBean {
     @ApiParam("连接时间")
     private String connectTime;
 
+    @Column(name = "CODE_SPECIFIC")
+    @ApiParam("PCN特殊字段")
+    private String codeSpecific;
+
     public int getConnectCountVal() {
         return this.connectCount == null ? 0 : this.connectCount;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java

@@ -109,6 +109,14 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常 20=首检件")
+    private String snType;
+
+    @Column(name = "TRAY")
+    @ApiParam("托盘号")
+    private String tray;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java

@@ -137,6 +137,18 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
+    @Column(name = "FI_QTY")
+    @ApiParam("首检数量")
+    private Long fiQty;
+
+    @Column(name = "FI_COMPLETE_QTY")
+    @ApiParam("首检完成数量")
+    private Long fiCompleteQty;
+
+    @Column(name = "FI_GENERATE_QTY")
+    @ApiParam("首检生成数量")
+    private Long fiGenerateQty;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/10/10 8:37 PM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FI_CFG")
+@Api("首检件配置")
+public class MesFiCfg extends BaseBean {
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="FI_QTY")
+    @ApiParam("首检数量")
+    private String fiQty;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java

@@ -63,6 +63,10 @@ public class MesPcn extends BaseBean {
     @ApiParam("连接时间")
     private String connectTime;
 
+    @Column(name = "CODE_SPECIFIC")
+    @ApiParam("PCN特殊字段")
+    private String codeSpecific;
+
     public int getConnectCountVal() {
         return this.connectCount == null ? 0 : this.connectCount;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -109,6 +109,14 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private String snType;
+
+    @Column(name = "TRAY")
+    @ApiParam("托盘号")
+    private String tray;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java

@@ -137,6 +137,18 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("客户订单号")
     private String custOrderNo;
 
+    @Column(name = "FI_QTY")
+    @ApiParam("首检数量")
+    private String fiQty;
+
+    @Column(name = "FI_COMPLETE_QTY")
+    @ApiParam("首检完成数量")
+    private String fiCompleteQty;
+
+    @Column(name = "FI_GENERATE_QTY")
+    @ApiParam("首检生成数量")
+    private String fiGenerateQty;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")