Fix Bug #0776

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-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")
+    @Column(name = "JIS_BACKFLUSH_STATUS")
-    @ApiParam("工单类型")
+    @ApiParam("回冲状态")
-    private Integer workOrderType;
+    private String jisBackflushStatus;
 }

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;