From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/java/com/ruoyi/production/service/impl/ProductBomServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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..91dbec8 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;
@@ -103,14 +105,17 @@
* @param children 褰撳墠鐖堕」鐨勫瓙椤瑰垪琛�
* @return 淇濆瓨鍚庣殑鐖堕」浜у搧ID
*/
- private void saveBomRecursive(List<BomImportDto> children,ProductBom bom,ProductModel rootModel,Map<String, Long> processMap) {
+ private void saveBomRecursive(List<BomImportDto> children,
+ ProductBom bom,ProductModel rootModel,
+ Map<String, Long> processMap,
+ List<BomImportErrorDto> errorList ) {
// 1. 鑾峰彇children涓瓙椤逛骇鍝佺紪鍙蜂负绌虹殑鏁版嵁
List<BomImportDto> parentChildren = children
.stream()
.filter(child -> StringUtils.isEmpty(child.getChildCode()))
.collect(Collectors.toList());
if(CollectionUtils.isEmpty(parentChildren)){
- throw new ServiceException("璇烽�夋嫨鐖堕」浜у搧缂栧彿");
+ return;
}
BomImportDto parentId = parentChildren.get(0); // 鐖剁骇鏁版嵁
ProductStructure rootNode = new ProductStructure();
@@ -129,7 +134,13 @@
}
// 鑾峰彇瀛愰」妯″瀷淇℃伅
ProductModel childModel = findModel(child.getChildName(), child.getChildSpec());
-
+ 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 +158,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,11 +183,20 @@
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());
+ 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");
@@ -185,9 +205,13 @@
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閿欒鏁版嵁");
+ }
}
@@ -276,7 +300,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