From 350850442fcfaadf393e8eed7cd9c9746da31546 Mon Sep 17 00:00:00 2001
From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com>
Date: Tue, 3 Feb 2026 17:19:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(pms):=20=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=B1=9E=E6=80=A7=E9=A1=B9=E7=9B=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在EamMapper中新增getEamPropertiesItemByItemNo方法接口
- 实现SQL映射查询设备属性项目的详细信息
- 包含业务描述、操作员信息及检验方法等字段
- 关联设备属性项目表与质量控制方法表进行数据查询
- 在EamService中新增对应的服务层方法定义
---
 .../sys/modules/pms/mapper/EamMapper.java     |  2 +
 .../sys/modules/pms/service/EamService.java   |  2 +
 src/main/resources/mapper/pms/EamMapper.xml   | 48 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
index 56082036..b7b4646c 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
@@ -530,5 +530,7 @@ public interface EamMapper {
 
     void saveSoundBoxEmailLog(com.xujie.sys.modules.pms.entity.SoundBoxEmailLog log);
 
+    QcItemData getEamPropertiesItemByItemNo(@Param("data") QcItemData data);
+
     List<EamMaintainOrderExportData> eamWorkOrderSearchList(@Param("query") EamWorkOrderInData inData);
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
index 0060e1af..d0cfb028 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java
@@ -1220,5 +1220,7 @@ public interface EamService {
 
     void sendSoundBox();
 
+    QcItemData getEamPropertiesItemByItemNo(QcItemData data);
+
     List<EamMaintainOrderExportData> eamWorkOrderSearchList(EamWorkOrderInData data);
 }
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index b93d49ee..149327ab 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -4148,6 +4148,53 @@
         select site, component_part_no as componentPartNo, notify_no as notifyNo
         from sound_box_email_log
     </select>
+    <select id="getEamPropertiesItemByItemNo" resultType="com.xujie.sys.modules.pms.data.QcItemData">
+        SELECT
+            epi.site,
+            epi.bu_no,
+            dbo.get_bu_desc(epi.site, epi.bu_no) as buDesc,
+            epi.ItemNo,
+            epi.ItemDesc,
+            epi.DefaultValue,
+            epi.ValueType,
+            epi.ValueType_DB as valueTypeDb,
+            epi.ValueChooseFlag,
+            epi.CreatedDate,
+            epi.CreatedBy,
+            dbo.getOperatorDesc(epi.site, epi.CreatedBy) as createdByDesc,
+            epi.MaxValue,
+            epi.MinValue,
+            epi.ItemRemark,
+            epi.ItemType,
+            epi.update_date,
+            epi.update_by,
+            dbo.getOperatorDesc(epi.site, epi.update_by) as updateByDesc,
+            qm.method_no,
+            qm.method_name,
+            qm.method_remark,
+            epi.inspection_type_no,
+            epi.item_sampling_quantity,
+            epi.sampling_programme_no,
+            epi.sampling_level_no,
+            epi.default_sampling_proportion,
+            epi.collection_flag,
+            epi.collection_source,
+            epi.collection_method,
+            CASE WHEN epi.collection_method = 'plc' THEN 'PLC'
+                 WHEN epi.collection_method = 'file' THEN '文件'
+                 WHEN epi.collection_method = 'image' THEN '图片'
+                 else '' end as collectionMethodDesc,
+            epi.collection_condition,
+            epi.collection_data_content
+        FROM eam_properties_item as epi
+                 LEFT JOIN qc_method_item as qmi on epi.ItemNo = qmi.ItemNo and epi.site = qmi.site and epi.bu_no = qmi.bu_no
+                 LEFT JOIN qc_method as qm on qmi.method_no = qm.method_no and qmi.site = qm.site and qmi.bu_no = qm.bu_no
+        <where>
+            epi.site = #{data.site} and epi.ItemNo = #{data.itemNo} and epi.bu_no = #{data.buNo}
+        </where>
+
+    </select>
+
     <select id="eamWorkOrderSearchList" resultType="com.xujie.sys.modules.pms.data.EamMaintainOrderExportData">
         SELECT
         a.Site,
@@ -4294,7 +4341,6 @@
         </where>
         ORDER BY a.CreateDate
     </select>
-
     <insert id="saveSoundBoxEmailLog" parameterType="com.xujie.sys.modules.pms.entity.SoundBoxEmailLog">
         insert into sound_box_email_log (site, component_part_no, notify_no, request_data, response_data, email, created_at, user_id, username)
         values (#{site}, #{componentPartNo}, #{notifyNo}, #{requestData}, #{responseData}, #{email}, #{createdAt}, #{userId}, #{username})