From cd1a10a5a2a566424b4892d15df1e6c001e528b6 Mon Sep 17 00:00:00 2001 From: liupopo Date: Wed, 20 Sep 2023 18:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8F=AA=E6=9C=89=E7=83=9F?= =?UTF-8?q?=E8=8D=89=E9=97=A8=E5=BA=97=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/biz/reportinventory/ReportInventoryService.java | 7 +++++++ .../supervise/report/ds/supplychain/GdInventoryMapper.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java index 6e2ae90b..c5d0165b 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportinventory/ReportInventoryService.java @@ -161,6 +161,13 @@ public class ReportInventoryService { urlList.add(allUrl); List storeList = gdInventoryMapper.groupByStore(); + List sList = new ArrayList<>(); + storeList.forEach(vo -> sList.add(vo.getWarehouseCode())); + List storeListYc = gdInventoryMapper.groupByStoreYc(); + storeListYc.forEach(ycvo -> { + if (!sList.contains(ycvo.getWarehouseCode())) + storeList.add(ycvo); + }); for (StoreVo v : storeList) { String url = xlsxMdspkcOfCodeDay(v.getWarehouseCode(), v.getWarehouseName(), currDay); urlList.add(url); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryMapper.java index 836ab3fe..0e81864a 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryMapper.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/supplychain/GdInventoryMapper.java @@ -39,4 +39,10 @@ public interface GdInventoryMapper extends BaseMapper { " where warehouseType =2 " + " group by warehouseCode ") List groupByStore(); + + @Select("select warehouseCode, max(warehouseName) warehouseName " + + " from gd_inventory_yc " + + " where warehouseType =2 " + + " group by warehouseCode ") + List groupByStoreYc(); }