From 1e123568c2f561013f5636e45dc0db30b17a3517 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 10 九月 2026 16:39:26 +0800
Subject: [PATCH] feat(basic): 添加产品条码功能并完善生产统计报表
---
src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index 2b9eb40..306bfd5 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -13,14 +13,18 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.service.IProductService;
import com.ruoyi.basic.vo.ProductModelVo;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.stock.mapper.StockInventoryMapper;
+import com.ruoyi.stock.pojo.StockInventory;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@Service
@AllArgsConstructor
@@ -29,6 +33,8 @@
private ProductMapper productMapper;
private ProductModelMapper productModelMapper;
+
+ private StockInventoryMapper stockInventoryMapper;
@Override
public List<ProductTreeDto> selectProductList(ProductDto productDto) {
@@ -131,15 +137,31 @@
@Override
public int delProductByIds(Long[] ids) {
- // 1. 鍒犻櫎瀛愯〃 product_model 涓叧鑱旂殑鏁版嵁
+ List<Long> idList = Arrays.asList(ids);
+
+ // 1. 瀛樺湪瀛愬垎绫绘椂涓嶅厑璁稿垹闄わ紝閬垮厤鏍戠粨鏋勫嚭鐜板鍎胯妭鐐�
+ LambdaQueryWrapper<Product> childWrapper = new LambdaQueryWrapper<>();
+ childWrapper.in(Product::getParentId, idList);
+ if (productMapper.selectCount(childWrapper) > 0) {
+ throw new ServiceException("璇ヤ骇鍝佷笅瀛樺湪瀛愬垎绫伙紝璇峰厛鍒犻櫎瀛愬垎绫�");
+ }
+
+ // 2. 瑙勬牸宸茶搴撳瓨璁板綍寮曠敤鏃朵笉鍏佽鍒犻櫎锛岄伩鍏嶅巻鍙叉暟鎹柇閾�
LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.in(ProductModel::getProductId, ids);
- productModelMapper.delete(queryWrapper);
+ queryWrapper.in(ProductModel::getProductId, idList);
+ List<ProductModel> models = productModelMapper.selectList(queryWrapper);
+ if (!models.isEmpty()) {
+ List<Long> modelIds = models.stream().map(ProductModel::getId).collect(Collectors.toList());
+ LambdaQueryWrapper<StockInventory> stockWrapper = new LambdaQueryWrapper<>();
+ stockWrapper.in(StockInventory::getProductModelId, modelIds);
+ if (stockInventoryMapper.selectCount(stockWrapper) > 0) {
+ throw new ServiceException("璇ヤ骇鍝佽鏍煎凡瀛樺湪搴撳瓨璁板綍锛屼笉鑳藉垹闄�");
+ }
+ productModelMapper.delete(queryWrapper);
+ }
- // 2. 鍒犻櫎涓昏〃 product 鏁版嵁
- int deleteCount = productMapper.deleteBatchIds(Arrays.asList(ids));
-
- return deleteCount;
+ // 3. 鍒犻櫎涓昏〃 product 鏁版嵁
+ return productMapper.deleteBatchIds(idList);
}
}
--
Gitblit v1.9.3