单位增加英文字段

main
liutao 2 days ago
parent 850cb88dfc
commit a355f39cf1

@ -104,7 +104,12 @@ public class ErpProductUnitController {
item.setValue(item.getId().toString()); item.setValue(item.getId().toString());
item.setLabel(item.getName()); item.setLabel(item.getName());
}); });
List<ErpProductUnitRespVO> erpProductUnitRespVOS = convertList(list, unit -> new ErpProductUnitRespVO().setId(unit.getId()).setName(unit.getName()).setValue(unit.getId().toString()).setLabel(unit.getName())); List<ErpProductUnitRespVO> 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); return success(erpProductUnitRespVOS);
} }
@ -143,7 +148,7 @@ public class ErpProductUnitController {
// 手动创建导出 demo // 手动创建导出 demo
List<ErpProductUnitImportExcelVO> list = Arrays.asList( List<ErpProductUnitImportExcelVO> list = Arrays.asList(
ErpProductUnitImportExcelVO.builder().name("件").primaryFlag("N").primaryName("个").changeRate(0.02) 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); ExcelUtils.write(response, "单位导入模板.xls", "单位列表", ErpProductUnitImportExcelVO.class, list);
@ -163,4 +168,4 @@ public class ErpProductUnitController {
return success("导入成功"); return success("导入成功");
} }
} }

@ -22,6 +22,9 @@ public class ErpProductUnitImportExcelVO {
@ExcelProperty("单位名称") @ExcelProperty("单位名称")
private String name; private String name;
@ExcelProperty("Unit English Name")
private String nameEn;
@ExcelProperty(value = "是否主单位", converter = DictConvert.class) @ExcelProperty(value = "是否主单位", converter = DictConvert.class)
@DictFormat("primary_flag") @DictFormat("primary_flag")
private String primaryFlag; private String primaryFlag;

@ -23,6 +23,10 @@ public class ErpProductUnitRespVO {
@ExcelProperty("单位名字") @ExcelProperty("单位名字")
private String name; private String name;
@Schema(description = "Unit English name", example = "Kilogram")
@ExcelProperty("Unit English Name")
private String nameEn;
@Schema(description = "是否主单位", example = "否") @Schema(description = "是否主单位", example = "否")
@ExcelProperty("是否主单位") @ExcelProperty("是否主单位")
private String primaryFlag; private String primaryFlag;
@ -47,4 +51,4 @@ public class ErpProductUnitRespVO {
private String value; private String value;
private String label; private String label;
} }

@ -19,6 +19,9 @@ public class ErpProductUnitSaveReqVO {
@NotEmpty(message = "单位名字不能为空") @NotEmpty(message = "单位名字不能为空")
private String name; private String name;
@Schema(description = "Unit English name", example = "Kilogram")
private String nameEn;
@Schema(description = "单位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "单位状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "单位状态不能为空") @NotNull(message = "单位状态不能为空")
@InEnum(CommonStatusEnum.class) @InEnum(CommonStatusEnum.class)
@ -33,4 +36,4 @@ public class ErpProductUnitSaveReqVO {
@Schema(description = "换算比例", example = "芋艿") @Schema(description = "换算比例", example = "芋艿")
private Double changeRate; private Double changeRate;
} }

@ -31,6 +31,8 @@ public class ErpProductUnitDO extends BaseDO {
* *
*/ */
private String name; private String name;
/** Unit English name. */
private String nameEn;
/** /**
* *
*/ */
@ -52,4 +54,4 @@ public class ErpProductUnitDO extends BaseDO {
private String value; private String value;
@TableField(exist = false) @TableField(exist = false)
private String label; private String label;
} }

Loading…
Cancel
Save