From 147466c117b56fad2626217bb259133d8d284360 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Fri, 20 Mar 2026 10:23:44 +0800
Subject: [PATCH] 修改仓库库存显示
---
hazmat-system/src/main/resources/mapper/system/HzWarehouseRecordMapper.xml | 3 +++
hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
index 53d38b9..03ddf27 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzHazmatMapper.xml
@@ -77,8 +77,8 @@
<select id="selectHazmatGroupWareHouse" resultType="com.gkhy.hazmat.system.domain.vo.HzHazmatWarehouseVO">
select a.basic_id,a.warehouse_id,a.cupboard_id,
- (select count(1) from hz_hazmat where state=0 and basic_id=a.basic_id and warehouse_id=a.warehouse_id) as stock,
- (select count(1) from hz_hazmat where state=1 and basic_id=a.basic_id and warehouse_id=a.warehouse_id) as miss_stock
+ SUM(CASE WHEN a.state = 0 THEN 1 ELSE 0 END) AS stock,
+ SUM(CASE WHEN a.state = 1 THEN 1 ELSE 0 END) AS miss_stock
from hz_hazmat a
left join hz_hazmat_basic b on b.id=a.basic_id
<where>
@@ -103,6 +103,7 @@
and a.del_flag=0 and b.del_flag = 0
</where>
group by a.basic_id,a.warehouse_id, a.cupboard_id
+ HAVING stock > 0 OR miss_stock > 0
</select>
diff --git a/hazmat-system/src/main/resources/mapper/system/HzWarehouseRecordMapper.xml b/hazmat-system/src/main/resources/mapper/system/HzWarehouseRecordMapper.xml
index 03788da..ce48d7a 100644
--- a/hazmat-system/src/main/resources/mapper/system/HzWarehouseRecordMapper.xml
+++ b/hazmat-system/src/main/resources/mapper/system/HzWarehouseRecordMapper.xml
@@ -70,6 +70,9 @@
<if test="warehouseId != null and warehouseId != ''">
AND a.warehouse_id=#{warehouseId}
</if>
+ <if test="cupboardId != null and cupboardId != ''">
+ AND a.cupboard_id= #{cupboardId}
+ </if>
<if test="companyId != null">
AND a.company_id =#{companyId}
</if>
--
Gitblit v1.9.2