From 78e42bab93977566994be06f5d6b042c9f5a67f5 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 05 三月 2026 15:17:43 +0800
Subject: [PATCH] fix: 净重拆分为详细数据而不是总书记
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9db56f9..8b33dd5 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -22,6 +22,7 @@
<if test="ew.version != null">
version = version + 1,
</if>
+
<if test="ew.remark != null and ew.remark !=''">
remark = #{ew.remark},
</if>
@@ -41,6 +42,9 @@
<if test="ew.qualitity != null">
qualitity = qualitity - #{ew.qualitity},
</if>
+ <if test="ew.netWeight != null">
+ net_weight = net_weight - #{ew.netWeight},
+ </if>
<if test="ew.version != null">
version = version + 1,
</if>
@@ -52,7 +56,9 @@
where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
- select si.id,
+ select
+ si.id,
+ COALESCE(sir.total_net_weight, 0) as net_weight,
si.qualitity,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
@@ -64,14 +70,29 @@
pm.model,
si.remark,
pm.unit,
- p.product_name
+ p.product_name,
+ p1.product_name as parent_name,
+ p1.id as parent_id
from stock_inventory si
left join product_model pm on si.product_model_id = pm.id
left join product p on pm.product_id = p.id
- where 1 = 1
- <if test="ew.productName != null and ew.productName !=''">
- and p.product_name like concat('%',#{ew.productName},'%')
- </if>
+ left join product p1 on p.parent_id = p1.id
+ left join (
+ select
+ product_model_id,
+ sum(net_weight) as total_net_weight
+ from stock_in_record
+ group by product_model_id
+ ) sir on si.product_model_id = sir.product_model_id
+ <where>
+ 1=1
+ <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>
+ </where>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
select si.qualitity,
--
Gitblit v1.9.3