物品改成物料

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java

@@ -7,7 +7,7 @@ package com.win.module.wms.enums;
  */
 public interface DictTypeConstants {
 
-    String ITEM_STATUS = "item_status";// 物品状态
+    String ITEM_STATUS = "item_status";// 物料状态
 
     String UOM = "uom";// 计量单位
 
@@ -15,15 +15,15 @@ public interface DictTypeConstants {
 
     String ABC_CLASS = "abc_class";// ABC类
 
-    String ITEM_TYPE = "item_type";// 物品类型
+    String ITEM_TYPE = "item_type";// 物料类型
 
-    String ITEM_CATEGORY = "Item_category";// 物品种类
+    String ITEM_CATEGORY = "Item_category";// 物料种类
 
-    String ITEM_GROUP = "item_group";// 物品分组
+    String ITEM_GROUP = "item_group";// 物料分组
 
-    String ITEM_COLOR = "item_color";// 物品颜色
+    String ITEM_COLOR = "item_color";// 物料颜色
 
-    String ITEM_CONFIGURATION = "item_configuration";// 物品配置
+    String ITEM_CONFIGURATION = "item_configuration";// 物料配置
 
     String EQ_LEVEL = "eq_level";// 质量等级
 

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java

@@ -8,9 +8,9 @@ import com.win.framework.common.exception.ErrorCode;
  * system 系统，使用 1-002-000-000 段
  */
 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
+    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, "代码已存在");
     ErrorCode ITEMBASIC_STATUS_NOT_EXISTS = new ErrorCode(1_000_020_003, "状态不存在");
     ErrorCode ITEMBASIC_UOM_NOT_EXISTS = new ErrorCode(1_000_020_004, "计量单位不存在");
@@ -24,19 +24,19 @@ public interface ErrorCodeConstants {
     ErrorCode ITEMBASIC_TYPE_NOT_EXISTS = new ErrorCode(1_000_020_012, "类型不存在");
     ErrorCode ITEMBASIC_VALIDITY_DAYS_NOT_EXISTS = new ErrorCode(1_000_020_013, "有效天数不存在");
     ErrorCode ITEMBASIC_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_020_014, "是否可用不存在");
-    ErrorCode ITEMBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入物品基础信息不能为空");
-    ErrorCode ITEMBASIC_EXCEPTION = new ErrorCode(1_000_020_016, "物品基础信息错误:【{}】");
+    ErrorCode ITEMBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入物料基础信息不能为空");
+    ErrorCode ITEMBASIC_EXCEPTION = new ErrorCode(1_000_020_016, "物料基础信息错误:【{}】");
     ErrorCode ITEMBASIC_UOM_EXCEPTION = new ErrorCode(1_000_020_017, "计量单位【{}】错误，应该是【{}】");
-    //物品包装信息ErrorCode
-    ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物品包装信息 不存在");
+    //物料包装信息ErrorCode
+    ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物料包装信息 不存在");
     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, "包装数量不存在");
     ErrorCode ITEMPACKAGING_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_021_006, "是否可用不存在");
-    ErrorCode ITEMPACKAGING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_021_007, "导入物品包装信息不能为空");
-    ErrorCode ITEMPACKAGING_NULL = new ErrorCode(1_000_021_008, "物品包装信息无效");
+    ErrorCode ITEMPACKAGING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_021_007, "导入物料包装信息不能为空");
+    ErrorCode ITEMPACKAGING_NULL = new ErrorCode(1_000_021_008, "物料包装信息无效");
     //物料清单ErrorCode
     ErrorCode BOM_NOT_EXISTS = new ErrorCode(1_000_022_000, "物料清单不存在");
     ErrorCode BOM_PRODUCT_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_022_001, "父物料代码不存在");
@@ -62,11 +62,11 @@ public interface ErrorCodeConstants {
     ErrorCode PRODUCTIONLINEITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_024_001, "导入生产线物料关系不能为空");
     ErrorCode PRODUCTIONLINEITEM_FGLOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_024_002, "完工收货库位不存在");
     ErrorCode PRODUCTIONLINEITEM_PRODUCT_LINE_COED_NOT_EXISTS = new ErrorCode(1_000_024_003, "产线代码不存在");
-    ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_024_004, "物品代码不存在");
+    ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_024_004, "物料代码不存在");
     ErrorCode PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_024_005, "是否可用不存在");
     ErrorCode PRODUCTIONLINEITEM_NOT_EXIST = new ErrorCode(1_000_024_006, "生产线物料关系不存在【{}】");
     ErrorCode PRODUCTIONLINEITEM_PRODUCT_LINE_COED_IS_EMPTY = new ErrorCode(1_000_024_007, "产线代码不能为空");
-    ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_IS_EMPTY = new ErrorCode(1_000_024_008, "物品代码不能为空");
+    ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_IS_EMPTY = new ErrorCode(1_000_024_008, "物料代码不能为空");
     //采购价格单ErrorCode
     ErrorCode SUPPLIERPRICE_NOT_EXISTS = new ErrorCode(1_023_000_000, "采购价格单不存在");
     ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_000_025_000, "供应商不存在");
@@ -75,14 +75,14 @@ public interface ErrorCodeConstants {
     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, "导入供货商不能为空");
-    //供应商物品ErrorCode
-    ErrorCode SUPPLIERITEM_NOT_EXISTS = new ErrorCode(1_000_026_000, "供应商物品不存在");
+    //供应商物料ErrorCode
+    ErrorCode SUPPLIERITEM_NOT_EXISTS = new ErrorCode(1_000_026_000, "供应商物料不存在");
     ErrorCode SUPPLIERITEM_SUPPLIER_CODE_NOT_EXISTS = new ErrorCode(1_000_026_001, "供应商代码不存在");
     ErrorCode SUPPLIERITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_026_002, "物料代码不存在");
     ErrorCode SUPPLIERITEM_PACK_UNIT_NOT_EXISTS = new ErrorCode(1_000_026_003, "供应商包装单位不存在");
     ErrorCode SUPPLIERITEM_PACK_QTY_NOT_EXISTS = new ErrorCode(1_000_026_004, "供应商包装数量不存在");
     ErrorCode SUPPLIERITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_026_005, "是否可用不存在");
-    ErrorCode SUPPLIERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_026_006, "导入供应商物品不能为空");
+    ErrorCode SUPPLIERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_026_006, "导入供应商物料不能为空");
     ErrorCode SUPPLIERITEM_ITEM_CODE_EXISTS = new ErrorCode(1_000_026_007, "物料代码已存在");
     ErrorCode SUPPLIERITEM_PACK_QTY_OF_CONTAINER_NOT_EXISTS = new ErrorCode(1_000_026_008, "供应商每器具包装数量不存在");
     //采购价格单ErrorCode
@@ -109,8 +109,8 @@ public interface ErrorCodeConstants {
     ErrorCode CUSTOMERDOCK_DEFAULT_LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_029_004, "默认库位不存在");
     ErrorCode CUSTOMERDOCK_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_029_005, "是否可用不存在");
     ErrorCode CUSTOMERDOCK_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_029_006, "导入客户月台不能为空");
-    //客户物品ErrorCode
-    ErrorCode CUSTOMERITEM_NOT_EXISTS = new ErrorCode(1_000_030_000, "客户物品不存在");
+    //客户物料ErrorCode
+    ErrorCode CUSTOMERITEM_NOT_EXISTS = new ErrorCode(1_000_030_000, "客户物料不存在");
     ErrorCode CUSTOMERITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_030_001, "是否可用不存在");
     ErrorCode CUSTOMERITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_030_002, "物料代码不存在");
     ErrorCode CUSTOMERITEM_ITEM_CODE_EXISTS = new ErrorCode(1_000_030_003, "物料代码已存在");
@@ -118,7 +118,7 @@ public interface ErrorCodeConstants {
     ErrorCode CUSTOMERITEM_PACKUNIT_NOT_EXISTS = new ErrorCode(1_000_030_005, "客户包装单位不存在");
     ErrorCode CUSTOMERITEM_PACKQTY_NOT_EXISTS = new ErrorCode(1_000_030_006, "客户包装量不存在");
     ErrorCode CUSTOMERITEM_PACKQTY_OF_CONTAINER_NOT_EXISTS = new ErrorCode(1_000_030_007, "每器具包装数不存在");
-    ErrorCode CUSTOMERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_030_008, "导入客户物品不能为空");
+    ErrorCode CUSTOMERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_030_008, "导入客户物料不能为空");
     //项目ErrorCode
     ErrorCode PROJECT_NOT_EXISTS = new ErrorCode(1_000_031_000, "项目不存在");
     ErrorCode PROJECT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_031_001, "导入项目不能为空");
@@ -274,8 +274,8 @@ public interface ErrorCodeConstants {
     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, "可用物品状态范围不存在");
+    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, "可用物料状态范围不存在");
     ErrorCode BUSINESSTYPE_OUT_TRANSACTION_TYPE_NOT_EXISTS = new ErrorCode(1_050_000_006, "出库事务类型不存在");
     ErrorCode BUSINESSTYPE_IN_TRANSACTION_TYPE_NOT_EXISTS = new ErrorCode(1_050_000_007, "入库事务类型不存在");
     ErrorCode BUSINESSTYPE_USE_ON_THE_WAY__NOT_EXISTS = new ErrorCode(1_050_000_007, "是否使用在途库不存在");
@@ -395,7 +395,7 @@ public interface ErrorCodeConstants {
     ErrorCode PURCHASE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单子不存在");
     ErrorCode PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS = new ErrorCode(1_000_063_002, "采购订单明细：订单号ppo_number、订单行pline_number、零件号pitem_code无效");
     ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_003, "采购订单【{}】无效");
-    ErrorCode PURCHASE_DETAIL_ITEMCODE_EXISTS = new ErrorCode(1_000_063_004, "采购订单物品编码【{}】已经存在");
+    ErrorCode PURCHASE_DETAIL_ITEMCODE_EXISTS = new ErrorCode(1_000_063_004, "采购订单物料编码【{}】已经存在");
     ErrorCode PURCHASE_DETAIL_LINENUMBER_EXISTS = new ErrorCode(1_000_063_005, "行号已经存在");
 
     //采购索赔申请主ErrorCode
@@ -912,7 +912,7 @@ public interface ErrorCodeConstants {
     //调拨出库申请ErrorCode
     ErrorCode TRANSFERISSUE_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_136_000, "调拨出库申请主不存在");
     ErrorCode TRANSFERISSUE_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_136_001, "调拨出库申请子不存在");
-    ErrorCode TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_136_002, "物品【{}】无效");
+    ErrorCode TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_136_002, "物料【{}】无效");
     ErrorCode TRANSFERISSUE_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS = new ErrorCode(1_000_136_003, "库位【{}】无效");
     ErrorCode TRANSFERISSUE_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_136_004, "调拨出库申请状态不支持关闭");
     ErrorCode TRANSFERISSUE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_136_005, "调拨出库申请状态不支持关闭");
@@ -935,7 +935,7 @@ public interface ErrorCodeConstants {
     ErrorCode TRANSFERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_140_000, "调拨入库申请主不存在");
     ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_140_001, "调拨入库申请子不存在");
     ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS = new ErrorCode(1_000_140_002, "库位【{}】无效");
-    ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_140_003, "物品【{}】无效");
+    ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_140_003, "物料【{}】无效");
     ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_140_004, "调拨入库申请状态不支持关闭");
     ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_140_005, "调拨入库申请状态不支持关闭");
     ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_140_006, "调拨入库申请状态不支持提交");
@@ -1001,7 +1001,7 @@ public interface ErrorCodeConstants {
     ErrorCode SCRAP_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_149_001, "报废出库申请子不存在");
     ErrorCode SCRAP_REQUEST_LOCATIONCODE_INVALID = new ErrorCode(1_000_149_002, "库位【location_code】无效");
     ErrorCode SCRAP_REQUEST_WAREHOSECODE_VALIDATE = new ErrorCode(1_000_149_003, "仓库【from_warehouse_code】与库位【from_location_code】关系错误");
-    ErrorCode SCRAP_REQUEST_ITEMCODE_INVALID = new ErrorCode(1_000_149_004, "物品【item_code】无效");
+    ErrorCode SCRAP_REQUEST_ITEMCODE_INVALID = new ErrorCode(1_000_149_004, "物料【item_code】无效");
     ErrorCode SCRAP_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_149_005, "报废出库申请状态不支持关闭");
     ErrorCode SCRAP_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_149_006, "报废出库申请状态不支持关闭");
     ErrorCode SCRAP_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_149_007, "报废出库申请状态不支持提交");
@@ -1081,11 +1081,11 @@ public interface ErrorCodeConstants {
     ErrorCode EXPECTIN_NOT_EXISTS = new ErrorCode(1_000_162_000, "预计入库存不存在");
     //库存余额ErrorCode
     ErrorCode BALANCE_NOT_EXISTS = new ErrorCode(1_000_163_000, "库存余额不存在");
-    ErrorCode BALANCE_ITEM_NOT_EXISTS = new ErrorCode(1_000_163_001, "查询库存余额 物品不能为空");
+    ErrorCode BALANCE_ITEM_NOT_EXISTS = new ErrorCode(1_000_163_001, "查询库存余额 物料不能为空");
     ErrorCode BALANCE_STATU_NOT_EXISTS = new ErrorCode(1_000_163_002, "查询库存余额 库存状态不能为空");
     ErrorCode BALANCE_QTY_NOT_EXISTS = new ErrorCode(1_000_163_003, "查询库存余额 数量不能为空");
     ErrorCode BALANCE_FROZEN = new ErrorCode(1_000_163_003, "库存余额已经被冻结");
-    ErrorCode BALANCE_NOT_ERROR = new ErrorCode(1_000_163_004, "物品:【{}】 库存余额不足");
+    ErrorCode BALANCE_NOT_ERROR = new ErrorCode(1_000_163_004, "物料:【{}】 库存余额不足");
 
     //库存事务ErrorCode
     ErrorCode TRANSACTION_NOT_EXISTS = new ErrorCode(1_000_164_000, "库存事务不存在");
@@ -1149,7 +1149,7 @@ public interface ErrorCodeConstants {
 
     ErrorCode UOM_ERRORR = new ErrorCode(1_000_300_001, "计量单位【{}】错误，应该是【{}】");
 
-    ErrorCode QTY_ERROR = new ErrorCode(1_000_301_000, "发货数量【{}】大于订单号【{}】、订单行【{}】、物品代码【{}】的未发货数量【{}】");
+    ErrorCode QTY_ERROR = new ErrorCode(1_000_301_000, "发货数量【{}】大于订单号【{}】、订单行【{}】、物料代码【{}】的未发货数量【{}】");
 
     ErrorCode QTY_ERRORR = new ErrorCode(1_000_301_001, "上架数量【{}】不能大于库存数量【{}】");
 
@@ -1163,7 +1163,7 @@ public interface ErrorCodeConstants {
 
     ErrorCode BACKFLUSH_REQUEST_DETAILB_NOT_EXISTS = new ErrorCode(1_000_304_001, "制品收货申请二子表不存在");
 
-    ErrorCode  ENABLE_BUG = new ErrorCode(1_000_303_001, "物品代码【{}】, 不可采购 ！");
+    ErrorCode  ENABLE_BUG = new ErrorCode(1_000_303_001, "物料代码【{}】, 不可采购 ！");
 
 }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbBaseVO.java

@@ -26,8 +26,8 @@ public class BackflushRequestDetailbBaseVO {
     @Schema(description = "BOM版本")
     private String bomVersion;
 
-    @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物品代码不能为空")
+    @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "物料代码不能为空")
     private String itemCode;
 
     @Schema(description = "单据号")
@@ -41,13 +41,13 @@ public class BackflushRequestDetailbBaseVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExcelVO.java

@@ -26,7 +26,7 @@ public class BackflushRequestDetailbExcelVO {
     @ExcelProperty("BOM版本")
     private String bomVersion;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("单据号")
@@ -38,13 +38,13 @@ public class BackflushRequestDetailbExcelVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExportReqVO.java

@@ -21,7 +21,7 @@ public class BackflushRequestDetailbExportReqVO {
     @Schema(description = "BOM版本")
     private String bomVersion;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "单据号")
@@ -34,13 +34,13 @@ public class BackflushRequestDetailbExportReqVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbPageReqVO.java

@@ -23,7 +23,7 @@ public class BackflushRequestDetailbPageReqVO extends PageParam {
     @Schema(description = "BOM版本")
     private String bomVersion;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "单据号")
@@ -36,13 +36,13 @@ public class BackflushRequestDetailbPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java

@@ -117,7 +117,7 @@ public class BomController {
         List<BomDO> list = bomService.getBomList(exportReqVO);
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         List<BomExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown);
+        ExcelUtils.write(response, "物料基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown);
     }
     @PostMapping("/export-excel-senior")
     @Operation(summary = "导出物料清单 Excel")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java

@@ -104,7 +104,7 @@ public class BusinesstypeController {
     }
 
     @PostMapping("/senior")
-    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @Operation(summary = "高级搜索获得物料基本信息分页")
     @PreAuthorize("@ss.hasPermission('wms:businesstype:query')")
     public CommonResult<PageResult<BusinesstypeRespVO>> getBusinesstypeSenior(@Valid @RequestBody CustomConditions conditions) {
         PageResult<BusinesstypeDO> pageResult = businesstypeService.getBusinesstypeSenior(conditions);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java

@@ -30,12 +30,12 @@ public class BusinesstypeBaseVO {
     @Schema(description = "描述")
     private String description;
 
-    @Schema(description = "可用物品类型范围", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "可用物品类型范围不能为空")
+    @Schema(description = "可用物料类型范围", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "可用物料类型范围不能为空")
     private String itemTypes;
 
-    @Schema(description = "可用物品状态范围", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "可用物品状态范围不能为空")
+    @Schema(description = "可用物料状态范围", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "可用物料状态范围不能为空")
     private String itemStatuses;
 
     @Schema(description = "出库库位类型范围")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExcelVO.java

@@ -31,11 +31,11 @@ public class BusinesstypeExcelVO {
     @ExcelProperty("描述")
     private String description;
 
-    @ExcelProperty(value = "可用物品类型范围", converter = DictConvert.class)
+    @ExcelProperty(value = "可用物料类型范围", converter = DictConvert.class)
     @DictFormat("item_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String itemTypes;
 
-    @ExcelProperty(value = "可用物品状态范围", converter = DictConvert.class)
+    @ExcelProperty(value = "可用物料状态范围", converter = DictConvert.class)
     @DictFormat("item_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String itemStatuses;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java

@@ -22,10 +22,10 @@ public class BusinesstypeExportReqVO {
     @Schema(description = "描述")
     private String description;
 
-    @Schema(description = "可用物品类型范围")
+    @Schema(description = "可用物料类型范围")
     private String itemTypes;
 
-    @Schema(description = "可用物品状态范围")
+    @Schema(description = "可用物料状态范围")
     private String itemStatuses;
 
     @Schema(description = "出库库位类型范围")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeImportExcelVo.java

@@ -23,11 +23,11 @@ public class BusinesstypeImportExcelVo {
     @ExcelProperty("名称")
     private String name;
 
-    @ExcelProperty(value = "可用物品类型范围", converter = DictConvert.class)
+    @ExcelProperty(value = "可用物料类型范围", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.ITEM_TYPE)
     private String itemTypes;
 
-    @ExcelProperty(value = "可用物品状态范围", converter = DictConvert.class)
+    @ExcelProperty(value = "可用物料状态范围", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.ITEM_STATUS)
     private String itemStatuses;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java

@@ -24,10 +24,10 @@ public class BusinesstypePageReqVO extends PageParam {
     @Schema(description = "描述")
     private String description;
 
-    @Schema(description = "可用物品类型范围")
+    @Schema(description = "可用物料类型范围")
     private String itemTypes;
 
-    @Schema(description = "可用物品状态范围")
+    @Schema(description = "可用物料状态范围")
     private String itemStatuses;
 
     @Schema(description = "出库库位类型范围")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java

@@ -100,7 +100,7 @@ public class CarrierController {
         return success(result);
     }
     @PostMapping("/senior")
-    @Operation(summary = "高级搜索获得物品基本信息分页")
+    @Operation(summary = "高级搜索获得物料基本信息分页")
     @PreAuthorize("@ss.hasPermission('wms:carrier:query')")
     public CommonResult<PageResult<CarrierRespVO>> getCarrierSenior(@Valid @RequestBody CustomConditions conditions) {
         PageResult<CarrierDO> pageResult = carrierService.getCarrierSenior(conditions);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailBaseVO.java

@@ -38,16 +38,16 @@ public class CountJobDetailBaseVO {
     @Schema(description = "库存状态")
     private String inventoryStatus;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExcelVO.java

@@ -38,16 +38,16 @@ public class CountJobDetailExcelVO {
     @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String inventoryStatus;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java

@@ -33,16 +33,16 @@ public class CountJobDetailExportReqVO {
     @Schema(description = "库存状态")
     private String inventoryStatus;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java

@@ -36,16 +36,16 @@ public class CountJobDetailPageReqVO extends PageParam {
     @Schema(description = "库存状态")
     private String inventoryStatus;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java

@@ -145,16 +145,16 @@ public class CountJobMainExcelVO {
     @DictFormat(DictTypeConstants.INVENTORY_STATUS)
     private String inventoryStatus;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java

@@ -31,7 +31,7 @@ public class CountPlanMainBaseVO {
     @Schema(description = "限值")
     private BigDecimal limitedValue;
 
-    @Schema(description = "物品忽略名单")
+    @Schema(description = "物料忽略名单")
     private String ignoreListOfItem;
 
     @Schema(description = "库位忽略名单")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java

@@ -33,7 +33,7 @@ public class CountPlanMainExcelVO {
     @ExcelProperty("限值")
     private BigDecimal limitedValue;
 
-    @ExcelProperty("物品忽略名单")
+    @ExcelProperty("物料忽略名单")
     private String ignoreListOfItem;
 
     @ExcelProperty("库位忽略名单")
@@ -78,7 +78,7 @@ public class CountPlanMainExcelVO {
     @ExcelProperty("盘点范围值")
     private String value;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("计划数量")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java

@@ -27,7 +27,7 @@ public class CountPlanMainExportReqVO {
     @Schema(description = "限值")
     private BigDecimal limitedValue;
 
-    @Schema(description = "物品忽略名单")
+    @Schema(description = "物料忽略名单")
     private String ignoreListOfItem;
 
     @Schema(description = "库位忽略名单")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java

@@ -29,7 +29,7 @@ public class CountPlanMainPageReqVO extends PageParam {
     @Schema(description = "限值")
     private BigDecimal limitedValue;
 
-    @Schema(description = "物品忽略名单")
+    @Schema(description = "物料忽略名单")
     private String ignoreListOfItem;
 
     @Schema(description = "库位忽略名单")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java

@@ -59,13 +59,13 @@ public class CountRecordDetailBaseVO {
     @Schema(description = "盘点描述")
     private String countDescription;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -86,7 +86,7 @@ public class CountRecordDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java

@@ -62,13 +62,13 @@ public class CountRecordDetailExcelVO {
     @ExcelProperty("盘点描述")
     private String countDescription;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -91,7 +91,7 @@ public class CountRecordDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java

@@ -53,13 +53,13 @@ public class CountRecordDetailExportReqVO {
     @Schema(description = "盘点描述")
     private String countDescription;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -80,7 +80,7 @@ public class CountRecordDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java

@@ -58,13 +58,13 @@ public class CountRecordDetailPageReqVO extends PageParam {
     @Schema(description = "盘点描述")
     private String countDescription;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -85,7 +85,7 @@ public class CountRecordDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java

@@ -119,13 +119,13 @@ public class CountRecordMainExcelVO {
     @ExcelProperty("盘点描述")
     private String countDescription;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -138,7 +138,7 @@ public class CountRecordMainExcelVO {
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("子备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java

@@ -47,13 +47,13 @@ public class CountRequestDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -72,7 +72,7 @@ public class CountRequestDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "从包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java

@@ -48,13 +48,13 @@ public class CountRequestDetailExcelVO {
     @ExcelProperty("创建者用户名")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -73,7 +73,7 @@ public class CountRequestDetailExcelVO {
     @ExcelProperty("最后更新者用户名")
     private String updater;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("从包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java

@@ -43,13 +43,13 @@ public class CountRequestDetailExportReqVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -68,7 +68,7 @@ public class CountRequestDetailExportReqVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "从包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java

@@ -46,13 +46,13 @@ public class CountRequestDetailPageReqVO extends PageParam {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -71,7 +71,7 @@ public class CountRequestDetailPageReqVO extends PageParam {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "从包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java

@@ -82,13 +82,13 @@ public class CountRequestMainExcelVO {
     @DictFormat(DictTypeConstants.INVENTORY_STATUS)
     private String inventoryStatus;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -101,7 +101,7 @@ public class CountRequestMainExcelVO {
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("从包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainImportVO.java

@@ -29,7 +29,7 @@ public class CountRequestMainImportVO {
     private String warehouseCode;
 
     //子表数据
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailBaseVO.java

@@ -49,13 +49,13 @@ public class CountadjustRecordDetailBaseVO {
     @Schema(description = "调整数量")
     private BigDecimal adjustQty;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -79,7 +79,7 @@ public class CountadjustRecordDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExcelVO.java

@@ -48,13 +48,13 @@ public class CountadjustRecordDetailExcelVO {
     @ExcelProperty("调整数量")
     private BigDecimal adjustQty;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -80,7 +80,7 @@ public class CountadjustRecordDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java

@@ -43,13 +43,13 @@ public class CountadjustRecordDetailExportReqVO {
     @Schema(description = "调整数量")
     private BigDecimal adjustQty;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -70,7 +70,7 @@ public class CountadjustRecordDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java

@@ -48,13 +48,13 @@ public class CountadjustRecordDetailPageReqVO extends PageParam {
     @Schema(description = "调整数量")
     private BigDecimal adjustQty;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -75,7 +75,7 @@ public class CountadjustRecordDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java

@@ -98,13 +98,13 @@ public class CountadjustRecordMainExcelVO {
     @ExcelProperty("调整数量")
     private BigDecimal adjustQty;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -117,7 +117,7 @@ public class CountadjustRecordMainExcelVO {
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("创建时间")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java

@@ -71,13 +71,13 @@ public class CountadjustRequestDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -96,7 +96,7 @@ public class CountadjustRequestDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "乐观锁")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExcelVO.java

@@ -60,13 +60,13 @@ public class CountadjustRequestDetailExcelVO {
     @ExcelProperty("创建者用户名")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itelDesc2;
 
     @ExcelProperty("项目代码")
@@ -85,7 +85,7 @@ public class CountadjustRequestDetailExcelVO {
     @ExcelProperty("最后更新者用户名")
     private String updater;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java

@@ -56,13 +56,13 @@ public class CountadjustRequestDetailExportReqVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -81,7 +81,7 @@ public class CountadjustRequestDetailExportReqVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "主表ID")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java

@@ -61,13 +61,13 @@ public class CountadjustRequestDetailPageReqVO extends PageParam {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -86,7 +86,7 @@ public class CountadjustRequestDetailPageReqVO extends PageParam {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "主表ID")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java

@@ -88,13 +88,13 @@ public class CountadjustRequestMainExcelVO {
     @ExcelProperty("调整数量")
     private BigDecimal adjustQty;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itelDesc2;
 
     @ExcelProperty("项目代码")
@@ -107,7 +107,7 @@ public class CountadjustRequestMainExcelVO {
     @DictFormat(DictTypeConstants.UOM)
     private String uom;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("创建时间")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java

@@ -33,7 +33,7 @@ import java.util.*;
 import static com.win.framework.common.pojo.CommonResult.success;
 import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
-@Tag(name = "管理后台 - 客户物品")
+@Tag(name = "管理后台 - 客户物料")
 @RestController
 @RequestMapping("/wms/customeritem")
 @Validated
@@ -46,14 +46,14 @@ public class CustomeritemController {
     private AdminUserApi userApi;
 
     @PostMapping("/create")
-    @Operation(summary = "创建客户物品")
+    @Operation(summary = "创建客户物料")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:create')")
     public CommonResult<Long> createCustomeritem(@Valid @RequestBody CustomeritemCreateReqVO createReqVO) {
         return success(customeritemService.createCustomeritem(createReqVO));
     }
 
     @PutMapping("/update")
-    @Operation(summary = "更新客户物品")
+    @Operation(summary = "更新客户物料")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:update')")
     public CommonResult<Boolean> updateCustomeritem(@Valid @RequestBody CustomeritemUpdateReqVO updateReqVO) {
         customeritemService.updateCustomeritem(updateReqVO);
@@ -61,7 +61,7 @@ public class CustomeritemController {
     }
 
     @DeleteMapping("/delete")
-    @Operation(summary = "删除客户物品")
+    @Operation(summary = "删除客户物料")
     @Parameter(name = "id", description = "编号", required = true)
     @PreAuthorize("@ss.hasPermission('wms:customeritem:delete')")
     public CommonResult<Boolean> deleteCustomeritem(@RequestParam("id") Long id) {
@@ -70,7 +70,7 @@ public class CustomeritemController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得客户物品")
+    @Operation(summary = "获得客户物料")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:query')")
     public CommonResult<CustomeritemRespVO> getCustomeritem(@RequestParam("id") Long id) {
@@ -80,7 +80,7 @@ public class CustomeritemController {
 
 
     @GetMapping("/page")
-    @Operation(summary = "获得客户物品分页")
+    @Operation(summary = "获得客户物料分页")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:query')")
     public CommonResult<PageResult<CustomeritemRespVO>> getCustomeritemPage(@Valid CustomeritemPageReqVO pageVO) {
         PageResult<CustomeritemDO> pageResult = customeritemService.getCustomeritemPage(pageVO);
@@ -93,7 +93,7 @@ public class CustomeritemController {
         return success(result);
     }
     @PostMapping("/senior")
-    @Operation(summary = "高级搜索获得客户物品分页")
+    @Operation(summary = "高级搜索获得客户物料分页")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:query')")
     public CommonResult<PageResult<CustomeritemRespVO>> getCustomeritemSenior(@Valid @RequestBody CustomConditions conditions) {
         PageResult<CustomeritemDO> pageResult = customeritemService.getCustomeritemSenior(conditions);
@@ -106,7 +106,7 @@ public class CustomeritemController {
         return success(result);
     }
     @GetMapping("/export-excel")
-    @Operation(summary = "导出客户物品 Excel")
+    @Operation(summary = "导出客户物料 Excel")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:export')")
     @OperateLog(type = EXPORT)
     public void exportCustomeritemExcel(@Valid CustomeritemExportReqVO exportReqVO,
@@ -114,17 +114,17 @@ public class CustomeritemController {
         List<CustomeritemDO> list = customeritemService.getCustomeritemList(exportReqVO);
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         List<CustomeritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown);
+        ExcelUtils.write(response, "客户物料.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown);
     }
     @PostMapping("/export-excel-senior")
-    @Operation(summary = "导出客户物品 Excel")
+    @Operation(summary = "导出客户物料 Excel")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:export')")
     @OperateLog(type = EXPORT)
     public void exportCustomeritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
         List<CustomeritemDO> list = customeritemService.getCustomeritemList(conditions);
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         List<CustomeritemExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown);
+        ExcelUtils.write(response, "客户物料.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown);
     }
     private List<CustomeritemExcelVO> getExcelVo(List<CustomeritemDO> list, Map<Integer, String[]> mapDropDown) {
         String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
@@ -146,7 +146,7 @@ public class CustomeritemController {
     }
 
     @GetMapping("/get-import-template")
-    @Operation(summary = "获得导入客户物品模板")
+    @Operation(summary = "获得导入客户物料模板")
     public void importTemplate(HttpServletResponse response) throws IOException {
         // 手动创建导出 demo
         List<CustomeritemImportExcelVO> list = Arrays.asList();
@@ -160,11 +160,11 @@ public class CustomeritemController {
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(10, available);
         // 输出
-        ExcelUtils.write(response, "客户物品导入模板.xls", "客户物品列表", CustomeritemImportExcelVO.class, list,mapDropDown);
+        ExcelUtils.write(response, "客户物料导入模板.xls", "客户物料列表", CustomeritemImportExcelVO.class, list,mapDropDown);
     }
 
     @PostMapping("/import")
-    @Operation(summary = "导入客户物品")
+    @Operation(summary = "导入客户物料")
     @Parameters({
             @Parameter(name = "file", description = "Excel 文件", required = true),
             @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"),
@@ -180,7 +180,7 @@ public class CustomeritemController {
         Map<String, Object> returnMap = new HashMap<>();
         returnMap.put("errorCount", errorList.size());
         if(!errorList.isEmpty()) {
-            String url = ExcelUtils.writeLocalFile("客户物品导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList);
+            String url = ExcelUtils.writeLocalFile("客户物料导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList);
             returnMap.put("errorFile", url);
         }
         return success(returnMap);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
- * 客户物品 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 客户物料 Base VO，提供给添加、修改、详细的子 VO 使用
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
  */
 @Data

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemCreateReqVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-@Schema(description = "管理后台 - 客户物品创建 Request VO")
+@Schema(description = "管理后台 - 客户物料创建 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 
 
 /**
- * 客户物品 Excel VO
+ * 客户物料 Excel VO
  *
  * @author 超级管理员
  */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 客户物品 Excel 导出 Request VO，参数和 CustomeritemPageReqVO 是一致的")
+@Schema(description = "管理后台 - 客户物料 Excel 导出 Request VO，参数和 CustomeritemPageReqVO 是一致的")
 @Data
 public class CustomeritemExportReqVO {
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
-@Schema(description = "管理后台 - 客户物品分页 Request VO")
+@Schema(description = "管理后台 - 客户物料分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java

@@ -7,7 +7,7 @@ import lombok.ToString;
 
 import java.time.LocalDateTime;
 
-@Schema(description = "管理后台 - 客户物品 Response VO")
+@Schema(description = "管理后台 - 客户物料 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemUpdateReqVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-@Schema(description = "管理后台 - 客户物品更新 Request VO")
+@Schema(description = "管理后台 - 客户物料更新 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailBaseVO.java

@@ -73,7 +73,7 @@ public class CustomerreceiptRecordDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -86,13 +86,13 @@ public class CustomerreceiptRecordDetailBaseVO {
     @Schema(description = "创建者Id")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExcelVO.java

@@ -73,7 +73,7 @@ public class CustomerreceiptRecordDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -85,13 +85,13 @@ public class CustomerreceiptRecordDetailExcelVO {
     @ExcelProperty("创建者Id")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExportReqVO.java

@@ -66,7 +66,7 @@ public class CustomerreceiptRecordDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -79,13 +79,13 @@ public class CustomerreceiptRecordDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailPageReqVO.java

@@ -68,7 +68,7 @@ public class CustomerreceiptRecordDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -81,13 +81,13 @@ public class CustomerreceiptRecordDetailPageReqVO extends PageParam {
     @Schema(description = "创建者Id")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java

@@ -172,7 +172,7 @@ public class CustomerreceiptRecordMainExcelVO {
     @ExcelProperty("金额")
     private BigDecimal amount;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -185,13 +185,13 @@ public class CustomerreceiptRecordMainExcelVO {
     @ExcelProperty("创建者Id")
     private String creatorDetail;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailBaseVO.java

@@ -48,7 +48,7 @@ public class CustomerreceiptRequestDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -61,13 +61,13 @@ public class CustomerreceiptRequestDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExcelVO.java

@@ -48,7 +48,7 @@ public class CustomerreceiptRequestDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -60,13 +60,13 @@ public class CustomerreceiptRequestDetailExcelVO {
     @ExcelProperty("创建者用户名")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java

@@ -42,7 +42,7 @@ public class CustomerreceiptRequestDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -55,13 +55,13 @@ public class CustomerreceiptRequestDetailExportReqVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java

@@ -44,7 +44,7 @@ public class CustomerreceiptRequestDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -57,13 +57,13 @@ public class CustomerreceiptRequestDetailPageReqVO extends PageParam {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java

@@ -125,7 +125,7 @@ public class CustomerreceiptRequestMainExcelVO {
     @ExcelProperty("到库位代码")
     private String toLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -137,13 +137,13 @@ public class CustomerreceiptRequestMainExcelVO {
     @ExcelProperty("创建者用户名")
     private String creatorDetail;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java

@@ -47,16 +47,16 @@ public class CustomerreturnJobDetailBaseVO {
     @Schema(description = "到库位代码")
     private String toLocationCode;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExcelVO.java

@@ -47,16 +47,16 @@ public class CustomerreturnJobDetailExcelVO {
     @ExcelProperty("到库位代码")
     private String toLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java

@@ -42,16 +42,16 @@ public class CustomerreturnJobDetailExportReqVO {
     @Schema(description = "到库位代码")
     private String toLocationCode;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java

@@ -44,16 +44,16 @@ public class CustomerreturnJobDetailPageReqVO extends PageParam {
     @Schema(description = "到库位代码")
     private String toLocationCode;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java

@@ -195,16 +195,16 @@ public class CustomerreturnJobMainExcelVO {
     @ExcelProperty("到库位代码")
     private String toLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailBaseVO.java

@@ -75,7 +75,7 @@ public class CustomerreturnRecordDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -88,13 +88,13 @@ public class CustomerreturnRecordDetailBaseVO {
     @Schema(description = "创建者Id")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExcelVO.java

@@ -73,7 +73,7 @@ public class CustomerreturnRecordDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -85,13 +85,13 @@ public class CustomerreturnRecordDetailExcelVO {
     @ExcelProperty("创建者Id")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExportReqVO.java

@@ -66,7 +66,7 @@ public class CustomerreturnRecordDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -79,13 +79,13 @@ public class CustomerreturnRecordDetailExportReqVO {
     @Schema(description = "创建者Id")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailPageReqVO.java

@@ -68,7 +68,7 @@ public class CustomerreturnRecordDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -81,13 +81,13 @@ public class CustomerreturnRecordDetailPageReqVO extends PageParam {
     @Schema(description = "创建者Id")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java

@@ -175,7 +175,7 @@ public class CustomerreturnRecordMainExcelVO {
     @ExcelProperty("金额")
     private BigDecimal amount;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -188,13 +188,13 @@ public class CustomerreturnRecordMainExcelVO {
     @ExcelProperty("创建者Id")
     private String creatorDetail;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailBaseVO.java

@@ -55,8 +55,8 @@ public class CustomerreturnRequestDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物品代码不能为空")
+    @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "物料代码不能为空")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -69,13 +69,13 @@ public class CustomerreturnRequestDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java

@@ -48,7 +48,7 @@ public class CustomerreturnRequestDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -60,13 +60,13 @@ public class CustomerreturnRequestDetailExcelVO {
     @ExcelProperty("创建者用户名")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java

@@ -42,7 +42,7 @@ public class CustomerreturnRequestDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -55,13 +55,13 @@ public class CustomerreturnRequestDetailExportReqVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java

@@ -44,7 +44,7 @@ public class CustomerreturnRequestDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -57,13 +57,13 @@ public class CustomerreturnRequestDetailPageReqVO extends PageParam {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java

@@ -42,7 +42,7 @@ public class CustomerreturnRequestImportVO {
 //    @ExcelProperty("销售订单行")
 //    private String soLine;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExcelVO.java

@@ -145,7 +145,7 @@ public class CustomerreturnRequestMainExcelVO {
     @ExcelProperty("从库位代码")
     private String fromLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -158,13 +158,13 @@ public class CustomerreturnRequestMainExcelVO {
     @ExcelProperty("创建者用户名")
     private String creatorDetail;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailBaseVO.java

@@ -55,13 +55,13 @@ public class CustomersettleRecordDetailBaseVO {
     @Schema(description = "金额")
     private BigDecimal amount;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -82,7 +82,7 @@ public class CustomersettleRecordDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExcelVO.java

@@ -55,13 +55,13 @@ public class CustomersettleRecordDetailExcelVO {
     @ExcelProperty("金额")
     private BigDecimal amount;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -84,7 +84,7 @@ public class CustomersettleRecordDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExportReqVO.java

@@ -48,13 +48,13 @@ public class CustomersettleRecordDetailExportReqVO {
     @Schema(description = "金额")
     private BigDecimal amount;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -75,7 +75,7 @@ public class CustomersettleRecordDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailPageReqVO.java

@@ -50,13 +50,13 @@ public class CustomersettleRecordDetailPageReqVO extends PageParam {
     @Schema(description = "金额")
     private BigDecimal amount;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")
@@ -77,7 +77,7 @@ public class CustomersettleRecordDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainExcelVO.java

@@ -133,13 +133,13 @@ public class CustomersettleRecordMainExcelVO {
     @ExcelProperty("金额")
     private BigDecimal amount;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")
@@ -159,7 +159,7 @@ public class CustomersettleRecordMainExcelVO {
     @ExcelProperty("代码")
     private String codeDetail;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailBaseVO.java

@@ -45,7 +45,7 @@ public class CustomersettleRequestDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -58,13 +58,13 @@ public class CustomersettleRequestDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExcelVO.java

@@ -45,7 +45,7 @@ public class CustomersettleRequestDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -57,13 +57,13 @@ public class CustomersettleRequestDetailExcelVO {
     @ExcelProperty("创建者用户名")
     private String creator;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExportReqVO.java

@@ -39,7 +39,7 @@ public class CustomersettleRequestDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -52,13 +52,13 @@ public class CustomersettleRequestDetailExportReqVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailPageReqVO.java

@@ -41,7 +41,7 @@ public class CustomersettleRequestDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")
@@ -54,13 +54,13 @@ public class CustomersettleRequestDetailPageReqVO extends PageParam {
     @Schema(description = "创建者用户名")
     private String creator;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainExcelVO.java

@@ -116,7 +116,7 @@ public class CustomersettleRequestMainExcelVO {
     @ExcelProperty("从库位代码")
     private String fromLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")
@@ -129,13 +129,13 @@ public class CustomersettleRequestMainExcelVO {
     @ExcelProperty("创建者用户名")
     private String creatorDetail;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainImportVO.java

@@ -34,7 +34,7 @@ public class CustomersettleRequestMainImportVO {
 //    @ExcelProperty("销售订单行")
 //    private String soLine;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("包装号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailBaseVO.java

@@ -47,16 +47,16 @@ public class DeliverJobDetailBaseVO {
     @Schema(description = "到库位代码")
     private String toLocationCode;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExcelVO.java

@@ -46,16 +46,16 @@ public class DeliverJobDetailExcelVO {
     @ExcelProperty("到库位代码")
     private String toLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java

@@ -40,16 +40,16 @@ public class DeliverJobDetailExportReqVO {
     @Schema(description = "到库位代码")
     private String toLocationCode;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailPageReqVO.java

@@ -43,16 +43,16 @@ public class DeliverJobDetailPageReqVO extends PageParam {
     @Schema(description = "到库位代码")
     private String toLocationCode;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
-    @Schema(description = "物品名称")
+    @Schema(description = "物料名称")
     private String itemName;
 
-    @Schema(description = "物品描述1")
+    @Schema(description = "物料描述1")
     private String itemDesc1;
 
-    @Schema(description = "物品描述2")
+    @Schema(description = "物料描述2")
     private String itemDesc2;
 
     @Schema(description = "项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java

@@ -204,16 +204,16 @@ public class DeliverJobMainExcelVO {
     @ExcelProperty("到库位代码")
     private String toLocationCode;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
-    @ExcelProperty("物品名称")
+    @ExcelProperty("物料名称")
     private String itemName;
 
-    @ExcelProperty("物品描述1")
+    @ExcelProperty("物料描述1")
     private String itemDesc1;
 
-    @ExcelProperty("物品描述2")
+    @ExcelProperty("物料描述2")
     private String itemDesc2;
 
     @ExcelProperty("项目代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java

@@ -36,7 +36,7 @@ public class DeliverPlanDetailBaseVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExcelVO.java

@@ -35,7 +35,7 @@ public class DeliverPlanDetailExcelVO {
     @ExcelProperty("单据号")
     private String number;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java

@@ -30,7 +30,7 @@ public class DeliverPlanDetailExportReqVO {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java

@@ -32,7 +32,7 @@ public class DeliverPlanDetailPageReqVO extends PageParam {
     @Schema(description = "单据号")
     private String number;
 
-    @Schema(description = "物品代码")
+    @Schema(description = "物料代码")
     private String itemCode;
 
     @Schema(description = "备注")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java

@@ -85,7 +85,7 @@ public class DeliverPlanMainExcelVO {
     @ExcelProperty("项目")
     private String project;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     @ColumnWidth(value = 15)
     private String itemCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java

@@ -49,7 +49,7 @@ public class DeliverPlanMainImportVO {
 //    @ExcelProperty("销售订单行")
 //    private BigDecimal soLine;
 
-    @ExcelProperty("物品代码")
+    @ExcelProperty("物料代码")
     private String itemCode;
 
     @ExcelProperty("计划数量")