From 69b9b3853cca082f21fe94059e149e5602677e02 Mon Sep 17 00:00:00 2001 From: "hongxi.lian" Date: Fri, 20 Oct 2023 14:46:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itempackaging/vo/ItempackagingImportExcelVO.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java index 43468327..3f2f4c3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java @@ -30,9 +30,6 @@ public class ItempackagingImportExcelVO { @ExcelProperty(value = "包装单位", converter = DictConvert.class) @DictFormat(DictTypeConstants.UOM) - private String description; - - @ExcelProperty("包装单位") private String stdPackUnit; @ExcelProperty("包装数量") From e642903d0a22222fb1e16a0b6f3442093c170cb5 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 20 Oct 2023 15:03:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=20=E5=AF=BC=E5=87=BA=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=80=85=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/controller/itembasic/ItembasicController.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index 33d90a50..2f389b61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -132,6 +132,11 @@ public class ItembasicController { List list = itembasicService.getItembasicList(exportReqVO); // 导出 Excel List datas = ItembasicConvert.INSTANCE.convertList02(list); + for(ItembasicExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, datas); } @GetMapping("/get-import-template")