Commit ebbc9a131a93b85fe60f04fd9e1bceac4828f43e
Committed by
GitHub
Merge pull request #1284 from dadiyang/fix/erp-product-delete-stock-doc-refs
[BUG] ERP 删除产品:被「其它入库/其它出库/盘点」单据引用的产品照样能删掉,单据明细从此空白(引用校验只查了六类单据)
Showing
8 changed files
with
63 additions
and
0 deletions
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 | @@ -136,6 +136,9 @@ ErrorCode PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED = new ErrorCode(1_030_101_00 | ||
| 136 | ErrorCode PRODUCT_DELETE_FAIL_SALE_ORDER_EXISTS = new ErrorCode(1_030_500_005, "产品已被销售订单引用,无法删除"); | 136 | ErrorCode PRODUCT_DELETE_FAIL_SALE_ORDER_EXISTS = new ErrorCode(1_030_500_005, "产品已被销售订单引用,无法删除"); |
| 137 | ErrorCode PRODUCT_DELETE_FAIL_SALE_OUT_EXISTS = new ErrorCode(1_030_500_006, "产品已被销售出库单引用,无法删除"); | 137 | ErrorCode PRODUCT_DELETE_FAIL_SALE_OUT_EXISTS = new ErrorCode(1_030_500_006, "产品已被销售出库单引用,无法删除"); |
| 138 | ErrorCode PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS = new ErrorCode(1_030_500_007, "产品已被销售退货单引用,无法删除"); | 138 | ErrorCode PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS = new ErrorCode(1_030_500_007, "产品已被销售退货单引用,无法删除"); |
| 139 | + ErrorCode PRODUCT_DELETE_FAIL_STOCK_IN_EXISTS = new ErrorCode(1_030_500_008, "产品已被其它入库单引用,无法删除"); | ||
| 140 | + ErrorCode PRODUCT_DELETE_FAIL_STOCK_OUT_EXISTS = new ErrorCode(1_030_500_009, "产品已被其它出库单引用,无法删除"); | ||
| 141 | + ErrorCode PRODUCT_DELETE_FAIL_STOCK_CHECK_EXISTS = new ErrorCode(1_030_500_010, "产品已被盘点单引用,无法删除"); | ||
| 139 | 142 | ||
| 140 | // ========== ERP 产品分类 1-030-501-000 ========== | 143 | // ========== ERP 产品分类 1-030-501-000 ========== |
| 141 | ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_501_000, "产品分类不存在"); | 144 | ErrorCode PRODUCT_CATEGORY_NOT_EXISTS = new ErrorCode(1_030_501_000, "产品分类不存在"); |
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; | @@ -18,6 +18,9 @@ import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseReturnService; | ||
| 18 | import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService; | 18 | import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOrderService; |
| 19 | import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOutService; | 19 | import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOutService; |
| 20 | import cn.iocoder.yudao.module.erp.service.sale.ErpSaleReturnService; | 20 | import cn.iocoder.yudao.module.erp.service.sale.ErpSaleReturnService; |
| 21 | +import cn.iocoder.yudao.module.erp.service.stock.ErpStockCheckService; | ||
| 22 | +import cn.iocoder.yudao.module.erp.service.stock.ErpStockInService; | ||
| 23 | +import cn.iocoder.yudao.module.erp.service.stock.ErpStockOutService; | ||
| 21 | import jakarta.annotation.Resource; | 24 | import jakarta.annotation.Resource; |
| 22 | import org.springframework.context.annotation.Lazy; | 25 | import org.springframework.context.annotation.Lazy; |
| 23 | import org.springframework.stereotype.Service; | 26 | import org.springframework.stereotype.Service; |
| @@ -63,6 +66,15 @@ public class ErpProductServiceImpl implements ErpProductService { | @@ -63,6 +66,15 @@ public class ErpProductServiceImpl implements ErpProductService { | ||
| 63 | @Resource | 66 | @Resource |
| 64 | @Lazy // 延迟加载,避免循环依赖 | 67 | @Lazy // 延迟加载,避免循环依赖 |
| 65 | private ErpSaleReturnService saleReturnService; | 68 | private ErpSaleReturnService saleReturnService; |
| 69 | + @Resource | ||
| 70 | + @Lazy // 延迟加载,避免循环依赖 | ||
| 71 | + private ErpStockInService stockInService; | ||
| 72 | + @Resource | ||
| 73 | + @Lazy // 延迟加载,避免循环依赖 | ||
| 74 | + private ErpStockOutService stockOutService; | ||
| 75 | + @Resource | ||
| 76 | + @Lazy // 延迟加载,避免循环依赖 | ||
| 77 | + private ErpStockCheckService stockCheckService; | ||
| 66 | 78 | ||
| 67 | @Override | 79 | @Override |
| 68 | public Long createProduct(ProductSaveReqVO createReqVO) { | 80 | public Long createProduct(ProductSaveReqVO createReqVO) { |
| @@ -107,6 +119,15 @@ public class ErpProductServiceImpl implements ErpProductService { | @@ -107,6 +119,15 @@ public class ErpProductServiceImpl implements ErpProductService { | ||
| 107 | if (saleReturnService.getSaleReturnItemCountByProductId(id) > 0) { | 119 | if (saleReturnService.getSaleReturnItemCountByProductId(id) > 0) { |
| 108 | throw exception(PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS); | 120 | throw exception(PRODUCT_DELETE_FAIL_SALE_RETURN_EXISTS); |
| 109 | } | 121 | } |
| 122 | + if (stockInService.getStockInItemCountByProductId(id) > 0) { | ||
| 123 | + throw exception(PRODUCT_DELETE_FAIL_STOCK_IN_EXISTS); | ||
| 124 | + } | ||
| 125 | + if (stockOutService.getStockOutItemCountByProductId(id) > 0) { | ||
| 126 | + throw exception(PRODUCT_DELETE_FAIL_STOCK_OUT_EXISTS); | ||
| 127 | + } | ||
| 128 | + if (stockCheckService.getStockCheckItemCountByProductId(id) > 0) { | ||
| 129 | + throw exception(PRODUCT_DELETE_FAIL_STOCK_CHECK_EXISTS); | ||
| 130 | + } | ||
| 110 | // 删除 | 131 | // 删除 |
| 111 | productMapper.deleteById(id); | 132 | productMapper.deleteById(id); |
| 112 | } | 133 | } |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java
| @@ -81,4 +81,12 @@ public interface ErpStockCheckService { | @@ -81,4 +81,12 @@ public interface ErpStockCheckService { | ||
| 81 | */ | 81 | */ |
| 82 | List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds); | 82 | List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds); |
| 83 | 83 | ||
| 84 | + /** | ||
| 85 | + * 获得指定产品的库存盘点单项数量(产品删除前的引用校验) | ||
| 86 | + * | ||
| 87 | + * @param productId 产品编号 | ||
| 88 | + * @return 库存盘点单项数量 | ||
| 89 | + */ | ||
| 90 | + Long getStockCheckItemCountByProductId(Long productId); | ||
| 91 | + | ||
| 84 | } | 92 | } |
| 85 | \ No newline at end of file | 93 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java
| @@ -229,4 +229,9 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService { | @@ -229,4 +229,9 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService { | ||
| 229 | return stockCheckItemMapper.selectListByCheckIds(checkIds); | 229 | return stockCheckItemMapper.selectListByCheckIds(checkIds); |
| 230 | } | 230 | } |
| 231 | 231 | ||
| 232 | + @Override | ||
| 233 | + public Long getStockCheckItemCountByProductId(Long productId) { | ||
| 234 | + return stockCheckItemMapper.selectCount(ErpStockCheckItemDO::getProductId, productId); | ||
| 235 | + } | ||
| 236 | + | ||
| 232 | } | 237 | } |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java
| @@ -81,4 +81,12 @@ public interface ErpStockInService { | @@ -81,4 +81,12 @@ public interface ErpStockInService { | ||
| 81 | */ | 81 | */ |
| 82 | List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds); | 82 | List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds); |
| 83 | 83 | ||
| 84 | + /** | ||
| 85 | + * 获得指定产品的其它入库单项数量(产品删除前的引用校验) | ||
| 86 | + * | ||
| 87 | + * @param productId 产品编号 | ||
| 88 | + * @return 其它入库单项数量 | ||
| 89 | + */ | ||
| 90 | + Long getStockInItemCountByProductId(Long productId); | ||
| 91 | + | ||
| 84 | } | 92 | } |
| 85 | \ No newline at end of file | 93 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java
| @@ -225,4 +225,9 @@ public class ErpStockInServiceImpl implements ErpStockInService { | @@ -225,4 +225,9 @@ public class ErpStockInServiceImpl implements ErpStockInService { | ||
| 225 | return stockInItemMapper.selectListByInIds(inIds); | 225 | return stockInItemMapper.selectListByInIds(inIds); |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | + @Override | ||
| 229 | + public Long getStockInItemCountByProductId(Long productId) { | ||
| 230 | + return stockInItemMapper.selectCount(ErpStockInItemDO::getProductId, productId); | ||
| 231 | + } | ||
| 232 | + | ||
| 228 | } | 233 | } |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java
| @@ -81,4 +81,12 @@ public interface ErpStockOutService { | @@ -81,4 +81,12 @@ public interface ErpStockOutService { | ||
| 81 | */ | 81 | */ |
| 82 | List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds); | 82 | List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds); |
| 83 | 83 | ||
| 84 | + /** | ||
| 85 | + * 获得指定产品的其它出库单项数量(产品删除前的引用校验) | ||
| 86 | + * | ||
| 87 | + * @param productId 产品编号 | ||
| 88 | + * @return 其它出库单项数量 | ||
| 89 | + */ | ||
| 90 | + Long getStockOutItemCountByProductId(Long productId); | ||
| 91 | + | ||
| 84 | } | 92 | } |
| 85 | \ No newline at end of file | 93 | \ No newline at end of file |
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java
| @@ -225,4 +225,9 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { | @@ -225,4 +225,9 @@ public class ErpStockOutServiceImpl implements ErpStockOutService { | ||
| 225 | return stockOutItemMapper.selectListByOutIds(outIds); | 225 | return stockOutItemMapper.selectListByOutIds(outIds); |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | + @Override | ||
| 229 | + public Long getStockOutItemCountByProductId(Long productId) { | ||
| 230 | + return stockOutItemMapper.selectCount(ErpStockOutItemDO::getProductId, productId); | ||
| 231 | + } | ||
| 232 | + | ||
| 228 | } | 233 | } |