From 5c998c8f14dbf037c0a8e310e013fb4580f0c61d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 28 一月 2026 11:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index e7f365f..0c47ede 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -28,6 +28,9 @@
<if test="ew.warnNum != null and ew.warnNum !=''">
warn_num = #{ew.warnNum},
</if>
+ <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
+ locked_quantity = locked_quantity + #{ew.lockedQuantity},
+ </if>
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
@@ -59,6 +62,7 @@
si.version,
(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
pm.model,
+ si.remark,
pm.unit,
p.product_name
from stock_inventory si
@@ -74,6 +78,8 @@
pm.model,
pm.unit,
p.product_name,
+ coalesce(si.warn_num, 0) as warn_num,
+ coalesce(si.locked_quantity, 0) as locked_quantity,
si.remark,
si.update_time
from stock_inventory si
@@ -178,5 +184,15 @@
pm.unit,
p.product_name
</select>
+ <select id="selectTotal" resultType="java.math.BigDecimal">
+ select ifnull(sum(qualitity),0)
+ from stock_inventory
+ </select>
+ <select id="selectTotalByDate" resultType="java.math.BigDecimal">
+ select sum(qualitity)
+ from stock_inventory
+ where
+ create_time >= #{now} and create_time < DATE_ADD(#{now}, INTERVAL 1 DAY)
+ </select>
</mapper>
--
Gitblit v1.9.3