From 9f918b66649a9537ad4df50a1e8a5bed78f0be4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 20:15:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A2=E6=AC=A1=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=92=8C=E8=8C=83=E5=9B=B4=E6=9E=9A=E4=B8=BE=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=80=BC=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 125 ++++++++++++--------- 1 file changed, 73 insertions(+), 52 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d7b809e..d669fdb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -5357,24 +5357,36 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10), - IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10), - IS_SAME_PART("同物料", "isSamePart", "2", 10), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10), - IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10), - IS_COLLECTION("物料整箱归集", "isCollection", "2", 10); - - private String chName; - - private String enName; - - private int waveMergeType; + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10, + 0, "isSameCustomer", "同客户"), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10, + 0, "isSameWareHouse", "同仓库"), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10, + 0, "isSamePriority", "同优先级"), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10, + 0, "isSameSrcZone", "同来源存储区"), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10, + 0, "isSameDestZone", "同目标存储区"), + IS_SAME_PART("同物料", "isSamePart", "2", 10, + 0, "isSamePart", "同物料"), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10, + 0, "isSamePartGroup", "同物料组"), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10, + 0, "isSameDeliveryTime", "同发货时间"), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10, + 0, "isSameBusiType", "同业务类型"), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10, + 0, "isSameOrderStatus", "同单据状态"), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10, + 0, "isCrossArea", "允许跨区"), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10, + 0, "isCollection", "物料整箱归集"); + + private String fieldChName; + + private String fieldEnName; + + private int mergeOperatorType; private String fieldValue; @@ -5384,27 +5396,31 @@ public class WmsEnumUtil { private String description; - WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { - this.chName = chName; - this.enName = enName; + WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value, + String code, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; this.fieldValue = fieldValue; - this.waveMergeType = waveMergeType; + this.mergeOperatorType = mergeOperatorType; + this.value = value; + this.description = description; + this.code = code; } - public String getChName() { - return chName; + public String getFieldChName() { + return fieldChName; } - public String getEnName() { - return enName; + public String getFieldEnName() { + return fieldEnName; } public String getFieldValue() { return fieldValue; } - public int getWaveMergeType() { - return waveMergeType; + public int getMergeOperatorType() { + return mergeOperatorType; } public String getDescription() { @@ -5427,33 +5443,34 @@ public class WmsEnumUtil { public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", "custNo,custName", "custNo,custName", "custNo", - 20, ""), + 20, "", "custNo", 0, "客户代码"), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", "code,name", "code,name", "code", - 20, ""), + 20, "", "srcWhNo", 0, "仓库代码"), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20, ""), + "", "", 20, "", + "priority", 0, "优先级"), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", "zoneNo,zoneName", "zoneNo", "zoneNo", - 20, ""), + 20, "", "srcZoneNo", 0, "来源存储区代码"), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", "zoneNo,zoneName", "zoneNo", "zoneNo", - 20, ""), + 20, "", "destZoneNo", 0, "目标存储区代码"), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", "partNo,partName", "partNo", "partNo", - 20, ""), + 20, "", "partNo", 0, "物料号"), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", "partGroupNo,partGroupName", "partGroupNo", - "partGroupNo", 20, ""), + "partGroupNo", 20, "", "partGroupNo", 0, "物料组代码"), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20, ""), + "", "", 20, "", "busiType", 0, "业务类型"), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20, ""); + "", "", 20, "", "orderStatus", 0, "单据状态"); // 中文名称 - String chName; + String fieldChName; // 英文名称 - String enName; + String fieldEnName; // 下拉枚举名称 String entityName; // 下拉列表显示列名称,多个列名需要根据逗号分隔 @@ -5463,7 +5480,7 @@ public class WmsEnumUtil { // 回显列名 String explicitColumnName; // 合并操作类型 - private int waveMergeType; + private int mergeOperatorType; private String fieldValue; @@ -5473,24 +5490,28 @@ public class WmsEnumUtil { 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; - this.enName = enName; + WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName, + String searchColumnName, String explicitColumnName, int mergeOperatorType, String fieldValue, + String code, int value, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; this.entityName = entityName; this.listColumnName = listColumnName; this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; - this.waveMergeType = waveMergeType; + this.mergeOperatorType = mergeOperatorType; this.fieldValue = fieldValue; + this.code = code; + this.value = value; + this.description = description; } - public String getChName() { - return chName; + public String getFieldEnName() { + return fieldEnName; } - public String getEnName() { - return enName; + public String getFieldChName() { + return fieldChName; } public String getEntityName() { @@ -5509,8 +5530,8 @@ public class WmsEnumUtil { return explicitColumnName; } - public int getWaveMergeType() { - return waveMergeType; + public int getMergeOperatorType() { + return mergeOperatorType; } public String getFieldValue() { @@ -5522,7 +5543,7 @@ public class WmsEnumUtil { } public String getDescription() { - return description; + return "description"; } public String getCode() {