From 37ee0e8217b8b2146d3f9996eb9e600c1b5c8646 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 15 Nov 2023 14:37:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E6=B8=85=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/bom/BomController.java | 42 +++++++++++-------- .../ItempackagingController.java | 11 +---- .../module/wms/dal/mysql/bom/BomMapper.java | 4 +- .../module/wms/service/bom/BomService.java | 2 +- .../wms/service/bom/BomServiceImpl.java | 5 ++- 5 files changed, 34 insertions(+), 30 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java index 8cfa4622..7e8ae589 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java @@ -9,10 +9,13 @@ 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.bom.vo.*; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO; import com.win.module.wms.convert.bom.BomConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.dal.dataobject.bom.BomDO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.bom.BomService; import io.swagger.v3.oas.annotations.Operation; @@ -80,14 +83,6 @@ public class BomController { return success(BomConvert.INSTANCE.convert(bom)); } - @GetMapping("/list") - @Operation(summary = "获得物料清单列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:bom:query')") - public CommonResult> getBomList(@RequestParam("ids") Collection ids) { - List list = bomService.getBomList(ids); - return success(BomConvert.INSTANCE.convertList(list)); - } @GetMapping("/page") @Operation(summary = "获得物料清单分页") @@ -125,21 +120,34 @@ public class BomController { public void exportBomExcel(@Valid BomExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = bomService.getBomList(exportReqVO); - // 导出 Excel - List datas = BomConvert.INSTANCE.convertList02(list); - for(BomExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物料清单 Excel") + @PreAuthorize("@ss.hasPermission('wms:bom:export')") + @OperateLog(type = EXPORT) + public void exportBomExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = bomService.getBomList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物料清单.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { String[] componentUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); mapDropDown.put(2, componentUom); String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(7, available); - ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas,mapDropDown); + // 导出 Excel + List resultList = BomConvert.INSTANCE.convertList02(list); + for(BomExcelVO 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/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index 45baab3e..5c96af81 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 @@ -124,16 +124,9 @@ public class ItempackagingController { public void exportItempackagingExcel(@Valid ItempackagingExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = itempackagingService.getItempackagingList(exportReqVO); - // 导出 Excel - List datas = ItempackagingConvert.INSTANCE.convertList02(list); - for(ItempackagingExcelVO vo : datas) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); - } Map mapDropDown = new HashMap<>(); - - ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas,mapDropDown); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") @Operation(summary = "导出物品包装信息 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java index c1ba720a..b6819590 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/bom/BomMapper.java @@ -62,5 +62,7 @@ public interface BomMapper extends BaseMapperX { .eqIfPresent(BomDO::getCreator, reqVO.getCreator()) .orderByDesc(BomDO::getId)); } - + 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/bom/BomService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java index b745196b..2c6bc9ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java @@ -53,7 +53,7 @@ public interface BomService { * @param ids 编号 * @return 物料清单列表 */ - List getBomList(Collection ids); + List getBomList(CustomConditions conditions); /** * 获得物料清单分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java index a7cbd781..529f6450 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomServiceImpl.java @@ -73,10 +73,11 @@ public class BomServiceImpl implements BomService { } @Override - public List getBomList(Collection ids) { - return bomMapper.selectBatchIds(ids); + public List getBomList(CustomConditions conditions) { + return bomMapper.selectSeniorList(conditions); } + @Override public PageResult getBomPage(BomPageReqVO pageReqVO) { return bomMapper.selectPage(pageReqVO);