【波次合并规则--枚举查询错误】

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

@@ -5378,6 +5378,12 @@ public class WmsEnumUtil {
 
         private String fieldValue;
 
+        private int value;
+
+        private String code;
+
+        private String description;
+
         WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) {
             this.chName = chName;
             this.enName = enName;
@@ -5400,6 +5406,18 @@ public class WmsEnumUtil {
         public int getWaveMergeType() {
             return waveMergeType;
         }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public int getValue() {
+            return value;
+        }
     }
 
     /**
@@ -5408,24 +5426,24 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WAVE_MERGE_RANGE {
         CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer",
-                "custNo, custName", "custNo, custName", "custNo",
+                "custNo,custName", "custNo,custName", "custNo",
                 20, ""),
         WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse",
-                "code, name", "code, name", "code",
+                "code,name", "code,name", "code",
                 20, ""),
         PRIORITY("优先级", "priority", "PRIORITY_NEW", "",
                 "", "", 20, ""),
         SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-                "zoneNo, zoneName", "zoneNo", "zoneNo",
+                "zoneNo,zoneName", "zoneNo", "zoneNo",
                 20, ""),
         DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones",
-                "zoneNo, zoneName", "zoneNo", "zoneNo",
+                "zoneNo,zoneName", "zoneNo", "zoneNo",
                 20, ""),
         PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart",
-                "partNo, partName", "partNo", "partNo",
+                "partNo,partName", "partNo", "partNo",
                 20, ""),
         PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup",
-                "partGroupNo, partGroupName", "partGroupNo",
+                "partGroupNo,partGroupName", "partGroupNo",
                 "partGroupNo", 20, ""),
         BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "",
                 "", "", 20, ""),
@@ -5449,6 +5467,12 @@ public class WmsEnumUtil {
 
         private String fieldValue;
 
+        private int value;
+
+        private String code;
+
+        private String description;
+
         WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName,
                          String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) {
             this.chName = chName;
@@ -5492,6 +5516,18 @@ public class WmsEnumUtil {
         public String getFieldValue() {
             return fieldValue;
         }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
     }
 
     /**