From 19effb2444eaf331f61fd0d43d3735f8d1baf768 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 18 三月 2026 10:14:44 +0800
Subject: [PATCH] fix: BOM的子集取消第一层限制
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 43a8942..c16401e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java
@@ -18,6 +18,8 @@
import com.ruoyi.production.pojo.ProductProcess;
import com.ruoyi.production.pojo.ProductStructure;
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;
@@ -42,7 +44,6 @@
@Autowired
private ProductBomMapper productBomMapper;
-
@Autowired
private ProductStructureService productStructureService;
@@ -55,39 +56,31 @@
@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("璇烽�夋嫨浜у搧妯″瀷");
- }
-
- ProductMaterialSku productModel = productMaterialSkuService.getById(productBom.getProductModelId());
- if (productModel == null) {
- throw new ServiceException("閫夋嫨鐨勪骇鍝佹ā鍨嬩笉瀛樺湪");
- }
- ProductMaterial productMaterial = productMaterialService.getById(productModel.getProductId());
-
- // 娣诲姞鍒濆鐨勪骇鍝佺粨鏋�
- ProductStructure productStructure = new ProductStructure();
- productStructure.setProductModelId(productBom.getProductModelId());
- productStructure.setUnit(productMaterial != null ? productMaterial.getUnit() : null);
- productStructure.setUnitQuantity(BigDecimal.valueOf(1));
- productStructure.setBomId(productBom.getId());
-
- productStructureService.save(productStructure);
return AjaxResult.success();
}
@@ -96,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 {
@@ -105,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 -> {
@@ -122,7 +124,7 @@
BomImportDto first = list.get(0);
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()));
@@ -313,5 +315,3 @@
return s.replaceAll("[\\u00A0\\u3000]", "").trim();
}
}
-
-
--
Gitblit v1.9.3