From a0b4bacb7dcc24ffd98a610aca50716c0bffccb8 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Fri, 21 Aug 2026 14:32:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=87=E9=9B=86=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java     |  9 +++++++++
 .../com/gaotao/modules/pms/mapper/QcMapper.java  |  3 +++
 .../modules/pms/service/Impl/QcServiceImpl.java  | 11 +++++++++++
 .../gaotao/modules/pms/service/QcService.java    |  3 +++
 .../src/main/resources/mapper/pms/QcMapper.xml   | 16 ++++++++++++++++
 5 files changed, 42 insertions(+)

diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java
index 90102a9..1a50341 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/controller/QcController.java
@@ -1493,6 +1493,15 @@ public class QcController {
         return R.ok().put("rows", list).put("firstTime", firstTime);
     }
 
+    /**
+     * 检验单最近设备解析时间
+     */
+    @PostMapping("/getLatestEquipmentParseTime")
+    public R getLatestEquipmentParseTime(@RequestBody QcFAIRecordData data) {
+        String parseTimeText = qcService.getLatestEquipmentParseTime(data);
+        return R.ok().put("parseTimeText", parseTimeText);
+    }
+
     /**
      * 根据实测值评估检验项目预警
      */
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
index 1d0fd98..de5489e 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
@@ -765,4 +765,7 @@ public interface QcMapper {
                                                @Param("equipmentNo") String equipmentNo,
                                                @Param("batchNo") Integer batchNo);
 
+    /** 查询检验单最近设备解析时间文案 */
+    String getLatestEquipmentParseTime(QcFAIRecordData data);
+
 }
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
index 4d3ddde..8d2c48b 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
@@ -3089,6 +3089,17 @@ public class QcServiceImpl implements QcService {
         return ok;
     }
 
+    @Override
+    public String getLatestEquipmentParseTime(QcFAIRecordData data) {
+        if (data == null || StringUtils.isBlank(data.getSite())
+                || StringUtils.isBlank(data.getBuNo())
+                || StringUtils.isBlank(data.getInspectionNo())) {
+            return "";
+        }
+        String text = qcMapper.getLatestEquipmentParseTime(data);
+        return text == null ? "" : text;
+    }
+
     @Override
     public List<EquipmentDataAcquisitionData> listDataAcquisitionEquipment(QcFAIRecordData data) {
         List<EquipmentDataAcquisitionData> acquisitionRows = qcMapper.getInspectionNo(data);
diff --git a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java
index b983cf6..c38b84d 100644
--- a/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java
+++ b/cclqms-java/src/main/java/com/gaotao/modules/pms/service/QcService.java
@@ -187,6 +187,9 @@ public interface QcService {
     /** 查询检验单开始检验时选择的设备（去重），供数据采集弹框使用 */
     List<EquipmentDataAcquisitionData> listDataAcquisitionEquipment(QcFAIRecordData data);
 
+    /** 查询检验单最近设备解析时间文案 */
+    String getLatestEquipmentParseTime(QcFAIRecordData data);
+
     List<EquipmentFolderLocationData> getEquipmentNoList(EquipmentFolderLocationData data);
 
     List<EquipmentFolderLocationData> getEquipmentClassificationList(EquipmentFolderLocationData data);
diff --git a/cclqms-java/src/main/resources/mapper/pms/QcMapper.xml b/cclqms-java/src/main/resources/mapper/pms/QcMapper.xml
index 18926db..a6de7e9 100644
--- a/cclqms-java/src/main/resources/mapper/pms/QcMapper.xml
+++ b/cclqms-java/src/main/resources/mapper/pms/QcMapper.xml
@@ -5756,6 +5756,22 @@
           AND inspection_no = #{inspectionNo}
           AND equipment_no = #{equipmentNo}
     </update>
+
+    <!-- 检验单弹框：最近设备解析时间 -->
+    <select id="getLatestEquipmentParseTime" parameterType="com.gaotao.modules.pms.data.QcFAIRecordData" resultType="java.lang.String">
+        SELECT TOP 1
+            N'最近解析时间：' + a.equipment_no + N' - ' + ISNULL(b.equipment_desc, N'') + N' - '
+                + CONVERT(varchar(19), c.create_date, 120)
+        FROM Equipment_data_acquisition A
+        INNER JOIN Equipment_folder_location B
+            ON A.site = B.site AND A.bu_no = B.bu_no AND A.equipment_no = B.equipment_no
+        INNER JOIN Equipment_folder_sort C
+            ON B.site = C.site AND B.bu_no = C.bu_no AND B.file_no = C.file_no
+        WHERE A.site = #{site}
+          AND A.bu_no = #{buNo}
+          AND A.inspection_no = #{inspectionNo}
+        ORDER BY C.create_date DESC
+    </select>
 </mapper>