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

@@ -25,7 +25,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_COMMIT_CHECK {
         DISABLE(1, "禁止提交"), CHECK_MOVE(2, "校验移动单"),
-         NO_CHECK(3, "不校验"),CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
+        NO_CHECK(3, "不校验"), CHECK_OLD_MOVE_NO(4, "校验是否已产生移动单");
 
         private int value;
         private String description;
@@ -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++) {
@@ -860,7 +861,7 @@ public class WmsEnumUtil {
                 return null;
             } else {
                 for (int i = 0; i < values().length; i++) {
-                    if (StringUtils.equalsIgnoreCase(values()[i].value,value)) {
+                    if (StringUtils.equalsIgnoreCase(values()[i].value, value)) {
                         return values()[i];
                     }
                 }
@@ -917,7 +918,7 @@ public class WmsEnumUtil {
         INIT(20, "INIT", "初始化"),
         IS_GENERAL(30, "IS_GENERAL", "已生成"),
         NO_GENERAL(40, "NO_GENERAL", "不生成"),
-        CANCEL(50,"CANCEL","撤销");
+        CANCEL(50, "CANCEL", "撤销");
 
         private int value;
         private String code;
@@ -1098,7 +1099,7 @@ public class WmsEnumUtil {
         MONTH_INVENTORY(20, "月度盘点"),
         SEASON_INVENTORY(30, "季度盘点"),
         YEAR_INVENTORY(40, "年度盘点"),
-    	AJUST_INVENTORY(50, "库存调整盘点");
+        AJUST_INVENTORY(50, "库存调整盘点");
         private int value;
         private String description;
 
@@ -3435,12 +3436,13 @@ public class WmsEnumUtil {
      * 收货状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum REC_STATUS{
+    public enum REC_STATUS {
         UNRECEIVED("UNRECEIVED", "未收货"),
         COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
         PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
         OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
-        OTHER("ELSE", "其他"),;
+        OTHER("ELSE", "其他"),
+        ;
 
         private String value;
         private String description;
@@ -3476,7 +3478,7 @@ public class WmsEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val) ) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
@@ -3523,7 +3525,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ETC_PRINT_STATUS {
-        NOT_HIT (10, "未打"),
+        NOT_HIT(10, "未打"),
         ALREADY_HIT(20, "已打");
 
         private int value;
@@ -3681,8 +3683,8 @@ public class WmsEnumUtil {
     public enum ROUTING_RULE_MODE {
         CREATE_TASK(10, "CREATE_TASK", "生成任务"),
         AUTO_OPT(20, "AUTO_OPT", "自动操作"),
-    	MENU_OPT(30, "MENU_OPT", "手工操作"),
-    	AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
+        MENU_OPT(30, "MENU_OPT", "手工操作"),
+        AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
         private int value;
         private String code;
         private String description;
@@ -3729,13 +3731,14 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 物流规则 处理模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ROUTING_RULE_TYPE {
-    	PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
-    	REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
+        PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
+        REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
         private int value;
         private String code;
         private String description;
@@ -3782,12 +3785,13 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 物流规则 处理单位
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ROUTING_DELAY_UNIT {
-    	M(10, "M", "分"),
+        M(10, "M", "分"),
         D(20, "D", "天");
         private int value;
         private String code;
@@ -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")
 })