From 18fa07479d3c7f5a9b683ab0f698528d9bd2a9ec Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 11:23:53 +0800
Subject: [PATCH] feat: 入库管理、出库台账增加合同号字段；支持合同模糊查询
---
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index b171ae2..1ebd219 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -25,7 +25,8 @@
</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
@@ -55,6 +56,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,6 +65,9 @@
<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.*,
--
Gitblit v1.9.3