From 4f455dd91420a8aca8c6e69d23e85126a63b9323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 25 Nov 2025 13:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=9F=E5=BC=83=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/controller/EamController.java    |  9 +++++++++
 .../xujie/sys/modules/pms/data/EamWorkOrderData.java | 12 ++++++++++++
 .../com/xujie/sys/modules/pms/mapper/EamMapper.java  |  2 ++
 .../xujie/sys/modules/pms/service/EamService.java    |  2 ++
 .../sys/modules/pms/service/Impl/EamServiceImpl.java |  5 +++++
 src/main/resources/mapper/pms/EamMapper.xml          |  7 ++++++-
 6 files changed, 36 insertions(+), 1 deletion(-)

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 94314bb6..305344aa 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
@@ -2471,4 +2471,13 @@ public class EamController {
         return R.ok().put("data", itemNo).put("length", itemNo.length());
     }
 
+    /**
+     * 废弃工单
+     **/
+    @PostMapping("/abandonedEamWorkOrder")
+    public R abandonedEamWorkOrder(@RequestBody EamWorkOrderData data){
+        eamService.abandonedEamWorkOrder(data);
+        return R.ok();
+    }
+
 }
diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java
index ef637938..0531ed08 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java
@@ -128,6 +128,18 @@ public class EamWorkOrderData extends QueryPage {
     private String checkNotes;
 
     private String checkType;
+    /**
+     * 废弃原因
+     */
+    private String abandonedReason;
+
+    public String getAbandonedReason() {
+        return abandonedReason;
+    }
+
+    public void setAbandonedReason(String abandonedReason) {
+        this.abandonedReason = abandonedReason;
+    }
 
     public String getCheckType() {
         return checkType;
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 eb9070fb..183780fa 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
@@ -514,4 +514,6 @@ public interface EamMapper {
     String queryItemNo(EamPropertiesItemData data);
 
     List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
+
+    void abandonedEamWorkOrder(EamWorkOrderData 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 6c1294f3..eb34c9e2 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
@@ -1212,4 +1212,6 @@ public interface EamService {
     void returnWorkOrder(EamWorkOrderInData data);
 
     List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
+
+    void abandonedEamWorkOrder(EamWorkOrderData data);
 }
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 aae88fbc..12e9e042 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
@@ -4012,6 +4012,11 @@ public class EamServiceImpl implements EamService {
         return eamMapper.getAllCoreComponents(data);
     }
 
+    @Override
+    public void abandonedEamWorkOrder(EamWorkOrderData data) {
+        eamMapper.abandonedEamWorkOrder(data);
+    }
+
     /**
      * 员工考勤vs报工工时
      */
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index d68fc0dc..3ca49eb1 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -1049,7 +1049,7 @@
                 a.reach_date,
                 a.reach_operator,
                 a.reach_operator_name,
-                b.CreatedDate,
+                case when a.status = '已废弃' then null else b.CreatedDate end as CreatedDate,
                 a.handling_method,
                 dbo.eam_Get_eamResourceDesc(a.Site, a.ObjectID) as resourceDesc,
                 CASE WHEN (DATEDIFF(SECOND, a.CreateDate, a.reach_date) <![CDATA[<]]> 60)  THEN DATEDIFF(SECOND, a.CreateDate, a.reach_date) / 60.0
@@ -3972,6 +3972,11 @@
             is_return = 'Y'
         WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
     </update>
+    <update id="abandonedEamWorkOrder">
+        update eam_workOrder
+        set Status = '已废弃' , abandoned_reason = #{abandonedReason} , update_by = #{updateBy} , update_date = getDate()
+        where Site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo}
+    </update>
     <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
         select
             top 1