From 78286a5422d2180df5cd66a85570a7a3cd2f4d71 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 10:36:21 +0800
Subject: [PATCH] fix: 新增工艺路线与子集去除绑定产品,改为工序与产品类型
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 99 ++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
index 2554b5e..c16401e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -4,10 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.pojo.Product;
-import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.basic.service.IProductModelService;
-import com.ruoyi.basic.service.IProductService;
+import com.ruoyi.production.pojo.ProductMaterial;
+import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -19,9 +17,9 @@
import com.ruoyi.production.pojo.ProductBom;
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductStructure;
-import com.ruoyi.production.service.ProductBomService;
-import com.ruoyi.production.service.ProductProcessService;
-import com.ruoyi.production.service.ProductStructureService;
+import com.ruoyi.production.service.*;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -44,14 +42,7 @@
public class ProductBomServiceImpl extends ServiceImpl<ProductBomMapper, ProductBom> implements ProductBomService {
@Autowired
- private IProductService productService;
-
- @Autowired
private ProductBomMapper productBomMapper;
-
-
- @Autowired
- private IProductModelService productModelService;
@Autowired
private ProductStructureService productStructureService;
@@ -59,38 +50,37 @@
@Autowired
private ProductProcessService productProcessService;
+ @Autowired
+ private ProductMaterialService productMaterialService;
+
+ @Autowired
+ private ProductMaterialSkuService productMaterialSkuService;
+
+ @Autowired
+ private SysDictDataMapper sysDictDataMapper;
+
@Override
- public IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto) {
+ public IPage<ProductBomDto> listPage(Page<ProductBom> page, ProductBomDto productBomDto) {
return productBomMapper.listPage(page, productBomDto);
}
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(ProductBom productBom) {
+ if (productBom == null || productBom.getDictCode() == null) {
+ throw new ServiceException("鏂板BOM澶辫触,浜у搧绫诲瀷涓嶈兘涓虹┖");
+ }
+
+ SysDictData sysDictData = sysDictDataMapper.selectDictDataById(productBom.getDictCode());
+ if (sysDictData == null) {
+ throw new ServiceException("鏂板BOM澶辫触,浜у搧绫诲瀷涓嶅瓨鍦�");
+ }
+
boolean save = productBomMapper.insert(productBom) > 0;
if (save) {
String no = "BM." + String.format("%05d", productBom.getId());
productBom.setBomNo(no);
productBomMapper.updateById(productBom);
-
- // 鏌ヨ鍑轰骇鍝佹ā鍨嬩俊鎭�
- if (productBom.getProductModelId() == null) {
- throw new ServiceException("璇烽�夋嫨浜у搧妯″瀷");
- }
-
- ProductModel productModel = productModelService.getById(productBom.getProductModelId());
- if (productModel == null) {
- throw new ServiceException("閫夋嫨鐨勪骇鍝佹ā鍨嬩笉瀛樺湪");
- }
-
- // 娣诲姞鍒濆鐨勪骇鍝佺粨鏋�
- ProductStructure productStructure = new ProductStructure();
- productStructure.setProductModelId(productBom.getProductModelId());
- productStructure.setUnit(productModel.getUnit());
- productStructure.setUnitQuantity(BigDecimal.valueOf(1));
- productStructure.setBomId(productBom.getId());
-
- productStructureService.save(productStructure);
return AjaxResult.success();
}
@@ -99,7 +89,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult uploadBom(MultipartFile file) {
+ public AjaxResult uploadBom(MultipartFile file, Long dictCode) {
+ if (dictCode == null) {
+ return AjaxResult.error("瀵煎叆澶辫触,浜у搧绫诲瀷涓嶈兘涓虹┖");
+ }
+ SysDictData sysDictData = sysDictDataMapper.selectDictDataById(dictCode);
+ if (sysDictData == null) {
+ return AjaxResult.error("瀵煎叆澶辫触,浜у搧绫诲瀷涓嶅瓨鍦�");
+ }
ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
List<BomImportDto> list;
try {
@@ -108,7 +105,9 @@
return AjaxResult.error("Excel瑙ｆ瀽澶辫触");
}
- if (list == null || list.isEmpty()) return AjaxResult.error("鏁版嵁涓虹┖");
+ if (list == null || list.isEmpty()) {
+ return AjaxResult.error("鏁版嵁涓虹┖");
+ }
// 澶勭悊宸ュ簭
list.forEach(dto -> {
@@ -123,9 +122,9 @@
// 鍒涘缓 BOM 鏁版嵁
BomImportDto first = list.get(0);
- ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
+ ProductMaterialSku rootModel = findModel(first.getParentName(), first.getParentSpec());
ProductBom bom = new ProductBom();
- bom.setProductModelId(rootModel.getId());
+ bom.setDictCode(dictCode);
bom.setVersion("1.0");
productBomMapper.insert(bom);
bom.setBomNo("BM." + String.format("%05d", bom.getId()));
@@ -146,7 +145,8 @@
rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
rootNode.setProductModelId(rootModel.getId());
rootNode.setUnitQuantity(BigDecimal.ONE);
- rootNode.setUnit(rootModel.getUnit());
+ ProductMaterial rootMaterial = productMaterialService.getById(rootModel.getProductId());
+ rootNode.setUnit(rootMaterial != null ? rootMaterial.getUnit() : null);
productStructureService.save(rootNode);
treePathMap.put(parentKey, rootNode.getId());
@@ -162,7 +162,7 @@
}
// 鑾峰彇瀛愰」妯″瀷淇℃伅
- ProductModel childModel = findModel(dto.getChildName(), dto.getChildSpec());
+ ProductMaterialSku childModel = findModel(dto.getChildName(), dto.getChildSpec());
// 鎻掑叆缁撴瀯琛�
ProductStructure node = new ProductStructure();
@@ -170,7 +170,8 @@
node.setParentId(parentStructureId); // 鐖惰妭鐐笽D
node.setProductModelId(childModel.getId());
node.setUnitQuantity(dto.getUnitQty());
- node.setUnit(childModel.getUnit());
+ ProductMaterial childMaterial = productMaterialService.getById(childModel.getProductId());
+ node.setUnit(childMaterial != null ? childMaterial.getUnit() : null);
if (processMap.containsKey(dto.getProcess())) {
node.setProcessId(processMap.get(dto.getProcess()));
}
@@ -191,7 +192,7 @@
return;
}
- List<ProductStructureDto> treeData = productStructureService.listBybomId(bomId);
+ List<ProductStructureDto> treeData = productStructureService.listByBomId(bomId);
if (treeData == null || treeData.isEmpty()) {
return;
}
@@ -262,14 +263,14 @@
}
}
- private ProductModel findModel(String name, String spec) {
- Product product = productService.getOne(new LambdaQueryWrapper<Product>()
- .eq(Product::getProductName, name).last("limit 1"));
+ private ProductMaterialSku findModel(String name, String spec) {
+ ProductMaterial product = productMaterialService.getOne(new LambdaQueryWrapper<ProductMaterial>()
+ .eq(ProductMaterial::getProductName, name).last("limit 1"));
if (product == null) throw new ServiceException("浜у搧鏈淮鎶わ細" + name);
- ProductModel model = productModelService.getOne(new LambdaQueryWrapper<ProductModel>()
- .eq(ProductModel::getProductId, product.getId())
- .eq(ProductModel::getModel, spec).last("limit 1"));
+ ProductMaterialSku model = productMaterialSkuService.getOne(new LambdaQueryWrapper<ProductMaterialSku>()
+ .eq(ProductMaterialSku::getProductId, product.getId())
+ .eq(ProductMaterialSku::getModel, spec).last("limit 1"));
if (model == null) throw new ServiceException("瑙勬牸鏈淮鎶わ細" + name + "[" + spec + "]");
return model;
}
@@ -314,5 +315,3 @@
return s.replaceAll("[\\u00A0\\u3000]", "").trim();
}
}
-
-
--
Gitblit v1.9.3