From 66fa277fa38f0bec6917eefe0ff5b384ad6d02e5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 五月 2026 09:39:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 9612933..4e7adf6 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -226,6 +226,7 @@
model,
unit,
product_name,
+ batch_no,
MAX(warn_num) as warn_num,
MAX(remark) as remark,
MAX(update_time) as update_time
@@ -238,6 +239,7 @@
si.product_model_id,
si.create_time,
si.update_time,
+ si.batch_no,
COALESCE(si.warn_num, 0) as warn_num,
si.remark,
pm.model,
@@ -259,6 +261,7 @@
su.create_time,
su.update_time,
0 as warn_num,
+ su.batch_no,
su.remark,
pm.model,
pm.unit,
@@ -281,7 +284,7 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by product_model_id, model, unit, product_name
+ group by product_model_id, model, unit, product_name,batch_no
</select>
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
select sir.*,si.qualitity as current_stock,
--
Gitblit v1.9.3