From bfe2eb20746ba63fe7fc86b1b2ad5dc3095cc9b3 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 11 六月 2026 19:30:35 +0800
Subject: [PATCH] fix: 客户档案改成一个,不区分公海私海

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..8d20ee3 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -113,7 +113,7 @@
         product_model_id,
         MAX(create_time) as create_time,
         MAX(update_time) as update_time,
-        MAX(warn_num) as warn_num,
+        SUM(warn_num) as warn_num,
         MAX(version) as version,
         model,
         MAX(remark) as remark,
@@ -351,7 +351,7 @@
         su.nick_name as create_by
         from
         stock_in_record sir
-        left join stock_inventory si on sir.product_model_id = si.product_model_id
+        left join stock_inventory si on sir.batch_no = si.batch_no
         left join product_model pm on sir.product_model_id = pm.id
         left join product p on pm.product_id = p.id
         left join sys_user su on sir.create_user = su.user_id
@@ -506,7 +506,7 @@
         where si.product_model_id in
         <foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
             #{productModelId}
-        </foreach>c
+        </foreach>
           and si.batch_no is not null
           and si.batch_no != ''
           and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0

--
Gitblit v1.9.3