停开机记录bug修改

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/ShiftProdCenterRecordController.java

@@ -97,9 +97,8 @@ public class ShiftProdCenterRecordController extends MesPcnBaseController {
                     .notNull(MesPcnExtConstWords.SHIFT_CODE, centerRecordModel.getShiftCode())
                     .notNull(MesPcnExtConstWords.WORKER_QTY, centerRecordModel.getWorkerQty())
                     .notNull(MesPcnExtConstWords.MODIFY_USER, centerRecordModel.getModifyUser())
-                    .notNull(MesPcnExtConstWords.WORK_TIME, centerRecordModel.getWorkTime())
-                    .notNull(MesPcnExtConstWords.AT_HOME_NUM, centerRecordModel.getWorkTime())
-                    .notNull(MesPcnExtConstWords.ABSENTEEISM_NUM, centerRecordModel.getWorkTime())
+                    .notNull(MesPcnExtConstWords.AT_HOME_NUM, centerRecordModel.getAtHomeNum())
+                    .notNull(MesPcnExtConstWords.ABSENTEEISM_NUM, centerRecordModel.getAbsenteeismNum())
                     .notNull(MesPcnExtConstWords.NEW_WORK_NUM, centerRecordModel.getNewWorkNum())
                     .notNull(MesPcnExtConstWords.QUIT_WORK_NUM, centerRecordModel.getQuitWorkNum())
                     .notNull(MesPcnExtConstWords.START_TIME, centerRecordModel.getStartTime())

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ShiftProdCenterRecordService.java

@@ -179,7 +179,7 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi
                 new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID,
                         MesPcnExtConstWords.WORK_CENTER_CODE, MesPcnExtConstWords.SHIFT_CODE, MesPcnExtConstWords.WORK_TIME, MesPcnExtConstWords.PROD_TYPE},
                 new Object[]{workCenterDb.getOrganizeCode(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(),
-                        workCenterDb.getWorkCenterCode(), workCenterDb.getShiftCode(), workCenterDb.getWorkTime(), MesPcnExtEnumUtil.SHIFT_PROD_TYPE.START_OR_END_SHIFT_TIME});
+                        workCenterDb.getWorkCenterCode(), workCenterDb.getShiftCode(), workCenterDb.getWorkTime(), MesPcnExtEnumUtil.SHIFT_PROD_TYPE.START_OR_END_SHIFT_TIME.getValue()});
 
         if (shiftProdCenterRecordDb == null) {
             throw ImppExceptionBuilder.newInstance()

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -851,4 +851,7 @@ public class MesPcnExtConstWords {
 
     //扭矩规格值
     public static final String TORQUE_SPEC_VALUE = "torqueSpecValue";
+
+    //本体条码上线
+    public static final String NOUMENON_SN_POP_UP_ONLINE = "NOUMENON_SN_POP_UP_ONLINE";
 }

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java

@@ -3337,4 +3337,50 @@ public class MesPcnExtEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * mes 管理码使用状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MANAGE_USE_STATUS {
+
+        LEISURE("10", "空闲"),
+        OCCUPY("20", "占用");
+
+        private String value;
+        private String description;
+
+        MANAGE_USE_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String description) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }