From c73c9b2ce234fb6f12505ba4f9a23905e2f62da4 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Fri, 14 Feb 2025 18:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml    | 1 +
 .../yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
index cb2e6d747b..b04b944a0e 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml
@@ -478,6 +478,7 @@
         wms_inventory AS i
         LEFT JOIN wms_warehouse_rack as r ON i.warehouseRackSid = r.sid
         LEFT JOIN wms_warehouse_area as a ON r.locationSid = a.sid
+        LEFT JOIN wms_warehouse_info as wi ON wi.sid = i.warehouseSid
         LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid
         <where>
             ${ew.sqlSegment}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
index 9823d0fd96..8e0994bd6d 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java
@@ -986,6 +986,7 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
             );
         }
         qw.notLike("i.goodsID","-O");
+        qw.eq("wi.warehouseTypeValue","配件库");
         List<StorageListVo> listVos = baseMapper.appStorage(qw);
         Map<String, List<StorageListVo>> stringListMap = listVos.stream().collect(Collectors.groupingBy(StorageListVo::getTitle));
         List<StorageVo> records = new ArrayList<>();