From c4409fac0044cc1efeda07b6a7709c3fde1aa9fe Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 10:46:32 +0800
Subject: [PATCH] fix(仓储物流): ①出库新增临时跳过租户插件修复 SetOperationList 解析异常 ②库存预警查询补 warningLevel/warningStatus/warningTime/expectedShortageTime/suggestionType/suggestionContent 字段 ③currentStock 别名

---
 src/main/resources/mapper/CustomStorageWarningRecordMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/CustomStorageWarningRecordMapper.xml b/src/main/resources/mapper/CustomStorageWarningRecordMapper.xml
index 6bfcb45..40d93b3 100644
--- a/src/main/resources/mapper/CustomStorageWarningRecordMapper.xml
+++ b/src/main/resources/mapper/CustomStorageWarningRecordMapper.xml
@@ -22,7 +22,13 @@
         sum(t1.tax_inclusive_total_price) as totalPrice,
         sum(t1.inbound_num) as inboundNum,
         sum(t1.inbound_num) as inboundNum0,
-        SUM(t1.inbound_num) - COALESCE(SUM(t2.inbound_num), 0) AS availableStock
+        SUM(t1.inbound_num) - COALESCE(SUM(t2.inbound_num), 0) AS currentStock,
+        ANY_VALUE(cswr.warning_level)        AS warningLevel,
+        ANY_VALUE(cswr.warning_status)       AS warningStatus,
+        ANY_VALUE(cswr.warning_time)         AS warningTime,
+        ANY_VALUE(cswr.expectedShortageTime) AS expectedShortageTime,
+        ANY_VALUE(cswr.suggestion_type)      AS suggestionType,
+        ANY_VALUE(cswr.suggestion_content)   AS suggestionContent
         from custom_storage t1
         left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id and t2.type = 3
         inner join custom_storage_warning_record cswr on t1.id = cswr.custom_storage_id

--
Gitblit v1.9.3