From e0576e3514da39bd69c142b66386797b4c55069a Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Mon, 12 Sep 2022 22:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=88=A0=E9=99=A4=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E6=97=B6=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=B7=A5=E5=BA=8F=E3=80=81=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E3=80=81BOM=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/controller/ProRouteController.java | 20 +++++++++++++++++++ .../controller/ProRouteProductController.java | 16 +++++++++++++++ .../mes/pro/mapper/ProRouteProcessMapper.java | 7 +++++++ .../pro/mapper/ProRouteProductBomMapper.java | 14 +++++++++++++ .../mes/pro/mapper/ProRouteProductMapper.java | 7 +++++++ .../pro/service/IProRouteProcessService.java | 7 +++++++ .../service/IProRouteProductBomService.java | 14 +++++++++++++ .../pro/service/IProRouteProductService.java | 7 +++++++ .../impl/ProRouteProcessServiceImpl.java | 5 +++++ .../impl/ProRouteProductBomServiceImpl.java | 10 ++++++++++ .../impl/ProRouteProductServiceImpl.java | 5 +++++ .../mapper/pro/ProRouteProcessMapper.xml | 5 +++++ .../mapper/pro/ProRouteProductBomMapper.xml | 8 ++++++++ .../mapper/pro/ProRouteProductMapper.xml | 5 +++++ 14 files changed, 130 insertions(+) diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteController.java index c2cab5f..fbb5bc0 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteController.java @@ -5,8 +5,12 @@ import javax.servlet.http.HttpServletResponse; import com.ktg.common.constant.UserConstants; import com.ktg.common.utils.StringUtils; +import com.ktg.mes.pro.service.IProRouteProcessService; +import com.ktg.mes.pro.service.IProRouteProductBomService; +import com.ktg.mes.pro.service.IProRouteProductService; 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; @@ -37,6 +41,15 @@ public class ProRouteController extends BaseController @Autowired private IProRouteService proRouteService; + @Autowired + private IProRouteProcessService proRouteProcessService; + + @Autowired + private IProRouteProductService proRouteProductService; + + @Autowired + private IProRouteProductBomService proRouteProductBomService; + /** * 查询工艺路线列表 */ @@ -105,9 +118,16 @@ public class ProRouteController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:pro:proroute:remove')") @Log(title = "工艺路线", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{routeIds}") public AjaxResult remove(@PathVariable Long[] routeIds) { + for (Long routeId:routeIds + ) { + proRouteProcessService.deleteByRouteId(routeId); + proRouteProductService.deleteByRouteId(routeId); + proRouteProductBomService.deleteByRouteId(routeId); + } return toAjax(proRouteService.deleteProRouteByRouteIds(routeIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProductController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProductController.java index f867cdd..f7285d8 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProductController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProRouteProductController.java @@ -5,8 +5,11 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.collection.CollUtil; import com.ktg.common.constant.UserConstants; +import com.ktg.mes.pro.domain.ProRouteProductBom; +import com.ktg.mes.pro.service.IProRouteProductBomService; 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; @@ -37,6 +40,9 @@ public class ProRouteProductController extends BaseController @Autowired private IProRouteProductService proRouteProductService; + @Autowired + private IProRouteProductBomService proRouteProductBomService; + /** * 查询产品制程列表 */ @@ -127,9 +133,19 @@ public class ProRouteProductController extends BaseController */ @PreAuthorize("@ss.hasPermi('mes:pro:routeproduct:remove')") @Log(title = "产品制程", businessType = BusinessType.DELETE) + @Transactional @DeleteMapping("/{recordIds}") public AjaxResult remove(@PathVariable Long[] recordIds) { + for (Long recordId:recordIds + ) { + ProRouteProduct product = proRouteProductService.selectProRouteProductByRecordId(recordId); + ProRouteProductBom bom = new ProRouteProductBom(); + bom.setRouteId(product.getRouteId()); + bom.setProductId(product.getItemId()); + proRouteProductBomService.deleteByRouteIdAndProductId(bom); + } + return toAjax(proRouteProductService.deleteProRouteProductByRecordIds(recordIds)); } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java index ac50ef4..6fa4727 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProcessMapper.java @@ -65,4 +65,11 @@ public interface ProRouteProcessMapper * @return 结果 */ public int deleteProRouteProcessByRecordIds(Long[] recordIds); + + /** + * 根据工艺路线ID删除所有工序配置 + * @param routeId + * @return + */ + public int deleteByRouteId(Long routeId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductBomMapper.java b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductBomMapper.java index 91ae98d..5b82ce9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductBomMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductBomMapper.java @@ -66,4 +66,18 @@ public interface ProRouteProductBomMapper * @return 结果 */ public int deleteProRouteProductBomByRecordIds(Long[] recordIds); + + /** + * 根据工艺路线ID删除所有产品BOM设置 + * @param routeId + * @return + */ + public int deleteByRouteId(Long routeId); + + /** + * 根据工艺路线ID和产品ID删除BOM设置 + * @param proRouteProductBom + * @return + */ + public int deleteByRouteIdAndProductId(ProRouteProductBom proRouteProductBom); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductMapper.java b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductMapper.java index 818a858..c1cdcf6 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductMapper.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/mapper/ProRouteProductMapper.java @@ -60,4 +60,11 @@ public interface ProRouteProductMapper * @return 结果 */ public int deleteProRouteProductByRecordIds(Long[] recordIds); + + /** + * 根据工艺路线ID删除对应的产品配置 + * @param routeId + * @return + */ + public int deleteByRouteId(Long routeId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java index 1c4d4eb..9f3fcb9 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProcessService.java @@ -86,4 +86,11 @@ public interface IProRouteProcessService * @return 结果 */ public int deleteProRouteProcessByRecordId(Long recordId); + + /** + * 根据工艺路线ID删除所有工序配置 + * @param routeId + * @return + */ + public int deleteByRouteId(Long routeId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductBomService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductBomService.java index 7154829..4cc39cc 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductBomService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductBomService.java @@ -66,4 +66,18 @@ public interface IProRouteProductBomService * @return 结果 */ public int deleteProRouteProductBomByRecordId(Long recordId); + + /** + * 根据工艺路线ID删除所有产品BOM设置 + * @param routeId + * @return + */ + public int deleteByRouteId(Long routeId); + + /** + * 根据工艺路线ID和产品ID删除BOM设置 + * @param proRouteProductBom + * @return + */ + public int deleteByRouteIdAndProductId(ProRouteProductBom proRouteProductBom); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductService.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductService.java index 05d4657..11d3ca4 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductService.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/IProRouteProductService.java @@ -65,4 +65,11 @@ public interface IProRouteProductService * @return 结果 */ public int deleteProRouteProductByRecordId(Long recordId); + + /** + * 根据工艺路线ID删除对应的产品配置 + * @param routeId + * @return + */ + public int deleteByRouteId(Long routeId); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java index 4572601..0ce088e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProcessServiceImpl.java @@ -126,4 +126,9 @@ public class ProRouteProcessServiceImpl implements IProRouteProcessService { return proRouteProcessMapper.deleteProRouteProcessByRecordId(recordId); } + + @Override + public int deleteByRouteId(Long routeId) { + return proRouteProcessMapper.deleteByRouteId(routeId); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductBomServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductBomServiceImpl.java index 9b8207a..a2033e7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductBomServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductBomServiceImpl.java @@ -106,4 +106,14 @@ public class ProRouteProductBomServiceImpl implements IProRouteProductBomService { return proRouteProductBomMapper.deleteProRouteProductBomByRecordId(recordId); } + + @Override + public int deleteByRouteId(Long routeId) { + return proRouteProductBomMapper.deleteByRouteId(routeId); + } + + @Override + public int deleteByRouteIdAndProductId(ProRouteProductBom proRouteProductBom) { + return proRouteProductBomMapper.deleteByRouteIdAndProductId(proRouteProductBom); + } } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductServiceImpl.java index 9f43fdb..c09453e 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductServiceImpl.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/service/impl/ProRouteProductServiceImpl.java @@ -106,4 +106,9 @@ public class ProRouteProductServiceImpl implements IProRouteProductService { return proRouteProductMapper.deleteProRouteProductByRecordId(recordId); } + + @Override + public int deleteByRouteId(Long routeId) { + return proRouteProductMapper.deleteByRouteId(routeId); + } } diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml index 343f12c..bfdeb68 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProcessMapper.xml @@ -188,4 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from pro_route_process where route_id = #{routeId} + + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml index 6d90be8..75f6e91 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProductBomMapper.xml @@ -136,4 +136,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from pro_route_product_bom where route_id = #{routeId} + + + + delete from pro_route_product_bom where route_id = #{routeId} and product_id = #{productId} + \ No newline at end of file diff --git a/ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml index fa74f33..16283b1 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml @@ -135,4 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{recordId} + + + delete from pro_route_product where route_id = #{routeId} + + \ No newline at end of file