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

@@ -24,45 +24,49 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PCN")
+@Table(name = "MES_PCN")
 @Api("PCN节点")
 public class MesPcn extends BaseBean {
-    @Column(name="PCN_CODE")
+    @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;
 
-    @Column(name="PCN_NAME")
+    @Column(name = "PCN_NAME")
     @ApiParam("PCN名称")
     private String pcnName;
 
-    @Column(name="AREA_CODE")
+    @Column(name = "AREA_CODE")
     @ApiParam("区域")
     private String areaCode;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
 
-    @Column(name="PCN_VERSION")
+    @Column(name = "PCN_VERSION")
     @ApiParam("PCN版本")
     private String pcnVersion;
 
-    @Column(name="CONNECT_IP")
+    @Column(name = "CONNECT_IP")
     @ApiParam("连接IP")
     private String connectIp;
 
-    @Column(name="CONNECT_COUNT")
+    @Column(name = "CONNECT_COUNT")
     @ApiParam("连接次数")
     private Integer connectCount;
 
-    @Column(name="IS_CONNECT")
+    @Column(name = "IS_CONNECT")
     @ApiParam("是否连接")
     private Integer isConnect;
 
-    @Column(name="CONNECT_TIME")
+    @Column(name = "CONNECT_TIME")
     @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

@@ -25,90 +25,98 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PRODUCE_SN")
+@Table(name = "MES_PRODUCE_SN")
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean {
 
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name="QC_STATUS")
+    @Column(name = "QC_STATUS")
     @ApiParam("质量状态")
     private Integer qcStatus;
 
-    @Column(name="SN_STATUS")
+    @Column(name = "SN_STATUS")
     @ApiParam("条码状态")
     private Integer snStatus;
 
-    @Column(name="PRINT_COUNT")
+    @Column(name = "PRINT_COUNT")
     @ApiParam("打印次数")
     private Integer printCount;
 
-    @Column(name="PRINT_STATUS")
+    @Column(name = "PRINT_STATUS")
     @ApiParam("打印状态")
     private Integer printStatus;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="ROUTE_CODE")
+    @Column(name = "ROUTE_CODE")
     @ApiParam("流程代码")
     private String routeCode;
 
-    @Column(name="PROCESS_CODE")
+    @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;
 
-    @Column(name="NEXT_PROCESS_CODE")
+    @Column(name = "NEXT_PROCESS_CODE")
     @ApiParam("下一工序代码")
     private String nextProcessCode;
 
-    @Column(name="IN_WC_TIME")
+    @Column(name = "IN_WC_TIME")
     @ApiParam("进产线时间")
     private String inWorkCenterTime;
 
-    @Column(name="OUT_WC_TIME")
+    @Column(name = "OUT_WC_TIME")
     @ApiParam("出产线时间")
     private String outWorkCenterTime;
 
-    @Column(name="SHIPPING_TIME")
+    @Column(name = "SHIPPING_TIME")
     @ApiParam("发运时间")
     private String shippingTime;
 
-    @Column(name="WORK_ORDER_NO")
+    @Column(name = "WORK_ORDER_NO")
     @ApiParam("生产工单号")
     private String workOrderNo;
 
-    @Column(name="CUST_SN")
+    @Column(name = "CUST_SN")
     @ApiParam("客户条码")
     private String custSn;
 
-    @Column(name="CUST_PART_NO")
+    @Column(name = "CUST_PART_NO")
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="PACKAGE_SN")
+    @Column(name = "PACKAGE_SN")
     @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

@@ -26,110 +26,110 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_WORK_ORDER")
+@Table(name = "MES_WORK_ORDER")
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean {
-    @Column(name="ORDER_NO")
+    @Column(name = "ORDER_NO")
     @ApiParam("工单号")
     private String orderNo;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME_RDD")
+    @Column(name = "PART_NAME_RDD")
     @ApiParam("物料名称")
     private String partNameRdd;
 
-    @Column(name="PROD_CFG_CODE")
+    @Column(name = "PROD_CFG_CODE")
     @ApiParam("产品配置代码")
     private String prodCfgCode;
 
-    @Column(name="QTY")
+    @Column(name = "QTY")
     @ApiParam("数量")
     private Double qty;
 
-    @Column(name="COMPLETE_QTY")
+    @Column(name = "COMPLETE_QTY")
     @ApiParam("完成数量")
     private Double completeQty;
 
-    @Column(name="REPAIR_QTY")
+    @Column(name = "REPAIR_QTY")
     @ApiParam("返修数量")
     private Double repairQty;
 
-    @Column(name="SCRAP_QTY")
+    @Column(name = "SCRAP_QTY")
     @ApiParam("报废数量")
     private Double scrapQty;
 
-    @Column(name="SEQ")
+    @Column(name = "SEQ")
     @ApiParam("工单序号")
     private Double seq;
 
-    @Column(name="WO_STATUS")
+    @Column(name = "WO_STATUS")
     @ApiParam("工单状态")
     private Integer workOrderStatus;
 
-    @Column(name="WO_TYPE")
+    @Column(name = "WO_TYPE")
     @ApiParam("工单类型")
     private Integer workOrderType;
 
-    @Column(name="NEXT_ORDER")
+    @Column(name = "NEXT_ORDER")
     @ApiParam("下一工单")
     private String nextOrder;
 
-    @Column(name="PLAN_ORDER_NO")
+    @Column(name = "PLAN_ORDER_NO")
     @ApiParam("生产计划单号")
     private String planOrderNo;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="AREA_CODE")
+    @Column(name = "AREA_CODE")
     @ApiParam("区域代码")
     private String areaCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="SCHEDULE_DATE")
+    @Column(name = "SCHEDULE_DATE")
     @ApiParam("排产日期")
     private String scheduleDate;
 
-    @Column(name="CUST_PROD_LINE_CODE")
+    @Column(name = "CUST_PROD_LINE_CODE")
     @ApiParam("客户产线代码")
     private String custProdLineCode;
 
-    @Column(name="SHIFT_CODE")
+    @Column(name = "SHIFT_CODE")
     @ApiParam("班次")
     private String shiftCode;
 
-    @Column(name="START_TIME")
+    @Column(name = "START_TIME")
     @ApiParam("开始时间")
     private String startTime;
 
-    @Column(name="END_TIME")
+    @Column(name = "END_TIME")
     @ApiParam("结束时间")
     private String endTime;
 
-    @Column(name="WO_SOURCE")
+    @Column(name = "WO_SOURCE")
     @ApiParam("工单来源")
     private String workOrderSource;
 
-    @Column(name="MEMO")
+    @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 
-    @Column(name="SHIFT_GROUP")
+    @Column(name = "SHIFT_GROUP")
     @ApiParam("班组")
     private String shiftGroup;
 
-    @Column(name="APPROVAL_STATUS")
+    @Column(name = "APPROVAL_STATUS")
     @ApiParam("审批状态")
     private Integer approvalStatus;
 
-    @Column(name="CUST_CODE")
+    @Column(name = "CUST_CODE")
     @ApiParam("客户代码")
     private String custCode;
 
@@ -137,29 +137,41 @@ 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="工作中心名称")
+    @ApiParam(value = "工作中心名称")
     public String workCenterName;
 
     @Transient
-    @ApiParam(value="工作单元名称")
+    @ApiParam(value = "工作单元名称")
     public String workCellName;
 
     @Transient
-    @ApiParam(value="客户产线名称")
+    @ApiParam(value = "客户产线名称")
     public String custProdLineName;
 
     @Transient
-    @ApiParam(value="班次名称")
+    @ApiParam(value = "班次名称")
     public String shiftName;
 
     @Transient
-    @ApiParam(value="班组名称")
+    @ApiParam(value = "班组名称")
     public String shiftGroupName;
 
     @Transient
-    @ApiParam(value="产品配置名称")
+    @ApiParam(value = "产品配置名称")
     public String prodCfgName;
 
     @Transient
@@ -168,23 +180,23 @@ public class MesWorkOrder extends BaseBean {
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "计划开始日期查询用，查询开始日期", example = "2018-12-31 23:59:59")
     public String startTimeStart;
 
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "计划开始日期查询用，查询截至日期", example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "计划结束日期查询用，查询结束日期起始", example = "2018-12-31 23:59:59")
     public String endTimeStart;
 
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
+    @ApiParam(value = "计划结束日期查询用，查询结束日期截至", example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
     @Transient
@@ -192,7 +204,7 @@ public class MesWorkOrder extends BaseBean {
     private MesWorkOrderButtonModel workOrderButtonModel;
 
     @Transient
-    @ApiParam(value="下达按钮编号")
+    @ApiParam(value = "下达按钮编号")
     public String buttonCode;