From 94462f5e4f6f78adf678101923eb2fd54056c62f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 15:50:24 +0800
Subject: [PATCH] yys bom
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 91 insertions(+), 19 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 ea3dc41..256119c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.BomImportDto;
+import com.ruoyi.production.dto.BomImportErrorDto;
import com.ruoyi.production.dto.ProductBomDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.mapper.ProductBomMapper;
@@ -23,6 +24,7 @@
import com.ruoyi.production.service.ProductBomService;
import com.ruoyi.production.service.ProductProcessService;
import com.ruoyi.production.service.ProductStructureService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -60,14 +62,42 @@
@Autowired
private ProductProcessService productProcessService;
+
@Override
public IPage<ProductBomDto> listPage(Page page, ProductBomDto productBomDto) {
return productBomMapper.listPage(page, productBomDto);
}
+ /**
+ * 浜у搧鏍规嵁bom璁＄畻瀛愰」鏁伴噺锛堝彧缁熻浜岀骇锛�
+ */
+ public Long countChild(Long productModelId) {
+ ProductBom productBom = productBomMapper.selectOne(new LambdaQueryWrapper<ProductBom>()
+ .eq(ProductBom::getProductModelId, productModelId));
+ if(productBom != null){
+ return productStructureService.countBybomId(productBom.getId());
+ }
+ return 0L;
+ }
+
+ /**
+ * 鍒ゆ柇浜у搧鏄惁瀛樺湪bom false涓嶅瓨鍦� true瀛樺湪
+ * @param productBom
+ * @return
+ */
+ public boolean checkBom(ProductBom productBom) {
+ ProductBom productBom1 = productBomMapper.selectOne(new LambdaQueryWrapper<ProductBom>()
+ .eq(ProductBom::getProductModelId, productBom.getProductModelId()));
+ return productBom1 == null ? false : true;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult add(ProductBom productBom) {
+ boolean b = checkBom(productBom);
+ if (b) {
+ return AjaxResult.error("浜у搧妯″瀷宸插瓨鍦˙OM");
+ }
boolean save = productBomMapper.insert(productBom) > 0;
if (save) {
String no = "BM." + String.format("%05d", productBom.getId());
@@ -103,16 +133,11 @@
* @param children 褰撳墠鐖堕」鐨勫瓙椤瑰垪琛�
* @return 淇濆瓨鍚庣殑鐖堕」浜у搧ID
*/
- private void saveBomRecursive(List<BomImportDto> children,ProductBom bom,ProductModel rootModel,Map<String, Long> processMap) {
- // 1. 鑾峰彇children涓瓙椤逛骇鍝佺紪鍙蜂负绌虹殑鏁版嵁
- List<BomImportDto> parentChildren = children
- .stream()
- .filter(child -> StringUtils.isEmpty(child.getChildCode()))
- .collect(Collectors.toList());
- if(CollectionUtils.isEmpty(parentChildren)){
- throw new ServiceException("璇烽�夋嫨鐖堕」浜у搧缂栧彿");
- }
- BomImportDto parentId = parentChildren.get(0); // 鐖剁骇鏁版嵁
+ private void saveBomRecursive(List<BomImportDto> children,
+ ProductBom bom,ProductModel rootModel,
+ Map<String, Long> processMap,
+ List<BomImportErrorDto> errorList ) {
+
ProductStructure rootNode = new ProductStructure();
rootNode.setBomId(bom.getId());
rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
@@ -128,8 +153,14 @@
continue;
}
// 鑾峰彇瀛愰」妯″瀷淇℃伅
- ProductModel childModel = findModel(child.getChildName(), child.getChildSpec());
-
+ ProductModel childModel = findModel(child.getChildName(), child.getChildCode());
+ if(childModel.getId() == null){
+ BomImportErrorDto errorDto = new BomImportErrorDto();
+ BeanUtils.copyProperties(child, errorDto);
+ errorDto.setErrorMsg(childModel.getErrorMsg());
+ errorList.add(errorDto);
+ continue;
+ }
// 鎻掑叆缁撴瀯琛�
ProductStructure node = new ProductStructure();
node.setBomId(bom.getId());
@@ -147,16 +178,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult uploadBom(MultipartFile file) {
+ public void uploadBom(MultipartFile file,HttpServletResponse response) {
ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
List<BomImportDto> list;
try {
list = util.importExcel(file.getInputStream());
} catch (Exception e) {
- return AjaxResult.error("Excel瑙ｆ瀽澶辫触");
+ throw new ServiceException("Excel瑙ｆ瀽澶辫触");
}
- if (list == null || list.isEmpty()) return AjaxResult.error("鏁版嵁涓虹┖");
+ if (list == null || list.isEmpty()) throw new ServiceException("鏂囦欢涓虹┖");
// 澶勭悊宸ュ簭
list.forEach(dto -> {
@@ -172,22 +203,44 @@
Map<String, List<BomImportDto>> parentMap = list.stream()
.filter(bom -> StringUtils.isNotBlank(bom.getParentCode()))
.collect(Collectors.groupingBy(BomImportDto::getParentCode));
+ List<BomImportErrorDto> errorList = new ArrayList<>();
// 2. 閬嶅巻鎵�鏈夌埗椤癸紝閫掑綊淇濆瓨
for (Map.Entry<String, List<BomImportDto>> entry : parentMap.entrySet()) {
+
// 鍒涘缓 BOM 鏁版嵁
BomImportDto first = entry.getValue().get(0);
- ProductModel rootModel = findModel(first.getParentName(), first.getParentSpec());
+ ProductModel rootModel = findModel(first.getParentName(), first.getParentCode());
+ if(rootModel.getId() == null){
+ BomImportErrorDto error = new BomImportErrorDto();
+ BeanUtils.copyProperties(first, error);
+ error.setErrorMsg(rootModel.getErrorMsg());
+ errorList.add(error);
+ continue;
+ }
+
ProductBom bom = new ProductBom();
bom.setProductModelId(rootModel.getId());
bom.setVersion("1.0");
+ boolean b = checkBom(bom);
+ if(b){
+ BomImportErrorDto error = new BomImportErrorDto();
+ BeanUtils.copyProperties(first, error);
+ error.setErrorMsg("浜у搧銆�"+ first.getParentSpec() + "銆態OM宸插瓨鍦�");
+ errorList.add(error);
+ continue;
+ }
productBomMapper.insert(bom);
bom.setBomNo("BM." + String.format("%05d", bom.getId()));
productBomMapper.updateById(bom);
// 澶勭悊bom瀛愯〃鏁版嵁
List<BomImportDto> children = entry.getValue();
- saveBomRecursive(children,bom,rootModel,processMap);
+ saveBomRecursive(children,bom,rootModel,processMap,errorList);
}
- return AjaxResult.success("BOM瀵煎叆鎴愬姛");
+ // 鍒ゆ柇鏄惁鏈夐敊璇暟鎹紝鏈夊氨瀵煎嚭
+ if(CollectionUtils.isNotEmpty(errorList)){
+ ExcelUtil<BomImportErrorDto> utils = new ExcelUtil<>(BomImportErrorDto.class);
+ utils.exportExcel(response,errorList, "BOM閿欒鏁版嵁");
+ }
}
@@ -258,6 +311,22 @@
util.exportExcel(response, exportList, "BOM缁撴瀯瀵煎嚭");
}
+ @Override
+ public String updateBom(ProductBom productBom) {
+ ProductBom productBom1 = productBomMapper.selectById(productBom.getId());
+ if(productBom.getProductModelId().equals(productBom1.getProductModelId())){
+ productBomMapper.updateById(productBom);
+ }else{
+ boolean b = checkBom(productBom);
+ if(b){
+ throw new ServiceException("浜у搧BOM宸插瓨鍦�");
+ }else{
+ productBomMapper.updateById(productBom);
+ }
+ }
+ return "淇敼鎴愬姛";
+ }
+
private void populateMap(List<ProductStructureDto> nodes, Map<Long, ProductStructureDto> map) {
if (nodes == null || nodes.isEmpty()) {
return;
@@ -276,7 +345,10 @@
ProductModel model = productModelService.getOne(new LambdaQueryWrapper<ProductModel>()
// .eq(ProductModel::getProductId, product.getId())
.eq(ProductModel::getModel, spec).last("limit 1"));
- if (model == null) throw new ServiceException("鍥剧焊缂栧彿鏈淮鎶わ細" + name + "[" + spec + "]");
+ if (model == null){
+ model = new ProductModel();
+ model.setErrorMsg("鍥剧焊缂栧彿鏈淮鎶わ細" + "[" + spec + "]");
+ }
return model;
}
--
Gitblit v1.9.3