From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index f136a84..60fc90e 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -34,6 +34,12 @@
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
+ <if test="ew.batchNo == null">
+ and batch_no is null
+ </if>
+ <if test="ew.batchNo != null">
+ and batch_no = #{ew.batchNo}
+ </if>
</update>
<update id="updateSubtractStockInventory">
update stock_inventory
@@ -50,6 +56,12 @@
update_time = now()
</set>
where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
+ <if test="ew.batchNo == null">
+ and batch_no is null
+ </if>
+ <if test="ew.batchNo != null">
+ and batch_no = #{ew.batchNo}
+ </if>
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
select si.id,
@@ -87,14 +99,17 @@
INNER JOIN product_tree pt ON p.parent_id = pt.id
)
select
+ batch_no,
MAX(qualifiedId) as qualifiedId,
MAX(unQualifiedId) as unQualifiedId,
SUM(qualifiedQuantity) as qualifiedQuantity,
SUM(unQualifiedQuantity) as unQualifiedQuantity,
SUM(qualifiedLockedQuantity) as qualifiedLockedQuantity,
SUM(unQualifiedLockedQuantity) as unQualifiedLockedQuantity,
- SUM(qualifiedQuantity - qualifiedLockedQuantity) as qualifiedUnLockedQuantity,
- SUM(unQualifiedQuantity - unQualifiedLockedQuantity) as unQualifiedUnLockedQuantity,
+ SUM(qualifiedQuantity - qualifiedLockedQuantity - IFNULL(qualifiedPendingOut, 0)) as qualifiedUnLockedQuantity,
+ SUM(unQualifiedQuantity - unQualifiedLockedQuantity - IFNULL(unQualifiedPendingOut, 0)) as unQualifiedUnLockedQuantity,
+ SUM(IFNULL(qualifiedPendingOut, 0)) as qualifiedPendingOutQuantity,
+ SUM(IFNULL(unQualifiedPendingOut, 0)) as unQualifiedPendingOutQuantity,
product_model_id,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
@@ -108,6 +123,7 @@
'combined' as stockType
from (
select
+ si.batch_no,
si.id as qualifiedId,
null as unQualifiedId,
si.qualitity as qualifiedQuantity,
@@ -125,7 +141,16 @@
si.remark,
pm.unit,
p.product_name,
- p.id as product_id
+ p.id as product_id,
+ (
+ select IFNULL(SUM(sor.stock_out_num), 0)
+ from stock_out_record sor
+ where sor.product_model_id = si.product_model_id
+ and (si.batch_no is null and sor.batch_no is null or si.batch_no = sor.batch_no)
+ and sor.type = '0'
+ and sor.approval_status = 0
+ ) as qualifiedPendingOut,
+ 0 as unqualifiedPendingOut
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
@@ -133,6 +158,7 @@
union all
select
+ su.batch_no,
null as qualifiedId,
su.id as unQualifiedId,
0 as qualifiedQuantity,
@@ -150,7 +176,16 @@
su.remark,
pm.unit,
p.product_name,
- p.id as product_id
+ p.id as product_id,
+ 0 as qualifiedPendingOut,
+ (
+ select IFNULL(SUM(sor.stock_out_num), 0)
+ from stock_out_record sor
+ where sor.product_model_id = su.product_model_id
+ and (su.batch_no is null and sor.batch_no is null or su.batch_no = sor.batch_no)
+ and sor.type = '1'
+ and sor.approval_status = 0
+ ) as unqualifiedPendingOut
from stock_uninventory su
left join product_model pm on su.product_model_id = pm.id
left join product p on pm.product_id = p.id
@@ -168,7 +203,7 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by product_model_id, model, unit, product_name, product_id
+ group by batch_no, product_model_id, model, unit, product_name, product_id
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -395,4 +430,35 @@
ORDER BY DATE(sor.create_time) ASC
</select>
-</mapper>
\ No newline at end of file
+ <select id="selectPendingOutQuantity" resultType="java.math.BigDecimal">
+ SELECT IFNULL(SUM(sor.stock_out_num), 0)
+ FROM stock_out_record sor
+ WHERE sor.product_model_id = #{productModelId}
+ AND (sor.batch_no = #{batchNo} OR (#{batchNo} IS NULL AND sor.batch_no IS NULL))
+ AND sor.type = #{type}
+ AND sor.approval_status = 0
+ </select>
+
+ <select id="listSelectableBatchNoByProductModelIds" resultType="com.ruoyi.stock.pojo.StockInventory">
+ select distinct si.product_model_id,
+ si.batch_no
+ from stock_inventory si
+ where si.product_model_id in
+ <foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
+ #{productModelId}
+ </foreach>
+ and si.batch_no is not null
+ and si.batch_no != ''
+ and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
+ order by si.product_model_id, si.batch_no
+ </select>
+ <select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
+ select spd.id, spd.batch_no, spd.locked_quantity, (spd.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
+ from stock_inventory spd
+ left join (select stock_inventory_id, sum(quantity) as qualitity
+ from shipping_product_detail
+ group by stock_inventory_id) as sd on sd.stock_inventory_id = spd.id
+ where product_model_id = #{productModelId}
+ </select>
+
+</mapper>
--
Gitblit v1.9.3