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

@@ -8012,4 +8012,81 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 不良品处理类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BAD_HANDLE_TYPE {
+        BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
+        SCRAPPED(20, "SCRAPPED", "报废"),
+        POLISHING(30, "POLISHING", "抛光"),
+        DETERMIND(40, "DETERMIND", "待定");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BAD_HANDLE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -39,4 +39,7 @@ public class MgnPaintPolishingReportModel {
     @ApiParam("组织代码")
     private String organizeCode;
 
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
 }

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/9 15:35
+ * @desc
+ */
+@Data
+public class TjMgnBoardEquipmentMonitorModel {
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("横坐标")
+    private Double xAxes = 0d;
+
+    @ApiParam("纵坐标")
+    private Double yAxes = 0d;
+
+    @ApiParam("工位状态")
+    private String workCellStatus;
+
+    @ApiParam("颜色")
+    private String color;
+}

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

@@ -53,10 +53,6 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("行号")
     public String item;
 
-    @Column(name = "REF_ITEM")
-    @ApiParam("关联行号")
-    public Integer refItem;
-
     @Column(name = "QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam(value = "需求数量", example = "0")
@@ -204,6 +200,7 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("源单行号")
     public String srcItem;
 
+
     @Column(name = "CUST_ORDER_NO")
     @ApiParam("客户订单号")
     public String custOrderNo;

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

@@ -173,6 +173,10 @@ public class WmsPartExtend extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String lastQcTime;
 
+    @Column(name = "CYCLE_IQC")
+    @ApiParam(value = "周期内免检", example = "1")
+    private Integer cycleIqc;
+
     public Integer getQcPassCount() {
         return this.qcPassCount == null ? 0 :this.qcPassCount.intValue();
     }