From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 3dd2089..0351231 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)
@@ -222,7 +229,7 @@
unit,
product_name,
product_id
- order by combined.id desc
+ order by create_time desc
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -259,6 +266,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
'combined' as stockType
from (
select
@@ -281,6 +289,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
@@ -316,6 +325,7 @@
pm.unit,
p.product_name,
p.id as product_id,
+ su.warehouse,
0 as qualifiedPendingOut,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -342,7 +352,7 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by batch_no, product_model_id, model, unit, product_name, product_id
+ 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,
@@ -562,6 +572,7 @@
unit,
product_name,
product_id,
+ MAX(warehouse) as warehouse,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
@@ -593,6 +604,7 @@
COALESCE(si.warn_num, 0) as warn_num,
si.version,
si.remark,
+ si.warehouse,
(
select IFNULL(SUM(sor.stock_out_num), 0)
@@ -635,6 +647,7 @@
0 as warn_num,
su.version,
su.remark,
+ su.warehouse,
0 as qualifiedPendingOut,
@@ -668,7 +681,8 @@
model,
unit,
product_name,
- product_id
+ product_id,
+ warehouse
order by
batch_no
</select>
--
Gitblit v1.9.3