From 82503fa28143cc8a57048dc30c7b0a2d5305e545 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, 26 Aug 2025 14:30:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TPM=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=20=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/pms/controller/EamController.java   | 8 ++++++++
 .../java/com/xujie/sys/modules/pms/mapper/EamMapper.java  | 2 ++
 .../com/xujie/sys/modules/pms/service/EamService.java     | 2 ++
 .../sys/modules/pms/service/Impl/EamServiceImpl.java      | 5 +++++
 src/main/resources/mapper/pms/EamMapper.xml               | 5 +++++
 5 files changed, 22 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 4293fadf..b27fa88e 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
@@ -2262,6 +2262,14 @@ public class EamController {
         eamService.confirmDefectOrder(inData);
         return R.ok();
     }
+    /**
+     * 维修确认-取消工单
+     */
+    @PostMapping("/cancelDefectOrder")
+    public R cancelDefectOrder(@RequestBody EamWorkOrderInData inData){
+        eamService.cancelDefectOrder(inData);
+        return R.ok();
+    }
 
     /**
      * 获取用户Role
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 56c3a1a7..350e899d 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
@@ -501,4 +501,6 @@ public interface EamMapper {
     void deleteCoreComponents(EamWorkOrderCoreComponentsData inData);
 
     List<EamAdminData> getConfirmButtonOperator();
+
+    void cancelDefectOrder(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 5a93f25c..1a9f9128 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
@@ -1194,4 +1194,6 @@ public interface EamService {
     void deleteCoreComponents(EamWorkOrderCoreComponentsData inData);
 
     List<EamAdminData> getConfirmButtonOperator();
+
+    void cancelDefectOrder(EamWorkOrderInData inData);
 }
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 c0468f4b..43f37daa 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
@@ -3967,6 +3967,11 @@ public class EamServiceImpl implements EamService {
         return list;
     }
 
+    @Override
+    public void cancelDefectOrder(EamWorkOrderInData inData) {
+        eamMapper.cancelDefectOrder(inData);
+    }
+
     /**
      * 员工考勤vs报工工时
      */
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index 22626269..2444e35c 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -3430,6 +3430,11 @@
         delete from eam_workOrder_coreComponents
         WHERE site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo} and partNo = #{partNo}
     </delete>
+    <update id="cancelDefectOrder">
+        update eam_workOrder
+        set Status = '已取消'
+        where site = #{site} AND bu_no = #{buNo} AND OrderNo = #{orderNo} and FunctionType = #{functionType}
+    </update>
 
     <update id="updateInventoryStock" parameterType="com.xujie.sys.modules.pms.data.InventoryStockData">
         update inventory_stock