From 3335c633ba913ae318dd14bea15415cfc1ac8920 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 15 Nov 2023 14:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=8C=85=E8=A3=85=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ItempackagingController.java | 42 +++++++++++++++---- .../itempackaging/ItempackagingMapper.java | 4 ++ .../itempackaging/ItempackagingService.java | 2 +- .../ItempackagingServiceImpl.java | 4 +- 4 files changed, 40 insertions(+), 12 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index b3da0b68..45baab3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java @@ -8,10 +8,12 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO; import com.win.module.wms.controller.itempackaging.vo.*; import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.itempackaging.ItempackagingService; @@ -79,14 +81,14 @@ public class ItempackagingController { return success(ItempackagingConvert.INSTANCE.convert(itempackaging)); } - @GetMapping("/list") - @Operation(summary = "获得物品包装信息 列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") - public CommonResult> getItempackagingList(@RequestParam("ids") Collection ids) { - List list = itempackagingService.getItempackagingList(ids); - return success(ItempackagingConvert.INSTANCE.convertList(list)); - } +// @GetMapping("/list") +// @Operation(summary = "获得物品包装信息 列表") +// @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") +// @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") +// public CommonResult> getItempackagingList(@RequestParam("ids") Collection ids) { +// List list = itempackagingService.getItempackagingList(ids); +// return success(ItempackagingConvert.INSTANCE.convertList(list)); +// } @GetMapping("/page") @Operation(summary = "获得物品包装信息分页") @@ -130,6 +132,20 @@ public class ItempackagingController { vo.setCreator(user.getNickname()); } Map mapDropDown = new HashMap<>(); + + ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物品包装信息 Excel") + @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") + @OperateLog(type = EXPORT) + public void exportItempackagingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = itempackagingService.getItempackagingList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品包装信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(1, uom); String[] description = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); @@ -144,9 +160,17 @@ public class ItempackagingController { mapDropDown.put(11, altPackUnit4);; String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(13, available);; - ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = ItempackagingConvert.INSTANCE.convertList02(list); + for(ItempackagingExcelVO vo : resultList) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return resultList; } + @GetMapping("/get-import-template") @Operation(summary = "获得导入物品包装信息模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java index 1c1512fb..916e6aba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.itempackaging.vo.ItempackagingExportReqVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import org.apache.ibatis.annotations.Mapper; @@ -69,4 +70,7 @@ public interface ItempackagingMapper extends BaseMapperX { } default ItempackagingDO selectByItemCode(String itemCode){return selectOne(ItempackagingDO::getItemCode,itemCode);}; + default List selectSeniorList(CustomConditions conditions) { + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java index fbcfdd28..9b69898a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java @@ -52,7 +52,7 @@ public interface ItempackagingService { * @param ids 编号 * @return 物品包装信息 列表 */ - List getItempackagingList(Collection ids); + List getItempackagingList(CustomConditions conditions); /** * 获得物品包装信息 分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java index e1f586fc..0d1d6667 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java @@ -71,8 +71,8 @@ public class ItempackagingServiceImpl implements ItempackagingService { } @Override - public List getItempackagingList(Collection ids) { - return itempackagingMapper.selectBatchIds(ids); + public List getItempackagingList(CustomConditions conditions) { + return itempackagingMapper.selectSeniorList(conditions); } @Override