From 944f5a3211a5aa0f89016bca33fe3a063d1bf6c3 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 15 Nov 2023 15:29:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E7=AE=A1=E7=90=86=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductionlineitemController.java | 33 ++++++++++++------- .../ProductionlineitemMapper.java | 5 ++- .../ProductionlineitemService.java | 2 +- .../ProductionlineitemServiceImpl.java | 4 +-- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java index d081e576..d09759fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java @@ -8,8 +8,11 @@ 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.productionlineitem.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.productionlineitem.ProductionlineitemService; @@ -78,15 +81,6 @@ public class ProductionlineitemController { return success(ProductionlineitemConvert.INSTANCE.convert(productionlineitem)); } - @GetMapping("/list") - @Operation(summary = "获得生产线物料关系列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')") - public CommonResult> getProductionlineitemList(@RequestParam("ids") Collection ids) { - List list = productionlineitemService.getProductionlineitemList(ids); - return success(ProductionlineitemConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得生产线物料关系分页") @PreAuthorize("@ss.hasPermission('wms:productionlineitem:query')") @@ -102,14 +96,29 @@ public class ProductionlineitemController { public void exportProductionlineitemExcel(@Valid ProductionlineitemExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = productionlineitemService.getProductionlineitemList(exportReqVO); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "生产线物料关系.xlsx", "数据", ProductionlineitemExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出生产线物料关系 Excel") + @PreAuthorize("@ss.hasPermission('wms:productionlineitem:export')") + @OperateLog(type = EXPORT) + public void exportProductionlineitemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = productionlineitemService.getProductionlineitemList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "生产线物料关系.xlsx", "数据", ProductionlineitemExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { // 导出 Excel - List datas = ProductionlineitemConvert.INSTANCE.convertList02(list); - for(ProductionlineitemExcelVO vo : datas) { + List resultList = ProductionlineitemConvert.INSTANCE.convertList02(list); + for(ProductionlineitemExcelVO vo : resultList) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } - ExcelUtils.write(response, "生产线物料关系.xls", "数据", ProductionlineitemExcelVO.class, datas); + return resultList; } @GetMapping("/get-import-template") @Operation(summary = "获得导入生产线物料关系模板") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java index a474a028..c4b2efd3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.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.productionlineitem.vo.ProductionlineitemExportReqVO; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineitemPageReqVO; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import org.apache.ibatis.annotations.Mapper; @@ -51,5 +52,7 @@ public interface ProductionlineitemMapper extends BaseMapperX 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/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index f52040b4..da24f266 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -52,7 +52,7 @@ public interface ProductionlineitemService { * @param ids 编号 * @return 生产线物料关系列表 */ - List getProductionlineitemList(Collection ids); + List getProductionlineitemList(CustomConditions conditions); /** * 获得生产线物料关系分页 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index c72828d9..7c174301 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -72,8 +72,8 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } @Override - public List getProductionlineitemList(Collection ids) { - return productionlineitemMapper.selectBatchIds(ids); + public List getProductionlineitemList(CustomConditions conditions) { + return productionlineitemMapper.selectSeniorList(conditions); } @Override