diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java index 11aa3ee..6a1f0d3 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/controller/QcIpqcController.java @@ -8,9 +8,11 @@ import com.ktg.common.utils.StringUtils; import com.ktg.mes.pro.domain.ProWorkorder; import com.ktg.mes.pro.service.IProWorkorderService; import com.ktg.mes.qc.domain.QcTemplate; +import com.ktg.mes.qc.service.IQcIpqcLineService; import com.ktg.mes.qc.service.IQcTemplateService; 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; @@ -47,6 +49,9 @@ public class QcIpqcController extends BaseController @Autowired private IQcTemplateService qcTemplateService; + @Autowired + private IQcIpqcLineService qcIpqcLineService; + /** * 查询过程检验单列表 */ @@ -138,9 +143,15 @@ public class QcIpqcController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:qc:ipqc:remove')") @Log(title = "过程检验单", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{ipqcIds}") public AjaxResult remove(@PathVariable Long[] ipqcIds) { + for (Long ipqcId: ipqcIds + ) { + qcIpqcLineService.deleteByIpqcId(ipqcId); + } + return toAjax(qcIpqcService.deleteQcIpqcByIpqcIds(ipqcIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcLineMapper.java b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcLineMapper.java index 9654132..146df9f 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcLineMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcIpqcLineMapper.java @@ -58,4 +58,11 @@ public interface QcIpqcLineMapper * @return 结果 */ public int deleteQcIpqcLineByLineIds(Long[] lineIds); + + /*** + * 根据检验单头ID删除所有行信息 + * @param ipqcId + * @return + */ + public int deleteByIpqcId(Long ipqcId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcLineService.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcLineService.java index da2448f..a002f0b 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcLineService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/IQcIpqcLineService.java @@ -58,4 +58,11 @@ public interface IQcIpqcLineService * @return 结果 */ public int deleteQcIpqcLineByLineId(Long lineId); + + /*** + * 根据检验单头ID删除所有行信息 + * @param ipqcId + * @return + */ + public int deleteByIpqcId(Long ipqcId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcLineServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcLineServiceImpl.java index c9b4c0e..eb10963 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcLineServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/QcIpqcLineServiceImpl.java @@ -93,4 +93,9 @@ public class QcIpqcLineServiceImpl implements IQcIpqcLineService { return qcIpqcLineMapper.deleteQcIpqcLineByLineId(lineId); } + + @Override + public int deleteByIpqcId(Long ipqcId) { + return qcIpqcLineMapper.deleteByIpqcId(ipqcId); + } } diff --git a/ktg-mes/src/main/resources/mapper/qc/QcIpqcLineMapper.xml b/ktg-mes/src/main/resources/mapper/qc/QcIpqcLineMapper.xml index 34af741..b8257e4 100644 --- a/ktg-mes/src/main/resources/mapper/qc/QcIpqcLineMapper.xml +++ b/ktg-mes/src/main/resources/mapper/qc/QcIpqcLineMapper.xml @@ -154,4 +154,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{lineId} + + + delete from qc_ipqc_line where ipqc_id = #{ipqcId} + + \ No newline at end of file