From a355f39cf166c801da095707f858cd480bb38d44 Mon Sep 17 00:00:00 2001 From: liutao <790864623@qq.com> Date: Tue, 28 Jul 2026 11:18:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=A2=9E=E5=8A=A0=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/product/ErpProductUnitController.java | 11 ++++++++--- .../product/vo/unit/ErpProductUnitImportExcelVO.java | 3 +++ .../admin/product/vo/unit/ErpProductUnitRespVO.java | 6 +++++- .../product/vo/unit/ErpProductUnitSaveReqVO.java | 5 ++++- .../erp/dal/dataobject/product/ErpProductUnitDO.java | 4 +++- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java index c3da8f980..bafd9c53a 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java @@ -104,7 +104,12 @@ public class ErpProductUnitController { item.setValue(item.getId().toString()); item.setLabel(item.getName()); }); - List erpProductUnitRespVOS = convertList(list, unit -> new ErpProductUnitRespVO().setId(unit.getId()).setName(unit.getName()).setValue(unit.getId().toString()).setLabel(unit.getName())); + List erpProductUnitRespVOS = convertList(list, unit -> new ErpProductUnitRespVO() + .setId(unit.getId()) + .setName(unit.getName()) + .setNameEn(unit.getNameEn()) + .setValue(unit.getId().toString()) + .setLabel(unit.getName())); return success(erpProductUnitRespVOS); } @@ -143,7 +148,7 @@ public class ErpProductUnitController { // 手动创建导出 demo List list = Arrays.asList( ErpProductUnitImportExcelVO.builder().name("件").primaryFlag("N").primaryName("个").changeRate(0.02) - .status(CommonStatusEnum.ENABLE.getStatus()).build() + .nameEn("Piece").status(CommonStatusEnum.ENABLE.getStatus()).build() ); // 输出 ExcelUtils.write(response, "单位导入模板.xls", "单位列表", ErpProductUnitImportExcelVO.class, list); @@ -163,4 +168,4 @@ public class ErpProductUnitController { return success("导入成功"); } -} \ No newline at end of file +} diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitImportExcelVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitImportExcelVO.java index 9eca14638..66440eed5 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitImportExcelVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitImportExcelVO.java @@ -22,6 +22,9 @@ public class ErpProductUnitImportExcelVO { @ExcelProperty("单位名称") private String name; + @ExcelProperty("Unit English Name") + private String nameEn; + @ExcelProperty(value = "是否主单位", converter = DictConvert.class) @DictFormat("primary_flag") private String primaryFlag; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java index c10c71fc7..d787e2a5c 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java @@ -23,6 +23,10 @@ public class ErpProductUnitRespVO { @ExcelProperty("单位名字") private String name; + @Schema(description = "Unit English name", example = "Kilogram") + @ExcelProperty("Unit English Name") + private String nameEn; + @Schema(description = "是否主单位", example = "否") @ExcelProperty("是否主单位") private String primaryFlag; @@ -47,4 +51,4 @@ public class ErpProductUnitRespVO { private String value; private String label; -} \ No newline at end of file +} diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitSaveReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitSaveReqVO.java index 0f4aeb211..dbd7a96a1 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitSaveReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitSaveReqVO.java @@ -19,6 +19,9 @@ public class ErpProductUnitSaveReqVO { @NotEmpty(message = "单位名字不能为空") private String name; + @Schema(description = "Unit English name", example = "Kilogram") + private String nameEn; + @Schema(description = "单位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "单位状态不能为空") @InEnum(CommonStatusEnum.class) @@ -33,4 +36,4 @@ public class ErpProductUnitSaveReqVO { @Schema(description = "换算比例", example = "芋艿") private Double changeRate; -} \ No newline at end of file +} diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java index c236d8a98..5b95d7d17 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java @@ -31,6 +31,8 @@ public class ErpProductUnitDO extends BaseDO { * 单位名字 */ private String name; + /** Unit English name. */ + private String nameEn; /** * 是否主单位 */ @@ -52,4 +54,4 @@ public class ErpProductUnitDO extends BaseDO { private String value; @TableField(exist = false) private String label; -} \ No newline at end of file +}