From 2908cecca7c614cb631c77fc45b5df078f8f0f4b Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 5 Sep 2023 13:34:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=B9=E9=87=8F=E5=AF=BC=E5=87=BA=E8=B4=A7?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataGoodsAreaController.java | 9 ++-- .../excel/BasicdataGoodsAreaexportExcel.java | 43 +++++++++++++++++++ .../mapper/BasicdataGoodsAreaMapper.java | 3 +- .../mapper/BasicdataGoodsAreaMapper.xml | 10 ++++- .../service/IBasicdataGoodsAreaService.java | 5 ++- .../impl/BasicdataGoodsAreaServiceImpl.java | 6 ++- 6 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaexportExcel.java diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index 46f11f5bf..97c07efb2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -22,6 +22,7 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; import com.logpm.basicdata.excel.BasicdataGoodsAreaImporter; +import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; import com.logpm.basicdata.service.IBasicdataWarehouseService; @@ -216,10 +217,10 @@ public class BasicdataGoodsAreaController extends BladeController { @ApiOperationSupport(order = 9) @ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea") public void exportWarehouseGoodsArea(@ApiIgnore @RequestParam Map basicdataGoodsArea, HttpServletResponse response) { - Long id =Long.valueOf((String)basicdataGoodsArea.get("id")); - log.info("basicdataGoodsArea>>>>>>>>>>>>>{}",id); - List list = basicdataGoodsAreaService.exportWarehouseGoodsArea(id); - ExcelUtil.export(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaExcel.class); + List ids = Func.toLongList((String)basicdataGoodsArea.get("ids")); + log.info("basicdataGoodsArea>>>>>>>>>>>>>{}",ids); + List list = basicdataGoodsAreaService.exportWarehouseGoodsArea(ids); + ExcelUtil.export(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaexportExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaexportExcel.java new file mode 100644 index 000000000..fa660c399 --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaexportExcel.java @@ -0,0 +1,43 @@ +package com.logpm.basicdata.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicdataGoodsAreaexportExcel implements Serializable { + private static final long serialVersionUID = 1L; + + + /** + * 货区名称 + */ + @ColumnWidth(20) + @ExcelProperty("货区名称") + private String areaName; + /** + * 货架名称 + */ + @ColumnWidth(20) + @ExcelProperty("货架名称") + private String shelfName; + /** + * 货位 + */ + @ColumnWidth(20) + @ExcelProperty("货位") + private String allocationName; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private String allocationNub; +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java index a0c1272a8..cc26d7c19 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; +import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; @@ -52,7 +53,7 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper exportWarehouseGoodsArea(@Param("id") Long id); + List exportWarehouseGoodsArea(@Param("ids") List id); IPage getBasicdataGoodsAreaList(IPage page,@Param("po") Map basicdataGoodsArea); diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index 6e21eaad7..28a9afc92 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -133,7 +133,7 @@ - SELECT lwga2.headline areaName, lwgs.goods_shelf_name shelfName, @@ -145,7 +145,13 @@ JOIN logpm_warehouse_goods_area lwga2 on lwga2.id = lwga.goods_area_id LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.allocation_id = lwga.id - lwga.is_deleted =0 and lwga2.id = #{id} + lwga.is_deleted =0 + + and lwga2.id in + + #{item} + + GROUP BY lwga.id diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java index 626225bfd..8ad2b06c4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; +import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; @@ -51,10 +52,10 @@ public interface IBasicdataGoodsAreaService extends BaseService exportWarehouseGoodsArea(Long Id); + List exportWarehouseGoodsArea(List ids); /** * diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 1b0acbbe2..090c333ef 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -28,6 +28,7 @@ import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; +import com.logpm.basicdata.excel.BasicdataGoodsAreaexportExcel; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper; import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; @@ -94,8 +95,9 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl exportWarehouseGoodsArea(Long id) { - List warehouseGoodsAreaList = baseMapper.exportWarehouseGoodsArea(id); + public List exportWarehouseGoodsArea(List ids) { + List warehouseGoodsAreaList = baseMapper.exportWarehouseGoodsArea(ids); + log.info("warehouseGoodsAreaList>>>>>>>>>>>{}",warehouseGoodsAreaList); //warehouseGoodsAreaList.forEach(warehouseGoodsArea -> { // warehouseGoodsArea.setTypeName(DictCache.getValue(DictEnum.YES_NO, WarehouseGoodsArea.getType())); //});