From 7a8042de417ada88656e11c2a6d2c5287097a955 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 11 Oct 2023 14:51:21 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataGoodsAreaController.java | 4 +- .../BasicdatavisualizationKCSheetThree.java | 99 +++---------------- .../BasicdatavisualizationZreoSheetTwo.java | 27 +---- .../mapper/BasicdataGoodsAreaMapper.java | 2 + .../mapper/BasicdataGoodsAreaMapper.xml | 17 +++- .../impl/BasicdataGoodsAreaServiceImpl.java | 14 +-- 6 files changed, 43 insertions(+), 120 deletions(-) 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 d0bf23510..aa7f25d91 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 @@ -259,8 +259,8 @@ public class BasicdataGoodsAreaController extends BladeController { @ApiOperation(value = "导出数据", notes = "传入warehouseGoodsArea") public void visualizationwarehouse(@ApiIgnore @RequestParam Map visualization, HttpServletResponse response) { Long areaId = Long.valueOf((String) visualization.get("areaId")); - log.info("areaId>>>>>>>>>>>>>{}",areaId); - basicdataGoodsAreaService.visualizationwarehouse(1,areaId,response); + Integer type = Integer.valueOf((String) visualization.get("type")); + basicdataGoodsAreaService.visualizationwarehouse(type,areaId,response); //ExcelUtil.exports(response, "货区数据" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaexportExcel.class); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationKCSheetThree.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationKCSheetThree.java index 81493ce0b..4c8986fb4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationKCSheetThree.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationKCSheetThree.java @@ -20,51 +20,34 @@ import java.io.Serializable; @ContentRowHeight(18) public class BasicdatavisualizationKCSheetThree implements Serializable { /** - * 订单自编号 + * 客户名称 */ @ColumnWidth(30) - @ExcelProperty("订单自编号") - private String orderCode; + @ExcelProperty("客户名称") + private String marketName; /** - * 包条码 + * 服务号 */ @ColumnWidth(40) - @ExcelProperty("包条码") - private String orderPackageCode; + @ExcelProperty("服务号") + private String serviceNumber; + /** - * 商场名称 + * 货物名称 */ @ColumnWidth(40) - @ExcelProperty("商场名称") - private String mallName; - /** - * 客户名称 - */ - @ColumnWidth(40) - @ExcelProperty("客户名称") - private String customerName; + @ExcelProperty("货物名称") + private String descriptionGoods; /** - * 物料编码 + * 货物编码 */ @ColumnWidth(30) - @ExcelProperty("物料编码") - private String materialCode; + @ExcelProperty("货物编码") + private String cargoNumber; - /** - * 物料名称 - */ - @ColumnWidth(30) - @ExcelProperty("物料名称") - private String materialName; - /** - * 托盘码 - */ - @ColumnWidth(30) - @ExcelProperty("托盘码") - private String trayCode; /** * 库位号 @@ -74,62 +57,12 @@ public class BasicdatavisualizationKCSheetThree implements Serializable { private String positionInfo; - /** - * 一级品类 - */ - @ColumnWidth(40) - @ExcelProperty("一级品类") - private String firsts; - - /** - * 一级品类编码 - */ - @ColumnWidth(40) - @ExcelProperty("一级品类编码") - private String firstsCode; - - - /** - * 二级品类 - */ - @ColumnWidth(40) - @ExcelProperty("二级品类") - private String second; - - /** - * 二级品类编码 - */ - @ColumnWidth(40) - @ExcelProperty("二级品类编码") - private String secondCode; - - - /** - * 三级品类 - */ - @ColumnWidth(30) - @ExcelProperty("三级品类") - private String thirdProduct; - - /** - * 三级品类编码 - */ - @ColumnWidth(30) - @ExcelProperty("三级品类编码") - private String thirdCode; - - /** - * 上架时间 - */ - @ColumnWidth(20) - @ExcelProperty("上架时间") - private String createTime; /** - * 上架人 + * 数量 */ @ColumnWidth(20) - @ExcelProperty("上架人") - private String createUser; + @ExcelProperty("数量") + private String num; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationZreoSheetTwo.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationZreoSheetTwo.java index 43e91f42b..63ac9453c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationZreoSheetTwo.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdatavisualizationZreoSheetTwo.java @@ -28,32 +28,11 @@ public class BasicdatavisualizationZreoSheetTwo implements Serializable { private String positionInfo; /** - * 一级品类 - */ - @ColumnWidth(40) - @ExcelProperty("一级品类") - private String firsts; - - /** - * 二级品类 - */ - @ColumnWidth(40) - @ExcelProperty("二级品类") - private String second; - - /** - * 三级品类 - */ - @ColumnWidth(30) - @ExcelProperty("三级品类") - private String thirdProduct; - - /** - * 订单自编号 + * 运单号 */ @ColumnWidth(30) - @ExcelProperty("订单自编号") - private String orderCode; + @ExcelProperty("运单号") + private String waybillNumber; /** * 物料名称 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 f3ed19db1..804b29b2a 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 @@ -98,4 +98,6 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper exportWarehouseByCKService(@Param("areaId") Long areaId); List exportWarehouseByWaybillNumber(@Param("areaId") Long areaId); + + List exportWarehouseZreoByallocation(@Param("areaId") Long areaId); } 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 ea1dae4b7..555b96467 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 @@ -319,7 +319,7 @@ AND ldsl.incoming_batch = lwug.incoming_batch AND ldsl.market_id = lwug.market_id - ldpl.warehouse_id =#{areaId} + ldsl.warehouse_id =#{areaId} GROUP BY lwug.position_code @@ -378,4 +378,19 @@ ) AS subquery GROUP BY waybillNumber + 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 fb857dad9..1dc7e0a38 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 @@ -443,14 +443,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl basicdatavisualizationSheetTwos = baseMapper.exportWarehouseByallocation(areaId); -// basicdatavisualizationSheetTwos.forEach(e->{ -// if (StringUtils.isNotBlank(e.getFirsts())){e.setFirsts(this.countUniqueProperties(e.getFirsts())); } -// if (StringUtils.isNotBlank(e.getSecond())){e.setSecond(this.countUniqueProperties(e.getSecond()));} -// if (StringUtils.isNotBlank(e.getThirdProduct())){e.setThirdProduct(this.countUniqueProperties(e.getThirdProduct()));} -// if (StringUtils.isNotBlank(e.getOrderCode())){e.setOrderCode(this.countUniqueProperties(e.getOrderCode()));} -// if (StringUtils.isNotBlank(e.getMaterialName())){e.setMaterialName(this.countUniqueProperties(e.getMaterialName()));} -// }); + List basicdatavisualizationSheetTwos = baseMapper.exportWarehouseZreoByallocation(areaId); + try { String fileName = "仓库数据" + DateUtil.time(); @@ -460,8 +454,8 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl goodsAreaSheetInfoBeans = new LinkedList<>(); - goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("订单自编号维度",BasicdatavisualizationZreoSheetOne.class,basicdatavisualizationZreoSheetOnes)); -// goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("货位维度",BasicdatavisualizationSheetTwo.class,basicdatavisualizationSheetTwos)); + goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("零担维度",BasicdatavisualizationZreoSheetOne.class,basicdatavisualizationZreoSheetOnes)); + goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("货位维度",BasicdatavisualizationZreoSheetTwo.class,basicdatavisualizationSheetTwos)); // goodsAreaSheetInfoBeans.add(new GoodsAreaSheetInfoBean("包条维度",BasicdatavisualizationSheetThree.class,basicdatavisualizationSheetThrees)); // EasyExcel.write(response.getOutputStream(), BasicdataGoodsAreaexportExcel.class).sheet("货区数据表").doWrite(warehouseGoodsAreaList); ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build();