diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java index 0709c93..49a6361 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialRespVO.java @@ -22,6 +22,9 @@ public class ErpMaterialRespVO { @ExcelProperty("中铜物料编码;系统使用时使用该编码") private String downCenterNumber; + @Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED) + private String materialNumber; + @Schema(description = "中铝物料编码", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("中铝物料编码") private String centerNumber; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index a8e193b..22ea133 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -161,6 +161,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { PageResult pageResult = erpMaterialMapper.selectPage(pageReqVO); PageResult pageResultRespVo = BeanUtils.toBean(pageResult, ErpMaterialRespVO.class); for (ErpMaterialRespVO respVO : pageResultRespVo.getList()) { + respVO.setMaterialNumber(respVO.getDownCenterNumber()); MaterialOtherDTO dto = new MaterialOtherDTO(); dto.setMaterialNumber(respVO.getDownCenterNumber()); List dtos = baseApi.getMaterialOtherNoPage(dto);