From c1babcfa8a9cd01dbeb8527a6a95cbcc431957c7 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 22 四月 2026 10:42:35 +0800
Subject: [PATCH] fix:生产模块
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
index 536df14..4eba028 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
@@ -13,9 +13,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.BomImportDto;
-import com.ruoyi.production.dto.ProductStructureDto;
-import com.ruoyi.production.pojo.ProductStructure;
+import com.ruoyi.production.bean.dto.BomImportDto;
+import com.ruoyi.production.bean.dto.ProductStructureDto;
import com.ruoyi.technology.bean.dto.TechnologyBomDto;
import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.mapper.TechnologyBomMapper;
@@ -25,12 +24,12 @@
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.service.TechnologyBomService;
import com.ruoyi.technology.service.TechnologyBomStructureService;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -127,7 +126,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean batchDelete(List<Integer> ids) {
+ public boolean batchDelete(List<Long> ids) {
if (ids == null || ids.isEmpty()) {
throw new ServiceException("Select at least one BOM");
}
@@ -212,13 +211,13 @@
//澶勭悊鏍硅妭鐐�,绗竴琛屼笖瀛愰」涓虹┖
if (i == 0 && StringUtils.isBlank(dto.getChildName())) {
- ProductStructure rootNode = new ProductStructure();
- rootNode.setBomId(bom.getId());
+ TechnologyBomStructure rootNode = new TechnologyBomStructure();
+ rootNode.setBomId(bom.getId().longValue());
rootNode.setParentId(null); // 椤跺眰娌℃湁鐖惰妭鐐�
rootNode.setProductModelId(rootModel.getId());
rootNode.setUnitQuantity(BigDecimal.ONE);
rootNode.setUnit(rootModel.getUnit());
-// productStructureService.save(rootNode);
+ technologyBomStructureService.save(rootNode);
treePathMap.put(parentKey, rootNode.getId());
continue;
@@ -236,8 +235,8 @@
ProductModel childModel = findModel(dto.getChildName(), dto.getChildSpec());
// 鎻掑叆缁撴瀯琛�
- ProductStructure node = new ProductStructure();
- node.setBomId(bom.getId());
+ TechnologyBomStructure node = new TechnologyBomStructure();
+ node.setBomId(bom.getId().longValue());
node.setParentId(parentStructureId); // 鐖惰妭鐐笽D
node.setProductModelId(childModel.getId());
node.setUnitQuantity(dto.getUnitQty());
@@ -245,7 +244,7 @@
// if (processMap.containsKey(dto.getProcess())) {
// node.setProcessId(processMap.get(dto.getProcess()));
// }
-// productStructureService.save(node);
+ technologyBomStructureService.save(node);
// 鎶婂綋鍓嶅瓙椤硅褰曞埌 Map,浣滀负浠ュ悗鏇存繁灞傜骇鐨勭埗椤规煡鎵句緷鎹�
// 鍚屼竴鐖堕」涓嬬殑鍚屽悕瀛愰」涓嶉渶瑕侀噸澶嶈褰�
--
Gitblit v1.9.3