From 8288d2f1363affa72a6fed0f8f88d22b591801cc Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Wed, 18 May 2022 18:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=A0=E9=99=A4=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qc/controller/QcTemplateController.java | 18 ++++++++++++++++++ .../mes/qc/mapper/QcTemplateIndexMapper.java | 7 +++++++ .../mes/qc/mapper/QcTemplateProductMapper.java | 3 +++ .../qc/service/IQcTemplateIndexService.java | 7 +++++++ .../qc/service/IQcTemplateProductService.java | 7 +++++++ .../impl/QcTemplateIndexServiceImpl.java | 5 +++++ .../impl/QcTemplateProductServiceImpl.java | 5 +++++ .../mapper/qc/QcTemplateIndexMapper.xml | 5 +++++ .../mapper/qc/QcTemplateProductMapper.xml | 5 +++++ 9 files changed, 62 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateController.java index 8af0d30..8615a0a 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcTemplateController.java @@ -7,8 +7,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.qc.service.IQcTemplateIndexService; +import com.ktg.mes.qc.service.IQcTemplateProductService; 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; @@ -39,6 +42,12 @@ public class QcTemplateController extends BaseController @Autowired private IQcTemplateService qcTemplateService; + @Autowired + private IQcTemplateIndexService qcTemplateIndexService; + + @Autowired + private IQcTemplateProductService qcTemplateProductService; + /** * 查询检测模板列表 */ @@ -146,9 +155,18 @@ public class QcTemplateController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:qc:qctemplate:remove')") @Log(title = "检测模板", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{templateIds}") public AjaxResult remove(@PathVariable Long[] templateIds) { + + for (Long id:templateIds + ) { + //删除当前模板下所有检测项数据 + qcTemplateIndexService.deleteByTemplateId(id); + //删除当前模板下所有检测产品 + qcTemplateProductService.deleteByTemplateId(id); + } return toAjax(qcTemplateService.deleteQcTemplateByTemplateIds(templateIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateIndexMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateIndexMapper.java index 5e5bf00..aec8bee 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateIndexMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateIndexMapper.java @@ -58,4 +58,11 @@ public interface QcTemplateIndexMapper * @return 结果 */ public int deleteQcTemplateIndexByRecordIds(Long[] recordIds); + + /** + * 根据检测模板ID删除所有检测项 + * @param templateId + * @return + */ + public int deleteByTemplateId(Long templateId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateProductMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateProductMapper.java index 2824619..f7ed894 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateProductMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateProductMapper.java @@ -61,4 +61,7 @@ public interface QcTemplateProductMapper * @return 结果 */ public int deleteQcTemplateProductByRecordIds(Long[] recordIds); + + public int deleteByTemplateId(Long templateId); + } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateIndexService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateIndexService.java index 9e00d66..9f4a44c 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateIndexService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateIndexService.java @@ -58,4 +58,11 @@ public interface IQcTemplateIndexService * @return 结果 */ public int deleteQcTemplateIndexByRecordId(Long recordId); + + /** + * 根据检测模板ID删除所有检测项 + * @param templateId + * @return + */ + public int deleteByTemplateId(Long templateId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateProductService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateProductService.java index a6cdf5b..ddd5a8f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateProductService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcTemplateProductService.java @@ -60,4 +60,11 @@ public interface IQcTemplateProductService * @return 结果 */ public int deleteQcTemplateProductByRecordId(Long recordId); + + /** + * 根据检测模板ID删除产品 + * @param templateId + * @return + */ + public int deleteByTemplateId(Long templateId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateIndexServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateIndexServiceImpl.java index c6cd871..49468c5 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateIndexServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateIndexServiceImpl.java @@ -93,4 +93,9 @@ public class QcTemplateIndexServiceImpl implements IQcTemplateIndexService { return qcTemplateIndexMapper.deleteQcTemplateIndexByRecordId(recordId); } + + @Override + public int deleteByTemplateId(Long templateId) { + return qcTemplateIndexMapper.deleteByTemplateId(templateId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateProductServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateProductServiceImpl.java index b5cb289..feeba3f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateProductServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcTemplateProductServiceImpl.java @@ -106,4 +106,9 @@ public class QcTemplateProductServiceImpl implements IQcTemplateProductService { return qcTemplateProductMapper.deleteQcTemplateProductByRecordId(recordId); } + + @Override + public int deleteByTemplateId(Long templateId) { + return qcTemplateProductMapper.deleteByTemplateId(templateId); + } } diff --git a/ktg-mes/src/main/resources/mapper/qc/QcTemplateIndexMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcTemplateIndexMapper.xml index 0de194b..0c79b06 100644 --- a/ktg-mes/src/main/resources/mapper/qc/QcTemplateIndexMapper.xml +++ b/ktg-mes/src/main/resources/mapper/qc/QcTemplateIndexMapper.xml @@ -144,4 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from qc_template_index where template_id = #{templateId} + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml index 3909d3c..5550a21 100644 --- a/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml +++ b/ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml @@ -144,4 +144,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from qc_template_product where template_id = #{templateId} + + \ No newline at end of file