From 4fae0a3d70ce519502c8ef17f327daffbe9a44aa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 19 七月 2023 11:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/resources/mapper/SpecificationsMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/standard-server/src/main/resources/mapper/SpecificationsMapper.xml b/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
index bd4b25d..0942946 100644
--- a/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
+++ b/standard-server/src/main/resources/mapper/SpecificationsMapper.xml
@@ -11,4 +11,13 @@
AND s.`name` = #{specificationsName}
</if>
</select>
+
+ <select id="selectSNameSNName" resultType="Map">
+ select m.num,m.supplier,m.name m_name,m.location,m.batch,m.reel_number,concat(s.name,'/',sn.name) ss_name,s.voltage_level,s.cross_section,s.number_of_cores,s.instruct from material m,specifications s,serial_number sn
+ where m.specifications_id = s.id
+ and s.serial_id = sn.id
+ and m.id = #{materialId}
+ order by s.create_time desc
+ limit 1
+ </select>
</mapper>
--
Gitblit v1.9.3