diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 312c1f6..28db666 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -3859,6 +3859,43 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 产线管控-过程检验状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_INSPECTION {
+        NOT_CREATE(10, "未创建"),
+        CREATE(20, "创建"),
+        PROCESS(30, "执行中"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        PROCESS_INSPECTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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;
+        }
+    }
+
+    /**
      * 整体检测结果状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5937,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;
+        }
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java
index 5380410..f755466 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLineFaultRecord.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java
index 405f089..58803e3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataResultModel.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -18,19 +19,19 @@ public class QcCheckDataResultModel {
     private Integer isFirstCheck;
 
     @ApiParam("首检结果")
-    private List<MesQcCheckData> firstCheckResult;
+    private List<MesQcOrder> firstCheckResult;
 
     @ApiParam("是否完成巡检")
     private Integer isOnSiteCheck;
 
     @ApiParam("巡检结果")
-    private List<MesQcCheckData> onSiteCheckResult;
+    private List<MesQcOrder> onSiteCheckResult;
 
     @ApiParam("是否完成尾检")
     private Integer isEndCheck;
 
     @ApiParam("尾检结果")
-    private List<MesQcCheckData> endCheckResult;
+    private List<MesQcOrder> endCheckResult;
 
     public QcCheckDataResultModel() {
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 3d469ee..3dec39f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -114,7 +114,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam(value = "紧急程度")
-    private String urgentStatus;
+    private Integer urgentStatus;
 
     @Column(name = "SRC_NO")
     @ApiParam(value = "源单号")