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/MesPcnEnumUtil.java

@@ -16,6 +16,47 @@ public class MesPcnEnumUtil {
      * 作业程序组件类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IPC_PROD_ACTION_TYPE {
+        HAND_WORK(10, "10", "手工录入模式"),
+        PLC_WORK(20, "20", "PLC监听模式");
+
+        private int value;
+        private String code;
+        private String description;
+
+        IPC_PROD_ACTION_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 作业程序组件类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_MODULE_TYPE {
         MONITOR_MODULE(10, "监听组件"),
         REVEAL_MODULE(20, "展示组件"),
@@ -4604,4 +4645,5 @@ public class MesPcnEnumUtil {
 
     }
 
+
 }

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

@@ -40,9 +40,9 @@ public class MesBoardDisplay extends BaseBean implements Serializable {
 
     @Column(name = "IS_ROLL")
     @ApiParam("是否滚动")
-    private String isRoll;
+    private Integer isRoll;
 
     @Column(name = "ROLL_SPEED")
     @ApiParam("滚动速度")
-    private String rollSpeed;
+    private Integer rollSpeed;
 }

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

@@ -81,6 +81,9 @@ public class ProductInfoManageModel {
     @ApiParam("明细队列序列")
     private Double queDetailSeq;
 
+    @ApiParam("主队列编号")
+    private String orderNo;
+
     @ApiParam("总队列类型")
     private List<Integer> queueTypeList;
 
@@ -97,4 +100,13 @@ public class ProductInfoManageModel {
         this.produceColor = produceColor;
         this.queDetailSeq = queDetailSeq;
     }
+
+    public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) {
+        this.vinCode = vinCode;
+        this.produceCategoryCode = produceCategoryCode;
+        this.orderNo = orderNo;
+        this.queDetailSeq = queDetailSeq;
+        this.queueSeq = queueSeq;
+        this.workType = workType;
+    }
 }