From 60806825951c111ac107dec87bd3acc5a7d6a707 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 三月 2026 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9db56f9..6727a36 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -19,9 +19,13 @@
<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>
+
<if test="ew.remark != null and ew.remark !=''">
remark = #{ew.remark},
</if>
@@ -41,6 +45,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>
@@ -53,6 +60,7 @@
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
select si.id,
+ si.net_weight,
si.qualitity,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
@@ -64,14 +72,22 @@
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
+ <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