From 3529d1b8451401a3ed44edd5c5458b08cc720e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 1 Apr 2020 20:30:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=8C=83=E5=9B=B4=E5=92=8C=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 69 +++++++++++++--------- 1 file changed, 41 insertions(+), 28 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 0fde085..fc12b72 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,18 +5357,18 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 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); + 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; @@ -5376,12 +5376,12 @@ public class WmsEnumUtil { private int waveMergeType; - private int value; + private String fieldValue; - WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) { + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; - this.value = value; + this.fieldValue = fieldValue; this.waveMergeType = waveMergeType; } @@ -5393,8 +5393,8 @@ public class WmsEnumUtil { return enName; } - public int getValue() { - return value; + public String getFieldValue() { + return fieldValue; } public int getWaveMergeType() { @@ -5408,23 +5408,29 @@ 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", 20), + "custNo, custName", "custNo, custName", "custNo", + 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", 20), + "code, name", "code, name", "code", + 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20), + "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", 20), - PART_GROUP_NO("物料组代码", "partGroupNo", "", "", - "", "", 20), + "partNo, partName", "partNo", "partNo", + 20, ""), + PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", + "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20), + "", "", 20, ""), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20); + "", "", 20, ""); // 中文名称 String chName; @@ -5441,8 +5447,10 @@ public class WmsEnumUtil { // 合并操作类型 private int waveMergeType; + private String fieldValue; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, - String searchColumnName, String explicitColumnName, int waveMergeType) { + String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; this.enName = enName; this.entityName = entityName; @@ -5450,6 +5458,7 @@ public class WmsEnumUtil { this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; this.waveMergeType = waveMergeType; + this.fieldValue = fieldValue; } public String getChName() { @@ -5479,6 +5488,10 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getFieldValue() { + return fieldValue; + } } /**