Merge remote-tracking branch 'origin/test' into test

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

@@ -5974,4 +5974,58 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 预装产线，工位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRE_WORK_CENTER_CODE {
+        OP10("OP10", "OP10"),
+        OP20A("OP20a", "OP20a"),
+        OP20B("OP20b", "OP20b");
+
+        private String code;
+        private String description;
+
+        PRE_WORK_CENTER_CODE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PRE_WORK_CENTER_CODE getByCode(String code) {
+            for (PRE_WORK_CENTER_CODE workCenterCode : values()) {
+                if (workCenterCode.getCode().equals(code)) {
+                    return workCenterCode;
+                }
+            }
+            return null;
+        }
+        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;
+        }
+
+        public static String valueOfDescription(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;
+        }
+    }
 }

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

@@ -39,5 +39,5 @@ public class MesLineFaultRecord extends BaseBean implements Serializable {
 
     @Column(name = "FAULT_TIME")
     @ApiParam("故障时长（分）")
-    private Double faultTime;
+    private Long faultTime;
 }

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

@@ -1,9 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
-import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -13,7 +11,11 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 质检单明细信息
@@ -61,6 +63,7 @@ public class WmsQCDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_ITEM_STATUS.class, refForeignKey = "value", value = "description")
     public Integer itemStatus;
 
     @Column(name = "REMARK")

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

@@ -54,7 +54,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MASTER_ORDER_STATUS")
     public Integer orderStatus;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java

@@ -35,7 +35,8 @@ import javax.persistence.Table;
         @Index(columnList = "DEST_BEAN_NAME"),
         @Index(columnList = "SOFT_ADAPTOR_CODE"),
         @Index(columnList = "SID"),
-        @Index(columnList = "MOVE_TO_ERP_ID")
+        @Index(columnList = "MOVE_TO_ERP_ID"),
+        @Index(columnList = "ERP_DOC_NO")
 })
 @Api("接口数据收发记录")
 public class WmsInterfaceDataRecord extends BaseBean {
@@ -78,4 +79,17 @@ public class WmsInterfaceDataRecord extends BaseBean {
     @ApiParam("ERP文档编号")
     @Column(name = "ERP_DOC_NO")
     private String erpDocNo;
+
+    @ApiParam("ERP状态代码")
+    @Column(name = "ERP_STATUS_CODE")
+    private String erpStatusCode;
+
+    @ApiParam("ERP状态描述")
+    @Column(name = "ERP_STATUS_DESC")
+    private String erpStatusDesc;
+
+    @ApiParam("ERP最后更新时间")
+    @Column(name = "ERP_LAST_MODIFY_TIME")
+    private String erpLastModifyTime;
+
 }