Start Task #2118 Cost:8h Left:0h

Finish Task #2118 Cost:8h

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

@@ -6278,4 +6278,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 停机类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum STOP_MACHINE_TYPE {
+        TIMER_TIME_OUT(10, "计时器超时停机"),
+        DELAY_HELP(20, "延时帮助停机"),
+        URGENT_STOP(30, "急停停机");
+
+        private int value;
+        private String description;
+
+        STOP_MACHINE_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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4073,52 +4073,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * 停机类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STOP_MACHINE_TYPE {
-        TIMER_TIME_OUT(10, "计时器超时停机"),
-        DELAY_HELP(20, "延时帮助停机"),
-        URGENT_STOP(30, "急停停机");
-
-        private int value;
-        private String description;
-
-        STOP_MACHINE_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;
-        }
-    }
-
-    /**
      * plc状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2991,13 +2991,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesAgvRecoredData(MesAgvStopRecord stopRecord, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringLikerPack(stopRecord.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getWorkCellCode(), "workCellCode", packBean);
         DdlPreparedPack.getNumEqualPack(stopRecord.getStopType(), "stopType", packBean);
-        DdlPreparedPack.getStringEqualPack(stopRecord.getProductSn(), "productSn", packBean);
+        DdlPreparedPack.getStringLikerPack(stopRecord.getProductSn(), "productSn", packBean);
-        DdlPreparedPack.getNumEqualPack(stopRecord.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(stopRecord.getPartNo(), "partNo", packBean);
         if (!StringUtils.isEmpty(stopRecord.getStopStartTime()) || !StringUtils.isEmpty(stopRecord.getStopEndTime())) {
             DdlPreparedPack.timeBuilder(stopRecord.getCreateDateTimeStart(), stopRecord.getCreateDateTimeEnd(),
-                    "stopEndTime", packBean, true);
+                    "stopStartTime", packBean, true);
         }
         return packBean;
     }