From cc5e388ad332af1c4134b3a78bcf4c3220d35e8c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 13 Nov 2023 10:41:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E5=88=B0?= =?UTF-8?q?=E5=A4=84bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/ErrorCodeConstants.java | 112 +++++++++--------- .../itembasic/ItembasicController.java | 1 + .../itembasic/vo/ItembasicExcelVO.java | 3 +- 3 files changed, 59 insertions(+), 57 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 8322bfab..f0e7f563 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -11,7 +11,7 @@ public interface ErrorCodeConstants { //物品基本信息ErrorCode ErrorCode ITEMBASIC_NOT_EXISTS = new ErrorCode(1_000_020_000, "物品基本信息不存在"); ErrorCode ITEMBASIC_CODE_NOT_EXISTS = new ErrorCode(1_000_020_001, "物品基本信息不正确"); - ErrorCode ITEMBASIC_CODE_EXISTS = new ErrorCode(1_000_020_002, "code已存在"); + ErrorCode ITEMBASIC_CODE_EXISTS = new ErrorCode(1_000_020_002, "代码已存在"); ErrorCode ITEMBASIC_STATUS_NOT_EXISTS = new ErrorCode(1_000_020_003, "状态不存在"); ErrorCode ITEMBASIC_UOM_NOT_EXISTS = new ErrorCode(1_000_020_004, "计量单位不存在"); ErrorCode ITEMBASIC_IS_STDPACK_NOT_EXISTS = new ErrorCode(1_000_020_005, "是否标包不存在"); @@ -29,8 +29,8 @@ public interface ErrorCodeConstants { ErrorCode ITEMBASIC_UOM_EXCEPTION = new ErrorCode(1_000_020_017, "计量单位【{}】错误，应该是【{}】"); //物品包装信息ErrorCode ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物品包装信息 不存在"); - ErrorCode ITEMPACKAGING_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_021_001, "code不存在"); - ErrorCode ITEMPACKAGING_ITEM_CODE_EXISTS = new ErrorCode(1_000_021_002, "code已存在"); + ErrorCode ITEMPACKAGING_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_021_001, "代码不存在"); + ErrorCode ITEMPACKAGING_ITEM_CODE_EXISTS = new ErrorCode(1_000_021_002, "代码已存在"); ErrorCode ITEMPACKAGING_UOM_NOT_EXISTS = new ErrorCode(1_000_021_003, "计量单位不存在"); ErrorCode ITEMPACKAGING_STD_PACK_UNIT_NOT_EXISTS = new ErrorCode(1_000_021_004, "包装单位不存在"); ErrorCode ITEMPACKAGING_STD_PACK_QTY_NOT_EXISTS = new ErrorCode(1_000_021_005, "包装数量不存在"); @@ -64,8 +64,8 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_024_005, "是否可用不存在"); //采购价格单ErrorCode ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_000_025_000, "供应商不存在"); - ErrorCode SUPPLIER_NOT_EXISTSNO = new ErrorCode(1_000_025_001, "code已存在"); - ErrorCode SUPPLIER_MOUBLE_EXISTSNO = new ErrorCode(1_000_025_002, "code已存在"); + ErrorCode SUPPLIER_NOT_EXISTSNO = new ErrorCode(1_000_025_001, "代码已存在"); + ErrorCode SUPPLIER_MOUBLE_EXISTSNO = new ErrorCode(1_000_025_002, "代码已存在"); ErrorCode SUPPLIER_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_025_003, "是否可用不存在"); ErrorCode SUPPLIER_SHORTNAME_NOT_EXISTS = new ErrorCode(1_000_025_004, "简称不存在"); ErrorCode SUPPLIER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_025_005, "导入供货商不能为空"); @@ -89,15 +89,15 @@ public interface ErrorCodeConstants { ErrorCode PURCHASEPRICE_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_027_007, "是否可用不存在"); //客户ErrorCode ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(1_000_028_000, "客户不存在"); - ErrorCode CUSTOMER_CODE_EXISTS = new ErrorCode(1_000_028_001, "code已存在"); - ErrorCode CUSTOMER_CODE_NOT_EXISTS = new ErrorCode(1_000_028_002, "code不存在"); + ErrorCode CUSTOMER_CODE_EXISTS = new ErrorCode(1_000_028_001, "代码已存在"); + ErrorCode CUSTOMER_CODE_NOT_EXISTS = new ErrorCode(1_000_028_002, "代码不存在"); ErrorCode CUSTOMER_SHORTNAME_NOT_EXISTS = new ErrorCode(1_000_028_003, "简称不存在"); ErrorCode CUSTOMER_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_028_004, "是否可用不存在"); ErrorCode CUSTOMER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_028_005, "导入客户不能为空"); //客户月台ErrorCode ErrorCode CUSTOMERDOCK_NOT_EXISTS = new ErrorCode(1_000_029_000, "客户月台不存在"); - ErrorCode CUSTOMERDOCK_CODE_EXISTS = new ErrorCode(1_000_029_001, "code已存在"); - ErrorCode CUSTOMERDOCK_CODE_NOT_EXISTS = new ErrorCode(1_000_029_002, "code不存在"); + ErrorCode CUSTOMERDOCK_CODE_EXISTS = new ErrorCode(1_000_029_001, "代码已存在"); + ErrorCode CUSTOMERDOCK_CODE_NOT_EXISTS = new ErrorCode(1_000_029_002, "代码不存在"); ErrorCode CUSTOMERDOCK_CUSTOMER_CODE_NOT_EXISTS = new ErrorCode(1_000_029_003, "客户代码不存在"); ErrorCode CUSTOMERDOCK_DEFAULT_LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_029_004, "默认库位不存在"); ErrorCode CUSTOMERDOCK_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_029_005, "是否可用不存在"); @@ -115,8 +115,8 @@ public interface ErrorCodeConstants { //项目ErrorCode ErrorCode PROJECT_NOT_EXISTS = new ErrorCode(1_000_031_000, "项目不存在"); ErrorCode PROJECT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_031_001, "导入项目不能为空"); - ErrorCode PROJECT_CODE_EXISTS = new ErrorCode(1_000_031_002, "code已存在"); - ErrorCode PROJECT_CODE_NOT_EXISTS = new ErrorCode(1_000_031_003, "code不存在"); + ErrorCode PROJECT_CODE_EXISTS = new ErrorCode(1_000_031_002, "代码已存在"); + ErrorCode PROJECT_CODE_NOT_EXISTS = new ErrorCode(1_000_031_003, "代码不存在"); ErrorCode PROJECT_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_031_004, "是否可用不存在"); //销售价格单ErrorCode ErrorCode SALEPRICE_NOT_EXISTS = new ErrorCode(1_000_032_000, "销售价格单不存在"); @@ -128,15 +128,15 @@ public interface ErrorCodeConstants { ErrorCode SALEPRICE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_032_005, "导入销售价格单不能为空"); //仓库ErrorCode ErrorCode WAREHOUSE_NOT_EXISTS = new ErrorCode(1_033_000_000, "仓库不存在"); - ErrorCode WAREHOUSE_CODE_EXISTS = new ErrorCode(1_033_000_001, "code已存在"); - ErrorCode WAREHOUSE_CODE_NOT_EXISTS = new ErrorCode(1_033_000_002, "code不存在"); + ErrorCode WAREHOUSE_CODE_EXISTS = new ErrorCode(1_033_000_001, "代码已存在"); + ErrorCode WAREHOUSE_CODE_NOT_EXISTS = new ErrorCode(1_033_000_002, "代码不存在"); ErrorCode WAREHOUSE_AVAIABLE_NOT_EXISTS = new ErrorCode(1_033_000_003, "是否可用不存在"); ErrorCode WAREHOUSE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_033_000_004, "导入仓库不能为空"); ErrorCode WAREHOUSE_STOCK_EXCEPTION = new ErrorCode(1_033_000_005, "库存问题【{}】"); //月台ErrorCode ErrorCode DOCK_NOT_EXISTS = new ErrorCode(1_000_034_000, "月台(收货口)不存在"); - ErrorCode DOCK_CODE_NOT_EXISTS = new ErrorCode(1_000_034_001, "code不存在"); - ErrorCode DOCK_CODE_EXISTS = new ErrorCode(1_000_034_002, "code已存在"); + ErrorCode DOCK_CODE_NOT_EXISTS = new ErrorCode(1_000_034_001, "代码不存在"); + ErrorCode DOCK_CODE_EXISTS = new ErrorCode(1_000_034_002, "代码已存在"); ErrorCode DOCK_TYPE_NOT_EXISTS = new ErrorCode(1_000_034_003, "类型不存在"); ErrorCode DOCK_WARE_HOUSE_CODE_NOT_EXISTS = new ErrorCode(1_000_034_004, "仓库代码不存在"); ErrorCode DOCK_DEFAULT_LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_034_005, "默认库位代码不存在"); @@ -144,24 +144,24 @@ public interface ErrorCodeConstants { ErrorCode DOCK_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_034_007, "导入月台不能为空"); //库区ErrorCode ErrorCode AREABASIC_NOT_EXISTS = new ErrorCode(1_000_035_000, "库区不存在"); - ErrorCode AREABASIC_CODE_EXISTS = new ErrorCode(1_000_035_001, "code已存在"); - ErrorCode AREABASIC_CODE_NOT_EXISTS = new ErrorCode(1_000_035_002, "code不存在"); + ErrorCode AREABASIC_CODE_EXISTS = new ErrorCode(1_000_035_001, "代码已存在"); + ErrorCode AREABASIC_CODE_NOT_EXISTS = new ErrorCode(1_000_035_002, "代码不存在"); ErrorCode AREABASIC_WAREHOUSE_CODE_EXISTS = new ErrorCode(1_000_035_003, "仓库代码不存在"); ErrorCode AREABASIC_IS_FUNCTIONAL_EXISTS = new ErrorCode(1_000_035_004, "是否是功能区不存在"); ErrorCode AREABASIC_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_035_005, "是否可用不存在"); ErrorCode AREABASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_035_006, "导入库区不能为空"); //库位组ErrorCode ErrorCode LOCATIONGROUP_NOT_EXISTS = new ErrorCode(1_000_036_000, "库位组不存在"); - ErrorCode LOCATIONGROUP_CODE_EXISTS = new ErrorCode(1_000_036_001, "code已存在"); - ErrorCode LOCATIONGROUP_CODE_NOT_EXISTS = new ErrorCode(1_000_036_002, "code不存在"); + ErrorCode LOCATIONGROUP_CODE_EXISTS = new ErrorCode(1_000_036_001, "代码已存在"); + ErrorCode LOCATIONGROUP_CODE_NOT_EXISTS = new ErrorCode(1_000_036_002, "代码不存在"); ErrorCode LOCATIONGROUP_WARE_HOUSE_CODE_NOT_EXISTS = new ErrorCode(1_000_036_003, "仓库代码不存在"); ErrorCode LOCATIONGROUP_AREA_CODE_NOT_EXISTS = new ErrorCode(1_000_036_004, "区域代码不存在"); ErrorCode LOCATIONGROUP_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_036_005, "是否可用不存在"); ErrorCode LOCATIONGROUP_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_036_006, "导入库位组不能为空"); //库位ErrorCode ErrorCode LOCATION_NOT_EXISTS = new ErrorCode(1_000_037_000, "库位不存在"); - ErrorCode LOCATION_CODE_EXISTS = new ErrorCode(1_000_037_001, "code已存在"); - ErrorCode LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_037_002, "code不存在"); + ErrorCode LOCATION_CODE_EXISTS = new ErrorCode(1_000_037_001, "代码已存在"); + ErrorCode LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_037_002, "代码不存在"); ErrorCode LOCATION_WARE_HOUSE_CODE_NOT_EXISTS = new ErrorCode(1_000_037_003, "仓库代码不存在"); ErrorCode LOCATION_AREA_CODE_NOT_EXISTS = new ErrorCode(1_000_037_004, "区域代码不存在"); ErrorCode LOCATION_ERP_LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_037_005, "库位组不存在"); @@ -171,7 +171,7 @@ public interface ErrorCodeConstants { ErrorCode LOCATION_USER_GROUP_CODE_NOT_EXISTS = new ErrorCode(1_000_037_009, "用户组代码不存在"); ErrorCode LOCATION_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_037_010, "是否可用不存在"); ErrorCode LOCATION_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_037_011, "导入库位不能为空"); - ErrorCode LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS = new ErrorCode(1_000_037_012, "未查找到零件item_code库位location_code对应的上架策略"); + ErrorCode LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS = new ErrorCode(1_000_037_012, "未查找到零件库位对应的上架策略"); ErrorCode LOCATION_HANDLE_TOLOCATIONCODE_AND_RECOMMEND_TOLOCATIONCODECODE_INCONFORMITY = new ErrorCode(1_000_037_013, "实际库位与任务推荐的目标库位不一致"); ErrorCode LOCATION_DISABLE_NEGATIVE = new ErrorCode(1_000_037_014, "库位不允许负库存"); ErrorCode LOCATION_EXCEPTION = new ErrorCode(1_000_037_015, "库位问题：【{}】"); @@ -179,22 +179,22 @@ public interface ErrorCodeConstants { ErrorCode LOCATION_NOT_CUST = new ErrorCode(1_000_037_017, "【{}】不是客户寄售库"); //车间ErrorCode ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_038_000_000, "车间不存在"); - ErrorCode WORKSHOP_CODE_EXISTS = new ErrorCode(1_039_000_001, "code已存在"); - ErrorCode WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_039_000_002, "code已存在"); + ErrorCode WORKSHOP_CODE_EXISTS = new ErrorCode(1_039_000_001, "代码已存在"); + ErrorCode WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_039_000_002, "代码已存在"); ErrorCode WORKSHOP_AVAIABLE_NOT_EXISTS = new ErrorCode(1_040_000_003, "是否可用不存在"); ErrorCode WORKSHOP_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_040_000_004, "导入车间不能为空"); //生产线ErrorCode ErrorCode PRODUCTIONLINE_NOT_EXISTS = new ErrorCode(1_000_039_000, "生产线不存在"); ErrorCode PRODUCTIONLINE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_039_001, "导入生产线数据不能为空"); - ErrorCode PRODUCTIONLINE_CODE_EXISTS = new ErrorCode(1_000_039_002, "code已存在"); - ErrorCode PRODUCTIONLINE_CODE_NOT_EXISTS = new ErrorCode(1_000_039_003, "code不存在"); + ErrorCode PRODUCTIONLINE_CODE_EXISTS = new ErrorCode(1_000_039_002, "代码已存在"); + ErrorCode PRODUCTIONLINE_CODE_NOT_EXISTS = new ErrorCode(1_000_039_003, "代码不存在"); ErrorCode PRODUCTIONLINE_WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_000_039_004, "车间代码不存在"); ErrorCode PRODUCTIONLINE_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_039_005, "是否可用不存在"); ErrorCode PRODUCTIONLINE_AND_WORKSHOP_RELATION_ERROR = new ErrorCode(1_000_039_004, "未查到该生产线与车间的关系"); //工序ErrorCode ErrorCode WORKSTATION_NOT_EXISTS = new ErrorCode(1_000_040_000, "工位不存在"); - ErrorCode WORKSTATION_CODE_NOT_EXISTS = new ErrorCode(1_000_040_001, "code不存在"); - ErrorCode WORKSTATION_CODE_EXISTS = new ErrorCode(1_000_040_002, "code已存在"); + ErrorCode WORKSTATION_CODE_NOT_EXISTS = new ErrorCode(1_000_040_001, "代码不存在"); + ErrorCode WORKSTATION_CODE_EXISTS = new ErrorCode(1_000_040_002, "代码已存在"); ErrorCode WORKSTATION_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_040_003, "是否可用不存在"); ErrorCode WORKSTATION_WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_000_040_004, "车间代码不存在"); ErrorCode WORKSTATION_PRODUECTION_LINE_CODE_NOT_EXISTS = new ErrorCode(1_000_040_005, "生产线代码不存在"); @@ -203,14 +203,14 @@ public interface ErrorCodeConstants { //工序ErrorCode ErrorCode PROCESS_NOT_EXISTS = new ErrorCode(1_000_041_000, "工序不存在"); ErrorCode PROCESS_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_041_001, "导入工序数据不能为空"); - ErrorCode PROCESS_CODE_EXISTS = new ErrorCode(1_000_041_002, "code已存在"); - ErrorCode PROCESS_CODE_NOT_EXISTS = new ErrorCode(1_000_041_003, "code不存在"); + ErrorCode PROCESS_CODE_EXISTS = new ErrorCode(1_000_041_002, "代码已存在"); + ErrorCode PROCESS_CODE_NOT_EXISTS = new ErrorCode(1_000_041_003, "代码不存在"); ErrorCode PROCESS_WORKSHOP_CODE_NOT_EXISTS = new ErrorCode(1_000_041_004, "车间代码不存在"); ErrorCode PROCESS_PRODUCTION_LINE_CODE_NOT_EXISTS = new ErrorCode(1_000_041_005, "生产线代码不存在"); ErrorCode PROCESS_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_041_006, "是否可用不存在"); //系统日历ErrorCode ErrorCode SYSTEMCALENDAR_NOT_EXISTS = new ErrorCode(1_042_000_000, "系统日历不存在"); - ErrorCode SYSTEMCALENDAR_MOUBLE_NOT_EXISTS = new ErrorCode(1_000_042_001, "code已存在"); + ErrorCode SYSTEMCALENDAR_MOUBLE_NOT_EXISTS = new ErrorCode(1_000_042_001, "代码已存在"); ErrorCode SYSTEMCALENDAR_AVAIABLE_NOT_EXISTS = new ErrorCode(1_042_000_002, "是否可用不存在"); ErrorCode SYSTEMCALENDAR_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_042_000_003, "导入系统日历不能为空"); //账期日历ErrorCode @@ -226,8 +226,8 @@ public interface ErrorCodeConstants { ErrorCode CURRENCYEXCHANGE_CURRENCY_NOT_EXISTS = new ErrorCode(1_000_044_005, "货币不存在"); //规则ErrorCode ErrorCode RULE_NOT_EXISTS = new ErrorCode(1_000_045_000, "规则不存在"); - ErrorCode RULE_CODE_EXISTS = new ErrorCode(1_000_045_001, "code已存在"); - ErrorCode RULE_CODE_NOT_EXISTS = new ErrorCode(1_000_045_001, "code不存在"); + ErrorCode RULE_CODE_EXISTS = new ErrorCode(1_000_045_001, "代码已存在"); + ErrorCode RULE_CODE_NOT_EXISTS = new ErrorCode(1_000_045_001, "代码不存在"); ErrorCode RULE_STRATEGYCODE_NOT_EXISTS = new ErrorCode(1_000_045_001, "策略规则不存在"); ErrorCode RULE_PRIORITY_NOT_EXISTS = new ErrorCode(1_000_045_001, "策略规则不存在"); ErrorCode RULE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_045_001, "导入规则不能为空"); @@ -254,14 +254,14 @@ public interface ErrorCodeConstants { ErrorCode CONFIGURATIONSETTING_VALUE_SCOPE_NOT_EXISTS = new ErrorCode(1_048_000_006, "值范围不存在"); // 事务类型ErrorCode ErrorCode TRANSACTIONTYPE_NOT_EXISTS = new ErrorCode(1_049_000_000, "事务类型不存在"); - ErrorCode TRANSACTIONTYPE_CODE_EXISTS = new ErrorCode(1_049_000_001, "code已存在"); - ErrorCode TRANSACTIONTYPE_CODE_NOT_EXISTS = new ErrorCode(1_049_000_002, "code不存在"); + ErrorCode TRANSACTIONTYPE_CODE_EXISTS = new ErrorCode(1_049_000_001, "代码已存在"); + ErrorCode TRANSACTIONTYPE_CODE_NOT_EXISTS = new ErrorCode(1_049_000_002, "代码不存在"); ErrorCode TRANSACTIONTYPE_AVAIABLE_NOT_EXISTS = new ErrorCode(1_049_000_003, "是否可用不存在"); ErrorCode TRANSACTIONTYPE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_049_000_004, "导入事务类型不能为空"); //业务类型ErrorCode ErrorCode BUSINESSTYPE_NOT_EXISTS = new ErrorCode(1_050_000_000, "业务类型不存在"); - ErrorCode BUSINESSTYPE_CODE_NOT_EXISTS = new ErrorCode(1_050_000_001, "code不存在"); - ErrorCode BUSINESSTYPE_CODE_EXISTS = new ErrorCode(1_050_000_002, "code已存在"); + ErrorCode BUSINESSTYPE_CODE_NOT_EXISTS = new ErrorCode(1_050_000_001, "代码不存在"); + ErrorCode BUSINESSTYPE_CODE_EXISTS = new ErrorCode(1_050_000_002, "代码已存在"); ErrorCode BUSINESSTYPE_NAME_NOT_EXISTS = new ErrorCode(1_050_000_003, "名称不存在"); ErrorCode BUSINESSTYPE_ITEM_TYPES_NOT_EXISTS = new ErrorCode(1_050_000_004, "可用物品类型范围不存在"); ErrorCode BUSINESSTYPE_ITEM_STATUSES_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_050_000_005, "可用物品状态范围不存在"); @@ -272,8 +272,8 @@ public interface ErrorCodeConstants { ErrorCode BUSINESSTYPE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_050_000_008, "导入业务类型不能为空"); // 单据设置ErrorCode ErrorCode DOCUMENTSETTING_NOT_EXISTS = new ErrorCode(1_000_051_000, "单据设置不存在"); - ErrorCode DOCUMENTSETTING_CODE_EXISTS = new ErrorCode(1_000_051_001, "code已存在"); - ErrorCode DOCUMENTSETTING_CODE_NOT_EXISTS = new ErrorCode(1_000_051_002, "code不存在"); + ErrorCode DOCUMENTSETTING_CODE_EXISTS = new ErrorCode(1_000_051_001, "代码已存在"); + ErrorCode DOCUMENTSETTING_CODE_NOT_EXISTS = new ErrorCode(1_000_051_002, "代码不存在"); ErrorCode DOCUMENTSETTING_NAME_NOT_EXISTS = new ErrorCode(1_000_051_003, "名称不存在"); ErrorCode DOCUMENTSETTING_DESCRIPTION_NOT_EXISTS = new ErrorCode(1_000_051_004, "描述不存在"); ErrorCode DOCUMENTSETTING_TYPE_NOT_EXISTS = new ErrorCode(1_000_051_005, "单据类型不存在"); @@ -286,8 +286,8 @@ public interface ErrorCodeConstants { //申请设置ErrorCode ErrorCode REQUESTSETTING_NOT_EXISTS = new ErrorCode(1_000_052_000, "申请设置不存在"); ErrorCode REQUESTSETTING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_052_001, "导入申请设置不能为空"); - ErrorCode REQUESTSETTING_CODE_EXISTS = new ErrorCode(1_000_052_002, "code已存在"); - ErrorCode REQUESTSETTING_CODE_NOT_EXISTS = new ErrorCode(1_000_052_003, "code不存在"); + ErrorCode REQUESTSETTING_CODE_EXISTS = new ErrorCode(1_000_052_002, "代码已存在"); + ErrorCode REQUESTSETTING_CODE_NOT_EXISTS = new ErrorCode(1_000_052_003, "代码不存在"); ErrorCode REQUESTSETTING_REQUEST_MODE_NOT_EXISTS = new ErrorCode(1_000_052_004, "申请模式不存在"); ErrorCode REQUESTSETTING_AUTO_COMMIT_NOT_EXISTS = new ErrorCode(1_000_052_005, "自动提交不存在"); ErrorCode REQUESTSETTING_AUTO_AGREE_NOT_EXISTS = new ErrorCode(1_000_052_006, "自动通过不存在"); @@ -296,8 +296,8 @@ public interface ErrorCodeConstants { ErrorCode REQUESTSETTING_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_052_009, "是否可用不存在"); //任务设置ErrorCode ErrorCode JOBSETTING_NOT_EXISTS = new ErrorCode(1_000_053_000, "任务设置不存在"); - ErrorCode JOBSETTING_CODE_NOT_EXISTS = new ErrorCode(1_000_053_001, "code不存在"); - ErrorCode JOBSETTING_CODE_EXISTS = new ErrorCode(1_000_053_002, "code已存在"); + ErrorCode JOBSETTING_CODE_NOT_EXISTS = new ErrorCode(1_000_053_001, "代码不存在"); + ErrorCode JOBSETTING_CODE_EXISTS = new ErrorCode(1_000_053_002, "代码已存在"); ErrorCode JOBSETTING_AUTOCOMPLETE_NOT_EXISTS = new ErrorCode(1_000_053_003, "自动完成不存在"); ErrorCode JOBSETTING_VALIDMINUTES_NOT_EXISTS = new ErrorCode(1_000_053_004, "有效分钟不存在"); ErrorCode JOBSETTING_ALLOW_MODIFY_LACATION_NOT_EXISTS = new ErrorCode(1_000_053_005, "允许修改库位不存在"); @@ -313,21 +313,21 @@ public interface ErrorCodeConstants { //记录设置ErrorCode ErrorCode RECORDSETTING_NOT_EXISTS = new ErrorCode(1_054_000_000, "记录设置不存在"); ErrorCode RECORDSETTING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_054_000_001, "导入记录设置不能为空"); - ErrorCode RECORDSETTING_CODE_EXISTS = new ErrorCode(1_054_000_002, "code已存在"); - ErrorCode RECORDSETTING_CODE_NOT_EXISTS = new ErrorCode(1_054_000_003, "code不存在"); + ErrorCode RECORDSETTING_CODE_EXISTS = new ErrorCode(1_054_000_002, "代码已存在"); + ErrorCode RECORDSETTING_CODE_NOT_EXISTS = new ErrorCode(1_054_000_003, "代码不存在"); ErrorCode RECORDSETTING_INTERFACE_TYPE_NOT_EXISTS = new ErrorCode(1_054_000_004, "接口类型不存在"); ErrorCode RECORDSETTING_AVAILABLE_NOT_EXISTS = new ErrorCode(1_054_000_005, "是否可用不存在"); //货主ErrorCode ErrorCode OWNER_NOT_EXISTS = new ErrorCode(1_000_055_000, "货主不存在"); - ErrorCode OWNER_CODE_EXISTS = new ErrorCode(1_000_055_001, "code已存在"); - ErrorCode OWNER_CODE_NOT_EXISTS = new ErrorCode(1_000_055_002, "code不存在"); + ErrorCode OWNER_CODE_EXISTS = new ErrorCode(1_000_055_001, "代码已存在"); + ErrorCode OWNER_CODE_NOT_EXISTS = new ErrorCode(1_000_055_002, "代码不存在"); ErrorCode OWNER_SHORTNAME_NOT_EXISTS = new ErrorCode(1_000_055_003, "简称不存在"); ErrorCode OWNER_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_055_004, "是否可用不存在"); ErrorCode OWNER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_055_005, "导入货主不能为空"); //承运商ErrorCode ErrorCode CARRIER_NOT_EXISTS = new ErrorCode(1_000_056_000, "承运商不存在"); - ErrorCode CARRIER_CODE_NOT_EXISTS = new ErrorCode(1_000_056_001, "code不存在"); - ErrorCode CARRIER_CODE_EXISTS = new ErrorCode(1_000_056_002, "code已存在"); + ErrorCode CARRIER_CODE_NOT_EXISTS = new ErrorCode(1_000_056_001, "代码不存在"); + ErrorCode CARRIER_CODE_EXISTS = new ErrorCode(1_000_056_002, "代码已存在"); ErrorCode CARRIER_SHORTNAME_NOT_EXISTS = new ErrorCode(1_000_056_003, "名称不存在"); ErrorCode CARRIER_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_056_007, "是否可用不存在"); ErrorCode CARRIER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_056_008, "导入承运商不能为空"); @@ -338,12 +338,12 @@ public interface ErrorCodeConstants { ErrorCode SHIFT_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_057_003, "是否可用不存在"); ErrorCode SHIFT_ENDATNEXTDAY_NOT_EXISTS = new ErrorCode(1_000_057_004, "是否跨天不存在"); ErrorCode SHIFT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_057_005, "导入班次不能为空"); - ErrorCode SHIFT_CODE_EMPTY = new ErrorCode(1_000_057_006, "code已存在"); - ErrorCode SHIFT_CODE_NOT_EMPTY = new ErrorCode(1_000_057_007, "code不存在"); + ErrorCode SHIFT_CODE_EMPTY = new ErrorCode(1_000_057_006, "代码已存在"); + ErrorCode SHIFT_CODE_NOT_EMPTY = new ErrorCode(1_000_057_007, "代码不存在"); //班组ErrorCode ErrorCode TEAM_NOT_EXISTS = new ErrorCode(1_000_058_000, "班组不存在"); - ErrorCode TEAM_CODE_EXISTS = new ErrorCode(1_000_058_001, "code已存在"); - ErrorCode TEAM_CODE_NOT_EXISTS = new ErrorCode(1_000_058_001, "code不存在"); + ErrorCode TEAM_CODE_EXISTS = new ErrorCode(1_000_058_001, "代码已存在"); + ErrorCode TEAM_CODE_NOT_EXISTS = new ErrorCode(1_000_058_001, "代码不存在"); ErrorCode TEAM_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_058_002, "是否可用不存在"); ErrorCode TEAM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_058_004, "导入班组不能为空"); //标签定义ErrorCode @@ -351,8 +351,8 @@ public interface ErrorCodeConstants { //条码片段ErrorCode ErrorCode BARCODE_NOT_EXISTS = new ErrorCode(1_000_060_000, "条码片段不存在"); ErrorCode BARCODE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_060_001, "导入条码片段不能为空"); - ErrorCode BARCODE_CODE_EXISTS = new ErrorCode(1_000_060_002, "code已存在"); - ErrorCode BARCODE_CODE_NOT_EXISTS = new ErrorCode(1_000_060_003, "code不存在"); + ErrorCode BARCODE_CODE_EXISTS = new ErrorCode(1_000_060_002, "代码已存在"); + ErrorCode BARCODE_CODE_NOT_EXISTS = new ErrorCode(1_000_060_003, "代码不存在"); ErrorCode BARCODE_ORDER_NOT_EXISTS = new ErrorCode(1_000_060_004, "顺序不存在"); ErrorCode BARCODE_LENGTH_NOT_EXISTS = new ErrorCode(1_000_060_005, "长度不存在"); ErrorCode BARCODE_PREFIX_LENGTH_NOT_EXISTS = new ErrorCode(1_000_060_006, "前缀长度不存在"); @@ -566,7 +566,7 @@ public interface ErrorCodeConstants { //生产计划子ErrorCode ErrorCode PRODUCTION_DETAIL_NOT_EXISTS = new ErrorCode(1_001_101_001, "生产计划子不存在"); - ErrorCode PRODUCTION_MAIN_MASSAGE_EXISTS = new ErrorCode(1_001_101_002, "生产计明细:订单号pline_number、零件号pitem_code无效"); + ErrorCode PRODUCTION_MAIN_MASSAGE_EXISTS = new ErrorCode(1_001_101_002, "生产计明细:订单号、零件号无效"); ErrorCode PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS = new ErrorCode(1_001_101_003, "生产计划number已经关闭"); ErrorCode PRODUCTION_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_001_101_004, "生产计划number无效"); ErrorCode PRODUCTION_DETAIL_VOID_STATUS_ERROR = new ErrorCode(1_001_101_005, "生产计划明细无效，状态错误"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index be21c472..cdbfa713 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -163,6 +163,7 @@ public class ItembasicController { mapDropDown.put(5, uom); String[] altUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(6, altUom); + mapDropDown.put(6, altUom); String[] isStdPack = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(7, isStdPack); String[] enableBuy = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java index 7f831c47..083138ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java @@ -99,7 +99,8 @@ public class ItembasicExcelVO { @ExcelProperty("有效天数") private Integer validityDays; - @ExcelProperty("是否可用") + @ExcelProperty(value = "是否可用", converter = DictConvert.class) + @DictFormat("true_false") private String available; @ExcelProperty("生效时间")