Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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

@@ -285,6 +285,7 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -3440,7 +3441,8 @@ public class WmsEnumUtil {
         COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
         PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
         OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
-        OTHER("ELSE", "其他"),;
+        OTHER("ELSE", "其他"),
+        ;
 
         private String value;
         private String description;
@@ -3729,6 +3731,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 物流规则 处理模式
      */
@@ -3782,6 +3785,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 物流规则 处理单位
      */
@@ -3836,4 +3840,37 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * MOVE_TO_ERP表是否同步
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVE_TO_ERP_IS_SYNC {
+        SYNCHRONIZED(1, "已同步"), UN_SYNCHRONIZED(2, "未同步"), NON_SYNCHRONIZED(3, "不同步");
+
+        private int value;
+        private String description;
+
+        MOVE_TO_ERP_IS_SYNC(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;
+        }
+    }
 }

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

@@ -26,6 +26,7 @@ import javax.persistence.*;
 @Table(name = "WMS_MOVE_TO_ERP", indexes = {
         @Index(columnList = "TRANS_TYPE_CODE"),
         @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ITEM"),
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "PART_NO")
 })