【2002 泰国内饰生产作业-按生产工单，单件生产】

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

@@ -6194,4 +6194,49 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 选配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPTION_TYPE {
+        OPTION(10, "选配件"),
+        BOM_DISASSEMBLY(20, "BOM拆解");
+
+        private int value;
+        private String description;
+
+        OPTION_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;
+        }
+
+        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/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java

@@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @Transient
     private String mesWorkNo;
 
+    @Transient
+    @ApiParam("产品条码")
+    private String productSn;
+
 }

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

@@ -57,4 +57,8 @@ public class MesQueueOrderBom extends BaseBean  implements Serializable {
     @Column(name = "COLOR_CODE")
     @ApiParam("颜色代码")
     private String colorCode;
+
+    @Column(name = "OPTION_TYPE")
+    @ApiParam("选配类型")
+    private Integer optionType;
 }

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

@@ -92,6 +92,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品颜色")
     private String produceColor;
 
+    @Column(name = "PRODUCE_COLOR_CODE")
+    @ApiParam("产品颜色代码")
+    private String produceColorCode;
+
     @Column(name = "OPTION_CODE")
     @ApiParam("选项代码")
     private String optionCode;

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

@@ -77,5 +77,5 @@ public class MesQueueShippingDetail extends BaseBean implements Serializable {
 
     @Column(name = "PRODUCE_COLOR")
     @ApiParam("产品颜色")
-    private Double produceColor;
+    private String produceColor;
 }

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

@@ -29,6 +29,6 @@ public class SpQueueShippingModel {
     private String gradeCode;
 
     @ApiParam("产品颜色")
-    private Double produceColor;
+    private String produceColor;
 
 }

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

@@ -138,6 +138,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步弹框状态")
     private Boolean stepDialogStatus = false;
 
+    @ApiParam("特殊展示数据")
+    private Map<String, Object> specialDisplayMap  = new HashMap<>();
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

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

@@ -55,4 +55,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("定制页面名称")
     private String customPageName;
+
+    @ApiParam("特殊展示数据")
+    private Object specialDisplayData;
 }