diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java index 1506d925..27284088 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QcMaterialGroupController.java @@ -109,14 +109,14 @@ public class QcMaterialGroupController extends BaseController { public AjaxResult remove(@PathVariable String id) { QcMaterialGroup parent = new QcMaterialGroup(); parent.setId(id); - List children = qcMaterialGroupService.getMaterialChildrenList(parent); - boolean hasRule = qcMaterialGroupService.validationData(id); - if (!children.isEmpty()) { - return AjaxResult.error("此节点下含有子节点,请先删除子节点"); - } else if (hasRule) { - return AjaxResult.error("此节点含有检验规则,请先删除检验规则"); - } else { +// List children = qcMaterialGroupService.getMaterialChildrenList(parent); +// boolean hasRule = qcMaterialGroupService.validationData(id); +// if (!children.isEmpty()) { +// return AjaxResult.error("此节点下含有子节点,请先删除子节点"); +// } else if (hasRule) { +// return AjaxResult.error("此节点含有检验规则,请先删除检验规则"); +// } else { return toAjax(qcMaterialGroupService.deleteQcMaterialGroupById(id)); - } +// } } } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java index 112a74f9..40c3e5e1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcMaterialGroupMapper.java @@ -68,4 +68,6 @@ public interface QcMaterialGroupMapper { public List validationData(String id); String selectGroupIdByName(String groupName); + + void deleteGroupDetailById(String id); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java index 9eded988..8ab5580a 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcMaterialGroupServiceImpl.java @@ -191,6 +191,7 @@ public class QcMaterialGroupServiceImpl implements IQcMaterialGroupService { @Override @DS("#header.poolName") public int deleteQcMaterialGroupById(String id) { + qcMaterialGroupMapper.deleteGroupDetailById(id); return qcMaterialGroupMapper.deleteQcMaterialGroupById(id); } diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml index 054abf1e..e327235d 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcMaterialGroupMapper.xml @@ -126,6 +126,9 @@ #{id} + + delete from qc_material_group_detail where group_id = #{id} +