Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -6933,4 +6933,52 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 产品位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_CATEGORY {
+
+        FL("FL", "DOOR_FRONT_LEFT"),
+        FR("FR", "DOOR_FRONT_RIGHT"),
+        RL("RL", "DOOR_REAR_LEFT"),
+        RR("RR", "DOOR_REAR_RIGHT");
+
+        private String description;
+        private String value;
+
+        PRODUCE_CATEGORY(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -63,7 +63,8 @@ public class MesPcnEnumUtil {
         BUTTON_MODULE(30, "按钮组件"),
         TIMING_MODULE(40, "定时组件"),
         PCS_BACK_MODULE(50, "工序后台组件"),
-        PLC_CALLBACK_MODULE(60, "PLC回调工位参数");
+        PLC_CALLBACK_MODULE(60, "PLC回调工位参数"),
+        ASSIST_MODULE(70, "辅助组件");
 
         private int value;
         private String description;
@@ -2578,7 +2579,10 @@ public class MesPcnEnumUtil {
         STEP_LIST("stepList", "工步列表"),
         STATE_LIST("stateList", "状态列表"),
         STEP_CONTENT("stepContent", "工步内容"),
-        MODULE_CONTENT("moduleContent", "组件内容"),
+        MODULE_CONTENT("moduleContent", "展示组件内容"),
+        MODULE_HEAD("moduleHead", "展示组件头"),
+        GUIDE_CONTENT("guideContent", "指导内容"),
+        ASSISTANT_CONTENT("assistantContent", "辅助展示组件"),
         CUSTOM_COMPONENT("customComponent", "定制内容"),
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
@@ -2634,6 +2638,8 @@ public class MesPcnEnumUtil {
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
         IMAGE_LIST("image_list", "图片列表"),
+        MODULE_HEAD("module_head", "展示组件头部"),
+        MODULE_GUIDE("module_guide", "展示组件知道内容"),
         SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"),
         BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字");
 
@@ -4808,4 +4814,39 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * JIT队列锁定池 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ASSISTANT_MODULE_DISPLAY {
+        MULTIMEDIA_PLUG(10, "多媒体插头"),
+        ATTENTION_INFO(20, "关注内容");
+
+        private Integer value;
+        private String description;
+
+        ASSISTANT_MODULE_DISPLAY(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -140,7 +140,7 @@ public class IfProductOffLine extends BaseBean  implements Serializable {
     @ApiParam("质量状态")
     private Integer qcStatus = 10;
 
-    @Column(name = "WO_TYPE")
-    @ApiParam("工单类型")
-    private Integer workOrderType;
+    @Column(name = "JIS_BACKFLUSH_STATUS")
+    @ApiParam("回冲状态")
+    private String jisBackflushStatus;
 }

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

@@ -76,7 +76,7 @@ public class MesPackage extends BaseBean implements Serializable {
 
     @Column(name = "PACK_LEVEL")
     @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
-    private Integer packLevel;
+    private Integer packLevel = 1;
 
     @Column(name = "WORK_ORDER_NO")
     @ApiParam("生产工单号")

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

@@ -116,8 +116,4 @@ public class MesQueueJitPlan extends BaseBean implements Serializable {
     @Transient
     @ApiParam("计划上线结束时间")
     private String planEndDate;
-
-    @Transient
-    @ApiParam("版本")
-    private String ifVersion;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java

@@ -185,7 +185,7 @@ public class QueueOrderModel implements Serializable {
 
     // getPrintSnQueueOrderModel
     public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo,
-                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq) {
+                           String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) {
         this.id = id;
         this.queDetailSeq = queDetailSeq;
         this.pgCode = pgCode;
@@ -200,6 +200,7 @@ public class QueueOrderModel implements Serializable {
         this.vinCode = vinCode;
         this.queueSeq = queueSeq;
         this.groupSeq = groupSeq;
+        this.serialNumber = serialNumber;
     }
 
     public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java

@@ -37,7 +37,7 @@ public class Pn implements Serializable {
     private List<Part> parts;
 
     @XStreamAlias("optioncode")
-    private List<CodeRule> codeRules = new ArrayList<>();
+    private List<CodeRule> codeRules;
 
     @ApiParam("新vin号")
     private String newVin;

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

@@ -104,4 +104,14 @@ public class WmsListElement extends BaseBean {
     @Column(name = "EXPLICIT_COLUMN_NAME")
     @ApiParam(value = "回显列名")
     private String explicitColumnName;
+
+    public WmsListElement() {
+    }
+
+    public WmsListElement(Integer seq, String userCode, Long functionId, String organizeCode) {
+        this.seq = seq;
+        this.userCode = userCode;
+        this.functionId = functionId;
+        this.organizeCode = organizeCode;
+    }
 }