2024-5-27 质量-来料/过程/库存-加逻辑删除

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskIncomeController.java

@@ -282,13 +282,23 @@ public class QcCheckTaskIncomeController extends BaseController {
     }
 
     /**
-     * 删除来料检验
+     * 批量删除来料检验
+     */
+//    @RequiresPermissions("quality:qcIncome:remove")
+//    @Log(title = "来料检验", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{recordIds}")
+//    public AjaxResult remove(@PathVariable String[] recordIds) {
+//        return toAjax(qcCheckTaskIncomeService.deleteQcCheckTaskIncomeByRecordIds(recordIds));
+//    }
+
+    /**
+     * 单个删除来料检验
      */
     @RequiresPermissions("quality:qcIncome:remove")
     @Log(title = "来料检验", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{recordIds}")
+    @DeleteMapping("/{recordId}")
-    public AjaxResult remove(@PathVariable String[] recordIds) {
+    public AjaxResult remove(@PathVariable String recordId) {
-        return toAjax(qcCheckTaskIncomeService.deleteQcCheckTaskIncomeByRecordIds(recordIds));
+        return toAjax(qcCheckTaskIncomeService.deleteQcCheckTaskIncomeByRecordId(recordId));
     }
 
     /**

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskInventoryController.java

@@ -105,12 +105,22 @@ public class QcCheckTaskInventoryController extends BaseController {
     }
 
     /**
-     * 删除库存检验任务
+     * 批量删除库存检验任务
+     */
+//    @RequiresPermissions("quality:qcInventory:remove")
+////    @Log(title = "库存检验任务", businessType = BusinessType.DELETE)
+////    @DeleteMapping("/{recordIds}")
+////    public AjaxResult remove(@PathVariable String[] recordIds) {
+////        return toAjax(qcCheckTaskInventoryService.deleteQcCheckTaskInventoryByRecordIds(recordIds));
+////    }
+
+    /**
+     * 单个删除库存检验任务
      */
     @RequiresPermissions("quality:qcInventory:remove")
     @Log(title = "库存检验任务", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{recordIds}")
+    @DeleteMapping("/{recordId}")
-    public AjaxResult remove(@PathVariable String[] recordIds) {
+    public AjaxResult remove(@PathVariable String recordId) {
-        return toAjax(qcCheckTaskInventoryService.deleteQcCheckTaskInventoryByRecordIds(recordIds));
+        return toAjax(qcCheckTaskInventoryService.deleteQcCheckTaskInventoryByRecordId(recordId));
     }
 }

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckTaskProduceController.java

@@ -131,13 +131,23 @@ public class QcCheckTaskProduceController extends BaseController {
     }
 
     /**
-     * 删除生产过程检验任务
+     * 批量删除生产过程检验任务
+     */
+//    @RequiresPermissions("quality:qcProduce:remove")
+//    @Log(title = "生产过程检验任务", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{recordIds}")
+//    public AjaxResult remove(@PathVariable String[] recordIds) {
+//        return toAjax(qcCheckTaskProduceService.deleteQcCheckTaskProduceByRecordIds(recordIds));
+//    }
+
+    /**
+     * 单个删除生产过程检验任务
      */
     @RequiresPermissions("quality:qcProduce:remove")
     @Log(title = "生产过程检验任务", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{recordIds}")
+    @DeleteMapping("/{recordId}")
-    public AjaxResult remove(@PathVariable String[] recordIds) {
+    public AjaxResult remove(@PathVariable String recordId) {
-        return toAjax(qcCheckTaskProduceService.deleteQcCheckTaskProduceByRecordIds(recordIds));
+        return toAjax(qcCheckTaskProduceService.deleteQcCheckTaskProduceByRecordId(recordId));
     }
 
     /**

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskDetailMapper.java

@@ -66,4 +66,7 @@ public interface QcCheckTaskDetailMapper {
     public int addBatch(@Param("list") List<QcCheckTaskDetail> items);
 
     List<String> getProjectStatus(String belongTo);
+
+    //逻辑删除详情表
+    void deleteQcCheckTaskDetailByBelongTo(String recordId);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java

@@ -89,9 +89,13 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 
 	@Autowired
 	private IQcCheckUnqualifiedService qcCheckUnqualifiedService;
+
 	@Autowired
 	private QcProCheckService qcProCheckService;
 
+	@Autowired
+	private QcCheckTaskUserMapper qcCheckTaskUserMapper;
+
 	/**
 	 * 查询来料检验
 	 *
@@ -379,7 +383,13 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	@Override
 	@DS("#header.poolName")
 	public int deleteQcCheckTaskIncomeByRecordId(String recordId) {
-		return qcCheckTaskIncomeMapper.deleteQcCheckTaskIncomeByRecordId(recordId);
+		//1.逻辑删除qc_check_task表
+		qcCheckTaskIncomeMapper.deleteQcCheckTaskIncomeByRecordId(recordId);
+		//2.逻辑删除qc_check_task_detail表
+		qcCheckTaskDetailMapper.deleteQcCheckTaskDetailByBelongTo(recordId);
+		//3.逻辑删除qc_check_task_user表
+		qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTo(recordId);
+		return 1;
 	}
 
 	@Override

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskInventoryServiceImpl.java

@@ -59,6 +59,9 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
     @Autowired
     private QcSampleRuleMapper qcSampleRuleMapper;
 
+    @Autowired
+    private QcCheckTaskUserMapper qcCheckTaskUserMapper;
+
     /**
      * 查询库存检验任务
      *
@@ -280,6 +283,12 @@ public class QcCheckTaskInventoryServiceImpl implements IQcCheckTaskInventorySer
     @Override
     @DS("#header.poolName")
     public int deleteQcCheckTaskInventoryByRecordId(String recordId) {
-        return qcCheckTaskInventoryMapper.deleteQcCheckTaskInventoryByRecordId(recordId);
+        //1.逻辑删除qc_check_task表
+        qcCheckTaskInventoryMapper.deleteQcCheckTaskInventoryByRecordId(recordId);
+        //2.逻辑删除qc_check_task_detail表
+        qcCheckTaskDetailMapper.deleteQcCheckTaskDetailByBelongTo(recordId);
+        //3.逻辑删除qc_check_task_user表
+        qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTo(recordId);
+        return 1;
     }
 }

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskProduceServiceImpl.java

@@ -85,6 +85,9 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 	@Autowired
 	private QcSampleRuleMapper qcSampleRuleMapper;
 
+	@Autowired
+	private QcCheckTaskUserMapper qcCheckTaskUserMapper;
+
     /**
      * 查询生产过程检验任务
      *
@@ -336,7 +339,13 @@ public class QcCheckTaskProduceServiceImpl implements IQcCheckTaskProduceService
 	@Override
 	@DS("#header.poolName")
 	public int deleteQcCheckTaskProduceByRecordId(String recordId) {
-		return qcCheckTaskProduceMapper.deleteQcCheckTaskProduceByRecordId(recordId);
+		//1.逻辑删除qc_check_task表
+		qcCheckTaskProduceMapper.deleteQcCheckTaskProduceByRecordId(recordId);
+		//2.逻辑删除qc_check_task_detail表
+		qcCheckTaskDetailMapper.deleteQcCheckTaskDetailByBelongTo(recordId);
+		//3.逻辑删除qc_check_task_user表
+		qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTo(recordId);
+		return 1;
 	}
 
 	@Override

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskDetailMapper.xml

@@ -177,6 +177,12 @@
 		delete from qc_check_task_detail where record_id = #{recordId}
 	</delete>
 
+    <update id="deleteQcCheckTaskDetailByBelongTo" parameterType="String">
+		update qc_check_task_detail
+		set del_flag = '1'
+		where belong_to = #{recordId}
+	</update>
+
     <delete id="deleteQcCheckTaskDetailByRecordIds" parameterType="String">
         delete from qc_check_task_detail where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskIncomeMapper.xml

@@ -327,9 +327,11 @@
         </foreach>
     </update>
 
-    <delete id="deleteQcCheckTaskIncomeByRecordId" parameterType="String">
+    <update id="deleteQcCheckTaskIncomeByRecordId" parameterType="String">
-		delete from qc_check_task where record_id = #{recordId}
+		update qc_check_task
-	</delete>
+		set del_flag = '1'
+		where record_id = #{recordId}
+	</update>
 
     <delete id="deleteQcCheckTaskIncomeByRecordIds" parameterType="String">
         delete from qc_check_task where record_id in

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskInventoryMapper.xml

@@ -221,9 +221,11 @@
         where record_id = #{recordId}
     </update>
 
-    <delete id="deleteQcCheckTaskInventoryByRecordId" parameterType="String">
+    <update id="deleteQcCheckTaskInventoryByRecordId" parameterType="String">
-		delete from qc_check_task where record_id = #{recordId}
+		update qc_check_task
-	</delete>
+		set del_flag = '1'
+		where record_id = #{recordId}
+	</update>
 
     <delete id="deleteQcCheckTaskInventoryByRecordIds" parameterType="String">
         delete from qc_check_task where record_id in

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml

@@ -321,9 +321,11 @@
         where record_id = #{recordId}
     </update>
 
-    <delete id="deleteQcCheckTaskProduceByRecordId" parameterType="String">
+    <update id="deleteQcCheckTaskProduceByRecordId" parameterType="String">
-		delete from qc_check_task where record_id = #{recordId}
+		update qc_check_task
-	</delete>
+		set del_flag = '1'
+		where record_id = #{recordId}
+	</update>
 
     <delete id="deleteQcCheckTaskProduceByRecordIds" parameterType="String">
         delete from qc_check_task where record_id in

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskUserMapper.xml

@@ -116,9 +116,11 @@
         </foreach>
     </delete>
 
-    <delete id="deleteQcCheckTaskUserByBelongTo" parameterType="String">
+    <update id="deleteQcCheckTaskUserByBelongTo" parameterType="String">
-		delete from qc_check_task_user where belong_to = #{belongTo}
+		update qc_check_task_user
-	</delete>
+		set del_flag = '1'
+		where belong_to = #{belongTo}
+	</update>
 
     <insert id="insertQcCheckTaskUserList" parameterType="List">
         insert into qc_check_task_user(