From 3066a8f5c1f475997bfe23857ba4bae9395900c4 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 13 八月 2026 10:19:24 +0800
Subject: [PATCH] fix: 领料功能修改，移除订单领料，添加工序领料功能，支持按工序查询物料与已领料记录
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 346 insertions(+), 8 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 3c6cfca..f0b8bb3 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyBomServiceImpl.java
@@ -1,20 +1,358 @@
package com.ruoyi.technology.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.technology.bean.dto.BomImportDto;
+import com.ruoyi.technology.bean.dto.TechnologyBomDto;
+import com.ruoyi.technology.bean.vo.TechnologyBomStructureVo;
+import com.ruoyi.technology.bean.vo.TechnologyBomVo;
import com.ruoyi.technology.mapper.TechnologyBomMapper;
+import com.ruoyi.technology.mapper.TechnologyOperationMapper;
+import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.pojo.TechnologyBom;
+import com.ruoyi.technology.pojo.TechnologyBomStructure;
+import com.ruoyi.technology.pojo.TechnologyOperation;
+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;
-/**
- * <p>
- * BOM琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-20 10:05:55
- */
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
@Service
+@RequiredArgsConstructor
public class TechnologyBomServiceImpl extends ServiceImpl<TechnologyBomMapper, TechnologyBom> implements TechnologyBomService {
+ private final TechnologyBomMapper technologyBomMapper;
+ private final IProductModelService productModelService;
+ private final TechnologyBomStructureService technologyBomStructureService;
+ private final TechnologyRoutingMapper technologyRoutingMapper;
+ private final IProductService productService;
+ private final TechnologyOperationMapper technologyOperationMapper;
+
+ /**
+ * 鍒嗛〉鏌ヨBOM鍒楄〃銆�
+ */
+ @Override
+ public IPage<TechnologyBomVo> listPage(Page<TechnologyBomDto> page, TechnologyBomDto technologyBomDto) {
+ return technologyBomMapper.listPage(page, technologyBomDto);
+ }
+
+ /**
+ * 鏍规嵁瑙勬牸鏌ヨBOM骞惰浆鎹负杩斿洖瀵硅薄銆�
+ */
+ @Override
+ public List<TechnologyBomVo> listByModel(Long productModelId) {
+ List<TechnologyBom> list = this.list(Wrappers.<TechnologyBom>lambdaQuery()
+ .eq(TechnologyBom::getProductModelId, productModelId));
+ List<TechnologyBomVo> result = new ArrayList<>(list.size());
+ for (TechnologyBom item : list) {
+ TechnologyBomVo vo = new TechnologyBomVo();
+ vo.setId(item.getId());
+ vo.setProductModelId(item.getProductModelId());
+ vo.setRemark(item.getRemark());
+ vo.setVersion(item.getVersion());
+ vo.setCreateTime(item.getCreateTime());
+ vo.setUpdateTime(item.getUpdateTime());
+ vo.setCreateUser(item.getCreateUser());
+ vo.setUpdateUser(item.getUpdateUser());
+ vo.setBomNo(item.getBomNo());
+ vo.setDeptId(item.getDeptId());
+ result.add(vo);
+ }
+ return result;
+ }
+
+ /**
+ * 鏂板BOM銆侭OM涓昏〃鏈韩鍗充唬琛ㄦ垚鍝佽鏍硷紝鏄庣粏琛ㄤ笉鍐嶅啓鍏ユ垚鍝佹牴鑺傜偣銆�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R add(TechnologyBom technologyBom) {
+ validateProductModel(technologyBom.getProductModelId());
+ boolean saved = technologyBomMapper.insert(technologyBom) > 0;
+ if (!saved) {
+ return R.fail("Add BOM failed");
+ }
+ technologyBom.setBomNo("BM." + String.format("%05d", technologyBom.getId()));
+ technologyBomMapper.updateById(technologyBom);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼BOM銆傛垚鍝佽鏍煎彉鍖栨椂鍚屾鍒锋柊宸ヨ壓璺嚎鐨勬垚鍝佽鏍硷紝
+ * 骞舵竻鐞嗕笌鏂版垚鍝佽鏍煎啿绐佺殑鐗╂枡琛岋紙鎴愬搧涓嶈兘浣滀负鑷韩鐗╂枡锛夛紝鍏朵綑鐗╂枡-宸ュ簭鍏崇郴淇濈暀銆�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R update(TechnologyBom technologyBom) {
+ if (technologyBom.getId() == null) {
+ throw new ServiceException("BOM ID涓嶈兘涓虹┖");
+ }
+ validateProductModel(technologyBom.getProductModelId());
+ TechnologyBom oldBom = technologyBomMapper.selectById(technologyBom.getId());
+ if (oldBom == null) {
+ throw new ServiceException("BOM涓嶅瓨鍦�");
+ }
+ if (oldBom.getProductModelId() != null && !oldBom.getProductModelId().equals(technologyBom.getProductModelId())) {
+ technologyRoutingMapper.updateProductModelByBomId(technologyBom.getProductModelId(), technologyBom.getId().longValue());
+ technologyBomStructureService.remove(Wrappers.<TechnologyBomStructure>lambdaQuery()
+ .eq(TechnologyBomStructure::getBomId, technologyBom.getId().longValue())
+ .eq(TechnologyBomStructure::getProductModelId, technologyBom.getProductModelId()));
+ }
+ if (technologyBom.getBomNo() == null) {
+ technologyBom.setBomNo(oldBom.getBomNo());
+ }
+ technologyBomMapper.updateById(technologyBom);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎BOM鍓嶆牎楠屾槸鍚﹀凡琚伐鑹鸿矾绾垮紩鐢ㄣ��
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean batchDelete(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ throw new ServiceException("璇疯嚦灏戦�夋嫨涓�涓狟OM");
+ }
+ List<TechnologyRouting> list = technologyRoutingMapper.selectList(Wrappers.<TechnologyRouting>lambdaQuery()
+ .in(TechnologyRouting::getBomId, ids));
+ if (!list.isEmpty()) {
+ throw new ServiceException("BOM宸茶宸ヨ壓璺嚎寮曠敤锛屼笉鑳藉垹闄�");
+ }
+ technologyBomStructureService.remove(Wrappers.<TechnologyBomStructure>lambdaQuery()
+ .in(TechnologyBomStructure::getBomId, ids));
+ return this.removeBatchByIds(ids);
+ }
+
+ /**
+ * 鏍￠獙浜у搧瑙勬牸鏄惁瀛樺湪銆�
+ */
+ private void validateProductModel(Long productModelId) {
+ if (productModelId == null) {
+ throw new ServiceException("浜у搧瑙勬牸ID涓嶈兘涓虹┖");
+ }
+ ProductModel productModel = productModelService.getById(productModelId);
+ if (productModel == null) {
+ throw new ServiceException("浜у搧瑙勬牸涓嶅瓨鍦�");
+ }
+ }
+
+ /**
+ * 瀵煎叆鎵佸钩BOM锛氭瘡琛� = 鎴愬搧 + 涓�涓墿鏂欒鏍� + 娑堣�楀伐搴忋��
+ * 鍚屼竴娆″鍏ョ殑鎵�鏈夎蹇呴』灞炰簬鍚屼竴涓垚鍝侊紱鏃х殑鐖跺瓙/鍗曚綅鐢ㄩ噺妯℃澘浼氳鏄庣‘鎷掔粷銆�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R uploadBom(MultipartFile file) {
+ ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
+ List<BomImportDto> list;
+ try {
+ list = util.importExcel(file.getInputStream());
+ } catch (Exception e) {
+ return R.fail("Excel瑙ｆ瀽澶辫触");
+ }
+
+ if (list == null || list.isEmpty()) {
+ return R.fail("鏁版嵁涓虹┖");
+ }
+
+ list.forEach(dto -> {
+ dto.setProductName(clean(dto.getProductName()));
+ dto.setProductSpec(clean(dto.getProductSpec()));
+ dto.setMaterialName(clean(dto.getMaterialName()));
+ dto.setMaterialSpec(clean(dto.getMaterialSpec()));
+ dto.setProcess(clean(dto.getProcess()));
+ });
+
+ boolean templateMatched = list.stream().anyMatch(dto -> StringUtils.isNotBlank(dto.getProductName())
+ && StringUtils.isNotBlank(dto.getMaterialName()));
+ if (!templateMatched) {
+ return R.fail("BOM瀵煎叆妯℃澘宸叉洿鏂颁负鎵佸钩缁撴瀯锛岃浣跨敤鏈�鏂版ā鏉匡紙鎴愬搧浜у搧鍚嶇О/瑙勬牸銆佺墿鏂欎骇鍝佸悕绉�/瑙勬牸銆佹秷鑰楀伐搴忥級");
+ }
+
+ BomImportDto first = list.get(0);
+ ProductModel productModel = findModel(first.getProductName(), first.getProductSpec());
+ TechnologyBom bom = new TechnologyBom();
+ bom.setProductModelId(productModel.getId());
+ bom.setVersion("1.0");
+ bom.setRemark(first.getRemark());
+ technologyBomMapper.insert(bom);
+ bom.setBomNo("BM." + String.format("%05d", bom.getId()));
+ technologyBomMapper.updateById(bom);
+
+ Map<String, Long> operationIdByName = new HashMap<>();
+ for (TechnologyOperation operation : technologyOperationMapper.selectList(null)) {
+ if (StringUtils.isNotBlank(operation.getName())) {
+ operationIdByName.putIfAbsent(operation.getName().trim(), operation.getId());
+ }
+ }
+
+ Set<String> relationKeys = new HashSet<>();
+ for (int i = 0; i < list.size(); i++) {
+ BomImportDto dto = list.get(i);
+ int rowNo = i + 2;
+ if (StringUtils.isBlank(dto.getMaterialName())) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岀己灏戠墿鏂欎骇鍝佸悕绉�");
+ }
+ if (StringUtils.isNotBlank(dto.getProductName())
+ && !sameModel(dto, first)) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岀殑鎴愬搧涓庣涓�琛屼笉涓�鑷达紝涓�娆″鍏ュ彧鑳界淮鎶や竴涓狟OM");
+ }
+ if (StringUtils.isBlank(dto.getProcess())) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岀己灏戞秷鑰楀伐搴�");
+ }
+ Long operationId = operationIdByName.get(dto.getProcess());
+ if (operationId == null) {
+ throw new ServiceException("瀵煎叆澶辫触锛氬伐搴忔湭缁存姢[" + dto.getProcess() + "]锛堢" + rowNo + "琛岋級");
+ }
+
+ ProductModel materialModel = findModel(dto.getMaterialName(), dto.getMaterialSpec());
+ if (materialModel.getId().equals(productModel.getId())) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛屾垚鍝佽鏍间笉鑳戒綔涓鸿嚜韬殑鐗╂枡");
+ }
+ if (!relationKeys.add(materialModel.getId() + "#" + operationId)) {
+ throw new ServiceException("瀵煎叆澶辫触锛氱" + rowNo + "琛岀墿鏂欎笌宸ュ簭閲嶅閰嶇疆");
+ }
+
+ TechnologyBomStructure node = new TechnologyBomStructure();
+ node.setBomId(bom.getId().longValue());
+ node.setProductModelId(materialModel.getId());
+ node.setOperationId(operationId);
+ technologyBomStructureService.save(node);
+ }
+
+ return R.ok("BOM瀵煎叆鎴愬姛");
+ }
+
+ /**
+ * 瀵煎嚭鎵佸钩BOM锛氭垚鍝� + 鐗╂枡 + 娑堣�楀伐搴忋��
+ */
+ @Override
+ public void exportBom(HttpServletResponse response, Long bomId) {
+ if (bomId == null) {
+ throw new ServiceException("BOM ID涓嶈兘涓虹┖");
+ }
+ TechnologyBom bom = technologyBomMapper.selectById(bomId);
+ if (bom == null) {
+ throw new ServiceException("BOM涓嶅瓨鍦�");
+ }
+
+ List<TechnologyBomStructureVo> detailList = technologyBomStructureService.listByBomId(bomId);
+ if (detailList == null || detailList.isEmpty()) {
+ return;
+ }
+
+ ProductModel productModel = productModelService.getById(bom.getProductModelId());
+ String productName = null;
+ if (productModel != null && productModel.getProductId() != null) {
+ Product product = productService.getById(productModel.getProductId());
+ productName = product == null ? null : product.getProductName();
+ }
+
+ List<BomImportDto> exportList = new ArrayList<>(detailList.size());
+ for (TechnologyBomStructureVo detail : detailList) {
+ BomImportDto row = new BomImportDto();
+ row.setProductName(productName);
+ row.setProductSpec(productModel == null ? null : productModel.getModel());
+ row.setProductCode(productModel == null ? null : productModel.getProductCode());
+ row.setMaterialName(detail.getProductName());
+ row.setMaterialSpec(detail.getModel());
+ row.setMaterialCode(detail.getProductCode());
+ row.setProcess(detail.getOperationName());
+ exportList.add(row);
+ }
+
+ ExcelUtil<BomImportDto> util = new ExcelUtil<>(BomImportDto.class);
+ util.exportExcel(response, exportList, "BOM缁撴瀯瀵煎嚭");
+ }
+
+ /**
+ * 澶嶅埗BOM锛氬鍒舵垚鍝佽鏍间笌鍏ㄩ儴鎵佸钩鐗╂枡-宸ュ簭鍏崇郴銆�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R copy(TechnologyBom technologyBom) {
+ if (technologyBom == null || technologyBom.getId() == null) {
+ throw new ServiceException("BOM ID涓嶈兘涓虹┖");
+ }
+ TechnologyBom oldTechnologyBom = technologyBomMapper.selectById(technologyBom.getId());
+ if (oldTechnologyBom == null) {
+ throw new ServiceException("BOM涓嶅瓨鍦�");
+ }
+ validateProductModel(oldTechnologyBom.getProductModelId());
+
+ TechnologyBom newTechnologyBom = new TechnologyBom();
+ newTechnologyBom.setProductModelId(oldTechnologyBom.getProductModelId());
+ newTechnologyBom.setVersion("FZ" + oldTechnologyBom.getVersion());
+ newTechnologyBom.setRemark(oldTechnologyBom.getRemark());
+ boolean saved = technologyBomMapper.insert(newTechnologyBom) > 0;
+ if (!saved) {
+ return R.fail("Copy BOM failed");
+ }
+ newTechnologyBom.setBomNo("BM." + String.format("%05d", newTechnologyBom.getId()));
+ technologyBomMapper.updateById(newTechnologyBom);
+
+ List<TechnologyBomStructureVo> oldDetailList =
+ technologyBomStructureService.listByBomId(technologyBom.getId().longValue());
+ if (oldDetailList != null && !oldDetailList.isEmpty()) {
+ List<TechnologyBomStructure> newDetailList = new ArrayList<>(oldDetailList.size());
+ for (TechnologyBomStructureVo oldDetail : oldDetailList) {
+ TechnologyBomStructure newDetail = new TechnologyBomStructure();
+ newDetail.setBomId(newTechnologyBom.getId().longValue());
+ newDetail.setProductModelId(oldDetail.getProductModelId());
+ newDetail.setOperationId(oldDetail.getOperationId());
+ newDetailList.add(newDetail);
+ }
+ technologyBomStructureService.saveBatch(newDetailList);
+ }
+ return R.ok();
+ }
+
+ private boolean sameModel(BomImportDto row, BomImportDto first) {
+ return StringUtils.equals(row.getProductName(), first.getProductName())
+ && StringUtils.equals(defaultBlank(row.getProductSpec()), defaultBlank(first.getProductSpec()));
+ }
+
+ private String defaultBlank(String value) {
+ return value == null ? "" : value;
+ }
+
+ private ProductModel findModel(String name, String spec) {
+ Product product = productService.getOne(new LambdaQueryWrapper<Product>()
+ .eq(Product::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"));
+ if (model == null) throw new ServiceException("瑙勬牸鏈淮鎶わ細" + name + "[" + spec + "]");
+ return model;
+ }
+
+ private String clean(String s) {
+ if (s == null) return null;
+ return s.replaceAll("[\\u00A0\\u3000]", "").trim();
+ }
}
--
Gitblit v1.9.3