From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
index fa16914..77e3943 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
@@ -57,55 +57,57 @@
</update>
<select id="pageConsumablesInventory" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
- select
+ SELECT * FROM (
+ SELECT
si.id,
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
- (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as qualitity,
+ (COALESCE(sir.total_net_weight, 0) - COALESCE(sor.total_net_weight, 0)) AS qualitity,
si.purchaser,
- COALESCE(si.locked_quantity, 0) as locked_quantity,
+ COALESCE(si.locked_quantity, 0) AS locked_quantity,
si.product_model_id,
si.create_time,
si.update_time,
- COALESCE(si.warn_num, 0) as warn_num,
+ COALESCE(si.warn_num, 0) AS warn_num,
si.version,
- (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
+ (si.qualitity - COALESCE(si.locked_quantity, 0)) AS un_locked_quantity,
pm.model,
si.remark,
pm.unit,
p.product_name,
- p1.product_name as parent_name,
- p1.id as parent_id,
- si.product_id as productId
- from consumables_inventory si
- left join product_model pm on si.product_model_id = pm.id
- left join product p on pm.product_id = p.id
- left join product p1 on p.parent_id = p1.id
+ p1.product_name AS parent_name,
+ p1.id AS parent_id,
+ si.product_id AS productId
+ FROM consumables_inventory si
+ LEFT JOIN product_model pm ON si.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
+ LEFT JOIN product p1 ON p.parent_id = p1.id
-- 鍏ュ簱鍑�閲�
- left join (
- select
+ LEFT JOIN (
+ SELECT
product_model_id,
- sum(stock_in_num) as total_net_weight
- from consumables_in_record
- group by product_model_id
- ) sir on si.product_model_id = sir.product_model_id
+ SUM(stock_in_num) AS total_net_weight
+ FROM consumables_in_record
+ GROUP BY product_model_id
+ ) sir ON si.product_model_id = sir.product_model_id
-- 鍑哄簱鍑�閲�
- left join (
- select
+ LEFT JOIN (
+ SELECT
product_model_id,
- sum(stock_out_num) as total_net_weight
- from consumables_out_record
- group by product_model_id
- ) sor on si.product_model_id = sor.product_model_id
-
+ SUM(stock_out_num) AS total_net_weight
+ FROM consumables_out_record
+ GROUP BY product_model_id
+ ) sor ON si.product_model_id = sor.product_model_id
<where>
1=1
- <if test="ew.parentId != null and ew.parentId !=''">
- and p.parent_id = #{ew.parentId}
+ <if test="ew.parentId != null and ew.parentId != ''">
+ AND p.parent_id = #{ew.parentId}
</if>
- <if test="ew.productName != null and ew.productName !=''">
- and p.product_name like concat('%',#{ew.productName},'%')
+ <if test="ew.productName != null and ew.productName != ''">
+ AND p.product_name LIKE CONCAT('%', #{ew.productName}, '%')
</if>
</where>
+ ) temp
+ WHERE qualitity != 0
</select>
<select id="listConsumablesInventoryExportData" resultType="com.ruoyi.consumables.execl.ConsumablesInventoryExportData">
@@ -190,6 +192,7 @@
on sir.product_model_id = outWeight.product_model_id
<where>
+ 1=1
<if test="ew.reportDate != null">
and sir.create_time >= #{ew.reportDate}
and sir.create_time < DATE_ADD(#{ew.reportDate}, INTERVAL 1 DAY)
@@ -296,6 +299,7 @@
LEFT JOIN product_model pm ON pm.id = combined_data.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
<where>
+ 1=1
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
--
Gitblit v1.9.3