From c7cf4606c748e3ef2a4df1811b60e0ef000ff9e8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 13:43:45 +0800
Subject: [PATCH] fix: 库存导入导出缺失厚度
---
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index b171ae2..bb8182a 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -25,13 +25,17 @@
</if>
update_time = now()
</set>
- where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
+ where product_model_id = #{ew.productModelId}
+ and (qualitity - COALESCE(locked_quantity, 0)) >= #{ew.qualitity}
</update>
<update id="updateAddStockUnInventory">
update stock_uninventory
<set>
<if test="ew.qualitity != null">
qualitity = qualitity + #{ew.qualitity},
+ </if>
+ <if test="ew.lockedQuantity != null">
+ locked_quantity = locked_quantity + #{ew.lockedQuantity},
</if>
<if test="ew.version != null">
version = version + 1,
@@ -55,6 +59,7 @@
(su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
pm.model,
pm.unit,
+ pm.thickness,
p.product_name
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
@@ -63,9 +68,13 @@
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
+ <if test="ew.productModelId != null">
+ and su.product_model_id = #{ew.productModelId}
+ </if>
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
select su.*,
+ pm.thickness,
pm.model,
pm.unit,
p.product_name
--
Gitblit v1.9.3