From cc83425d5ff1342cca4c51cd6517ea95583e3894 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 29 May 2026 09:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=97=A7=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/EamController.java |  6 +++++
 .../sys/modules/pms/mapper/EamMapper.java     |  2 ++
 .../sys/modules/pms/service/EamService.java   |  2 ++
 .../pms/service/Impl/EamServiceImpl.java      |  5 ++++
 src/main/resources/mapper/pms/EamMapper.xml   | 25 +++++++++++++++++++
 5 files changed, 40 insertions(+)

diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
index 3cd6a0d9..13ad3318 100644
--- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
+++ b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
@@ -2417,6 +2417,12 @@ public class EamController {
         return R.ok();
     }
 
+    @PostMapping("/getCoreSerialLatestAction")
+    public R getCoreSerialLatestAction(@RequestBody EamWorkOrderCoreComponentsData inData){
+        String action = eamService.getCoreSerialLatestAction(inData);
+        return R.ok().put("data", action == null ? "" : action);
+    }
+
     @PostMapping("/deleteCoreComponents")
     public R deleteCoreComponents(@RequestBody EamWorkOrderCoreComponentsData inData){
         eamService.deleteCoreComponents(inData);
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 6ed946e8..0c856cad 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
@@ -468,6 +468,8 @@ public interface EamMapper {
 
     List<EamWorkOrderCoreComponentsData> getCoreComponentByNo(EamWorkOrderCoreComponentsData inData);
 
+    String getCoreSerialLatestAction(EamWorkOrderCoreComponentsData inData);
+
     void updateCoreComponent(EamWorkOrderCoreComponentsData inData);
 
     List<BusinessRoleVo> getRoleByUserName(BusinessRoleVo data);
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 267d12c4..87299421 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
@@ -1144,6 +1144,8 @@ public interface EamService {
 
     void saveCoreComponent(EamWorkOrderCoreComponentsData inData);
 
+    String getCoreSerialLatestAction(EamWorkOrderCoreComponentsData inData);
+
     PageUtils queryEamDocumentType(Page<EamDocumentTypeData> pages, QuerySavedVo querySavedVo);
 
     PageUtils queryBuDocument(Page<EamBuDocumentListDefinitionVo> pages, QuerySavedVo querySavedVo);
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index 498aa761..d9f4d30b 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -3501,6 +3501,11 @@ public class EamServiceImpl implements EamService {
         }
     }
 
+    @Override
+    public String getCoreSerialLatestAction(EamWorkOrderCoreComponentsData inData) {
+        return eamMapper.getCoreSerialLatestAction(inData);
+    }
+
     /**
      * 维修出库
      * @param partSpareData
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 64ef34e2..e17131f0 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -3997,6 +3997,31 @@
         where site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo} and partNo = #{partNo}
     </select>
 
+    <select id="getCoreSerialLatestAction" resultType="java.lang.String" parameterType="com.xujie.sys.modules.pms.entity.EamWorkOrderCoreComponentsData">
+        SELECT TOP 1 tempData.action
+        FROM (
+            SELECT
+                created_date,
+                '下机' AS action
+            FROM eam_workOrder_coreComponents
+            WHERE site = #{site} and bu_no = #{buNo} and partNo = #{partNo} and oldSerialNo = #{serialNo}
+            <if test="orderNo != null and orderNo != ''">
+                and OrderNo != #{orderNo}
+            </if>
+            UNION ALL
+            SELECT
+                created_date,
+                '上机' AS action
+            FROM eam_workOrder_coreComponents
+            WHERE site = #{site} and bu_no = #{buNo} and partNo = #{partNo} and newSerialNo = #{serialNo}
+            <if test="orderNo != null and orderNo != ''">
+                and OrderNo != #{orderNo}
+            </if>
+        ) tempData
+        ORDER BY tempData.created_date DESC,
+                 CASE WHEN tempData.action = '上机' THEN 0 ELSE 1 END
+    </select>
+
     <select id="getRoleByUserName" resultType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo" parameterType="com.xujie.sys.modules.factory.entity.vo.BusinessRoleVo">
         SELECT
             a.site,