From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml b/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
index 315d743..97e1063 100644
--- a/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeStandardSubstanceRecordMapper.xml
@@ -25,13 +25,13 @@
ss.name,
ss.model,
ss.factory_num,
- ss.quantity,
+ COALESCE(ssr.original_quantity, ss.quantity) AS quantity,
+ ss.unit,
+ COALESCE(ssr.borrow_quantity, ss.quantity) AS borrowQuantity,
+ COALESCE(ssr.remaining_quantity, 0) AS remainingQuantity,
ssr.borrow_user,
ssr.borrow_date,
- ssr.return_date,
ssr.integrity,
- ssr.return_integrity,
- ssr.returned_person,
ss.remark
FROM cnas_fe_standard_substance_record ssr
LEFT JOIN cnas_fe_standard_substance ss on ss.id = ssr.substance_id
--
Gitblit v1.9.3