From 33c0ea554d3390e6c44de811972689726c1fab29 Mon Sep 17 00:00:00 2001 From: dadiyang Date: Wed, 7 Oct 2026 01:23:29 +0800 Subject: [PATCH] fix(erp)：产品删除补「其它入库/其它出库/盘点」三类引用校验——deleteProduct 只查购销六类，被这三类单据引用的产品可被删除致已审核单据明细悬空 --- yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java | 3 +++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java | 21 +++++++++++++++++++++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java | 8 ++++++++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java | 5 +++++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java | 8 ++++++++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java | 5 +++++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java | 8 ++++++++ yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java | 5 +++++ 8 files changed, 63 insertions(+), 0 deletions(-) diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java index af735a9..2477c82 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java @@ -136,6 +136,9 @@ ErrorCode PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED = new ErrorCode(1_030_101_00 ErrorCode PRODUCT_DELETE_FAIL_SALE_ORDER_EXISTS = new ErrorCode(1_030_500_005, "产品已被销售订单引用，无法删除"); ErrorCode PRODUCT_DELETE_FAIL_SALE_OUT_EXISTS = new ErrorCode(1_030_500_006, "产品已被销售出库单引用，无法删除"); ErrorCode PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS = new ErrorCode(1_030_500_007, "产品已被销售退货单引用，无法删除"); + ErrorCode PRODUCT_DELETE_FAIL_STOCK_IN_EXISTS = new ErrorCode(1_030_500_008, "产品已被其它入库单引用，无法删除"); + ErrorCode PRODUCT_DELETE_FAIL_STOCK_OUT_EXISTS = new ErrorCode(1_030_500_009, "产品已被其它出库单引用，无法删除"); + ErrorCode PRODUCT_DELETE_FAIL_STOCK_CHECK_EXISTS = new ErrorCode(1_030_500_010, "产品已被盘点单引用，无法删除"); // ========== ERP 产品分类 1-030-501-000 ========== ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_501_000, "产品分类不存在"); diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java index 65cb6fa..6f51a6c 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java @@ -18,6 +18,9 @@ import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseReturnService; import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService; import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOutService; import cn.iocoder.yudao.module.erp.service.sale.ErpSaleReturnService; +import cn.iocoder.yudao.module.erp.service.stock.ErpStockCheckService; +import cn.iocoder.yudao.module.erp.service.stock.ErpStockInService; +import cn.iocoder.yudao.module.erp.service.stock.ErpStockOutService; import jakarta.annotation.Resource; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -63,6 +66,15 @@ public class ErpProductServiceImpl implements ErpProductService { @Resource @Lazy // 延迟加载，避免循环依赖 private ErpSaleReturnService saleReturnService; + @Resource + @Lazy // 延迟加载，避免循环依赖 + private ErpStockInService stockInService; + @Resource + @Lazy // 延迟加载，避免循环依赖 + private ErpStockOutService stockOutService; + @Resource + @Lazy // 延迟加载，避免循环依赖 + private ErpStockCheckService stockCheckService; @Override public Long createProduct(ProductSaveReqVO createReqVO) { @@ -107,6 +119,15 @@ public class ErpProductServiceImpl implements ErpProductService { if (saleReturnService.getSaleReturnItemCountByProductId(id) > 0) { throw exception(PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS); } + if (stockInService.getStockInItemCountByProductId(id) > 0) { + throw exception(PRODUCT_DELETE_FAIL_STOCK_IN_EXISTS); + } + if (stockOutService.getStockOutItemCountByProductId(id) > 0) { + throw exception(PRODUCT_DELETE_FAIL_STOCK_OUT_EXISTS); + } + if (stockCheckService.getStockCheckItemCountByProductId(id) > 0) { + throw exception(PRODUCT_DELETE_FAIL_STOCK_CHECK_EXISTS); + } // 删除 productMapper.deleteById(id); } diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java index 2f8a0f9..058bf6a 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java @@ -81,4 +81,12 @@ public interface ErpStockCheckService { */ List getStockCheckItemListByCheckIds(Collection checkIds); + /** + * 获得指定产品的库存盘点单项数量（产品删除前的引用校验） + * + * @param productId 产品编号 + * @return 库存盘点单项数量 + */ + Long getStockCheckItemCountByProductId(Long productId); + } \ No newline at end of file diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java index bbe08ae..3ed4892 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java @@ -229,4 +229,9 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService { return stockCheckItemMapper.selectListByCheckIds(checkIds); } + @Override + public Long getStockCheckItemCountByProductId(Long productId) { + return stockCheckItemMapper.selectCount(ErpStockCheckItemDO::getProductId, productId); + } + } diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java index 4e51545..fa3e9e1 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java @@ -81,4 +81,12 @@ public interface ErpStockInService { */ List getStockInItemListByInIds(Collection inIds); + /** + * 获得指定产品的其它入库单项数量（产品删除前的引用校验） + * + * @param productId 产品编号 + * @return 其它入库单项数量 + */ + Long getStockInItemCountByProductId(Long productId); + } \ No newline at end of file diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java index 38967de..cf1a41f 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java @@ -225,4 +225,9 @@ public class ErpStockInServiceImpl implements ErpStockInService { return stockInItemMapper.selectListByInIds(inIds); } + @Override + public Long getStockInItemCountByProductId(Long productId) { + return stockInItemMapper.selectCount(ErpStockInItemDO::getProductId, productId); + } + } diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java index 558fb69..1456236 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java @@ -81,4 +81,12 @@ public interface ErpStockOutService { */ List getStockOutItemListByOutIds(Collection outIds); + /** + * 获得指定产品的其它出库单项数量（产品删除前的引用校验） + * + * @param productId 产品编号 + * @return 其它出库单项数量 + */ + Long getStockOutItemCountByProductId(Long productId); + } \ No newline at end of file diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java index 5a229fc..cf34350 100644 --- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java @@ -225,4 +225,9 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { return stockOutItemMapper.selectListByOutIds(outIds); } + @Override + public Long getStockOutItemCountByProductId(Long productId) { + return stockOutItemMapper.selectCount(ErpStockOutItemDO::getProductId, productId); + } + } -- libgit2 0.21.4