From ec0b393b9bc5e8513a7f6756c1837fd9460505a3 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Thu, 1 Sep 2022 23:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB=E5=88=A0=E9=99=A4=E6=97=B6=E5=90=8C=E6=97=B6=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=A1=8C=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ktg/mes/dv/controller/DvCheckPlanController.java   | 5 +++++
 .../java/com/ktg/mes/dv/mapper/DvCheckSubjectMapper.java   | 7 +++++++
 .../com/ktg/mes/dv/service/IDvCheckSubjectService.java     | 7 +++++++
 .../ktg/mes/dv/service/impl/DvCheckSubjectServiceImpl.java | 5 +++++
 .../src/main/resources/mapper/dv/DvCheckSubjectMapper.xml  | 5 +++++
 5 files changed, 29 insertions(+)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
index 4f5c2a2..84743ae 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
@@ -11,6 +11,7 @@ import com.ktg.mes.dv.service.IDvCheckMachineryService;
 import com.ktg.mes.dv.service.IDvCheckSubjectService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -124,6 +125,7 @@ public class DvCheckPlanController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('mes:dv:checkplan:remove')")
     @Log(title = "设备点检计划头", businessType = BusinessType.DELETE)
+    @Transactional
 	@DeleteMapping("/{planIds}")
     public AjaxResult remove(@PathVariable Long[] planIds)
     {
@@ -133,6 +135,9 @@ public class DvCheckPlanController extends BaseController
             if(!UserConstants.ORDER_STATUS_PREPARE.equals(plan.getStatus())){
                 return AjaxResult.error("只能删除草稿状态单据！");
             }
+
+            dvCheckMachineryService.deleteByPlanId(planId);
+            dvCheckSubjectService.deleteByPlanId(planId);
         }
 
 
diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckSubjectMapper.java b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckSubjectMapper.java
index f9e0225..d8df716 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckSubjectMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckSubjectMapper.java
@@ -61,4 +61,11 @@ public interface DvCheckSubjectMapper
      * @return 结果
      */
     public int deleteDvCheckSubjectByRecordIds(Long[] recordIds);
+
+    /**
+     * 根据计划ID删除对应的计划项目
+     * @param planId
+     * @return
+     */
+    public int deleteByPlanId(Long planId);
 }
diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckSubjectService.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckSubjectService.java
index 1216de1..dae4fa5 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckSubjectService.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckSubjectService.java
@@ -66,4 +66,11 @@ public interface IDvCheckSubjectService
      * @return 结果
      */
     public int deleteDvCheckSubjectByRecordId(Long recordId);
+
+    /**
+     * 根据计划ID删除对应的计划项目
+     * @param planId
+     * @return
+     */
+    public int deleteByPlanId(Long planId);
 }
diff --git a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckSubjectServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckSubjectServiceImpl.java
index 31f728a..7729ffe 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckSubjectServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckSubjectServiceImpl.java
@@ -108,4 +108,9 @@ public class DvCheckSubjectServiceImpl implements IDvCheckSubjectService
     {
         return dvCheckSubjectMapper.deleteDvCheckSubjectByRecordId(recordId);
     }
+
+    @Override
+    public int deleteByPlanId(Long planId) {
+        return dvCheckSubjectMapper.deleteByPlanId(planId);
+    }
 }
diff --git a/ktg-mes/src/main/resources/mapper/dv/DvCheckSubjectMapper.xml b/ktg-mes/src/main/resources/mapper/dv/DvCheckSubjectMapper.xml
index c8aab8b..e7c97ff 100644
--- a/ktg-mes/src/main/resources/mapper/dv/DvCheckSubjectMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/dv/DvCheckSubjectMapper.xml
@@ -124,4 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{recordId}
         </foreach>
     </delete>
+
+    <delete id="deleteByPlanId" parameterType="Long">
+        delete from dv_check_subject where plan_id = #{planId}
+    </delete>
+
 </mapper>
\ No newline at end of file