From 0c9ee949b6a7ea8ce2bbc42cbbd2c64fb977e509 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 14:58:39 +0800
Subject: [PATCH] Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯pro
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 0718d5e..aad917a 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -31,6 +31,9 @@
<if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
locked_quantity = locked_quantity + #{ew.lockedQuantity},
</if>
+ <if test="ew.warehouse != null and ew.warehouse !=''">
+ warehouse = #{ew.warehouse},
+ </if>
update_time = now()
</set>
where product_model_id = #{ew.productModelId}
@@ -65,6 +68,7 @@
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
select si.id,
+ si.warehouse,
si.qualitity,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
@@ -120,6 +124,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
'combined' as stockType
from (
select
@@ -142,6 +147,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ si.warehouse,
(
select IFNULL(SUM(sor.stock_out_num), 0)
from stock_out_record sor
@@ -180,6 +186,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ su.warehouse,
0 as qualifiedPendingOut,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -209,13 +216,21 @@
<if test="ew.topParentProductId != null and ew.topParentProductId > 0">
and combined.product_id in (select id from product_tree)
</if>
+ <if test="ew.model != null and ew.model !=''">
+ and combined.model like concat('%',#{ew.model},'%')
+ </if>
+ <if test="ew.batchNo != null and ew.batchNo !=''">
+ and combined.batch_no like concat('%',#{ew.batchNo},'%')
+ </if>
</where>
group by
product_model_id,
model,
unit,
product_name,
- product_id
+ product_id,
+ warehouse
+ order by create_time desc
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -231,33 +246,60 @@
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 - 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,
+ MAX(warn_num) as warn_num,
+ MAX(version) as version,
model,
+ MAX(remark) as remark,
unit,
product_name,
- batch_no,
- MAX(warn_num) as warn_num,
- MAX(remark) as remark,
- MAX(update_time) as update_time
+ product_id,
+ MAX(warehouse) as warehouse,
+ 'combined' as stockType
from (
select
+ si.batch_no,
+ si.id as qualifiedId,
+ null as unQualifiedId,
si.qualitity as qualifiedQuantity,
0 as unQualifiedQuantity,
+ COALESCE(si.locked_quantity, 0) as locked_quantity,
COALESCE(si.locked_quantity, 0) as qualifiedLockedQuantity,
0 as unQualifiedLockedQuantity,
si.product_model_id,
si.create_time,
si.update_time,
- si.batch_no,
COALESCE(si.warn_num, 0) as warn_num,
- si.remark,
+ si.version,
+ (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
pm.model,
+ si.remark,
pm.unit,
p.product_name,
- p.id as product_id
+ p.id as product_id,
+ si.warehouse,
+ (
+ 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
@@ -265,20 +307,35 @@
union all
select
+ su.batch_no,
+ null as qualifiedId,
+ su.id as unQualifiedId,
0 as qualifiedQuantity,
su.qualitity as unQualifiedQuantity,
+ COALESCE(su.locked_quantity, 0) as locked_quantity,
0 as qualifiedLockedQuantity,
COALESCE(su.locked_quantity, 0) as unQualifiedLockedQuantity,
su.product_model_id,
su.create_time,
su.update_time,
0 as warn_num,
- su.batch_no,
- su.remark,
+ su.version,
+ (su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
pm.model,
+ su.remark,
pm.unit,
p.product_name,
- p.id as product_id
+ p.id as product_id,
+ su.warehouse,
+ 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
@@ -296,7 +353,7 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by product_model_id, model, unit, product_name,batch_no
+ group by batch_no, product_model_id, model, unit, product_name, product_id, warehouse
</select>
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
select sir.*,si.qualitity as current_stock,
@@ -322,6 +379,7 @@
and sir.create_time <= #{ew.endMonth}
</if>
</where>
+ order by sir.id desc
</select>
<select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -467,8 +525,9 @@
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 si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
+ <select id="getByModelId" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+ select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity,
+ p.product_name, pm.model, pm.unit
from stock_inventory si
left join (
select spd.stock_inventory_id, sum(spd.quantity) as qualitity
@@ -485,6 +544,8 @@
)
group by spd.stock_inventory_id
) as sd on sd.stock_inventory_id = si.id
+ left join product_model pm on si.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
where si.product_model_id = #{productModelId}
and si.qualitity > IFNULL(sd.qualitity, 0)
</select>
@@ -512,6 +573,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
@@ -543,6 +605,7 @@
COALESCE(si.warn_num, 0) as warn_num,
si.version,
si.remark,
+ si.warehouse,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -585,6 +648,7 @@
0 as warn_num,
su.version,
su.remark,
+ su.warehouse,
0 as qualifiedPendingOut,
@@ -618,7 +682,8 @@
model,
unit,
product_name,
- product_id
+ product_id,
+ warehouse
order by
batch_no
</select>
--
Gitblit v1.9.3