解决冲突

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

@@ -378,51 +378,51 @@ public class WmsEnumUtil {
         }
     }
 
-//    /**
+    /**
-//     * PO条码状态信息
+     * PO条码状态信息
-//     */
+     */
-//    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-//    public enum SN_DETAILS_STATUS {
+    public enum SN_DETAILS_STATUS {
-//        CREATE(10, "新建"),
+        CREATE(10, "新建"),
-//        WAREHOUSING(30, "已打印"),
+        WAREHOUSING(30, "已打印"),
-//        RECEIPT_FINISH(20, "已收货");
+        RECEIPT_FINISH(20, "已收货");
-//
+
-//        private int value;
+        private int value;
-//        private String description;
+        private String description;
-//
+
-//        SN_DETAILS_STATUS(int value, String description) {
+        SN_DETAILS_STATUS(int value, String description) {
-//            this.value = value;
+            this.value = value;
-//            this.description = description;
+            this.description = description;
-//        }
+        }
-//
+
-//        public int getValue() {
+        public int getValue() {
-//            return value;
+            return value;
-//        }
+        }
-//
+
-//        public String getDescription() {
+        public String getDescription() {
-//            return description;
+            return description;
-//        }
+        }
-//
+
-//        public static String valueOf(int val) {
+        public static String valueOf(int val) {
-//            String tmp = null;
+            String tmp = null;
-//            for (int i = 0; i < values().length; i++) {
+            for (int i = 0; i < values().length; i++) {
-//                if (values()[i].value == val) {
+                if (values()[i].value == val) {
-//                    tmp = values()[i].description;
+                    tmp = values()[i].description;
-//                }
+                }
-//            }
+            }
-//            return tmp;
+            return tmp;
-//        }
+        }
-//
+
-//        public static int descOf(String desc) {
+        public static int descOf(String desc) {
-//            int tmp = 1;
+            int tmp = 1;
-//            for (int i = 0; i < values().length; i++) {
+            for (int i = 0; i < values().length; i++) {
-//                if (values()[i].description.equals(desc)) {
+                if (values()[i].description.equals(desc)) {
-//                    tmp = values()[i].value;
+                    tmp = values()[i].value;
-//                }
+                }
-//            }
+            }
-//            return tmp;
+            return tmp;
-//        }
+        }
-//    }
+    }
 
     /**
      * 消息队列，队列名称