From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 176 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
index 91ffbbf..4079f84 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -1,53 +1,77 @@
package com.ruoyi.technology.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.hutool.core.bean.BeanUtil;
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.technology.mapper.TechnologyRoutingMapper;
-import com.ruoyi.technology.mapper.TechnologyRoutingOperationMapper;
-import com.ruoyi.technology.pojo.TechnologyRouting;
-import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.OrderUtils;
+import com.ruoyi.technology.bean.dto.TechnologyRoutingDto;
+import com.ruoyi.technology.bean.vo.TechnologyRoutingVo;
+import com.ruoyi.technology.mapper.*;
+import com.ruoyi.technology.pojo.*;
import com.ruoyi.technology.service.TechnologyRoutingService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class TechnologyRoutingServiceImpl extends ServiceImpl<TechnologyRoutingMapper, TechnologyRouting> implements TechnologyRoutingService {
- @Autowired
- private TechnologyRoutingMapper technologyRoutingMapper;
+ private final TechnologyRoutingMapper technologyRoutingMapper;
- @Autowired
- private TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
+ private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
+
+ private final TechnologyBomStructureMapper technologyBomStructureMapper;
+
+ private final TechnologyOperationMapper technologyOperationMapper;
+ private final TechnologyOperationParamMapper technologyOperationParamMapper;
+ private final TechnologyParamMapper technologyParamMapper;
+ private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
@Override
- public IPage<TechnologyRouting> pageTechnologyRouting(Page<TechnologyRouting> page, TechnologyRouting technologyRouting) {
- LambdaQueryWrapper<TechnologyRouting> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.eq(technologyRouting.getId() != null, TechnologyRouting::getId, technologyRouting.getId())
- .eq(technologyRouting.getProductModelId() != null, TechnologyRouting::getProductModelId, technologyRouting.getProductModelId())
- .eq(technologyRouting.getBomId() != null, TechnologyRouting::getBomId, technologyRouting.getBomId())
- .like(isNotBlank(technologyRouting.getProcessRouteCode()), TechnologyRouting::getProcessRouteCode, technologyRouting.getProcessRouteCode())
- .like(isNotBlank(technologyRouting.getDescription()), TechnologyRouting::getDescription, technologyRouting.getDescription())
- .orderByDesc(TechnologyRouting::getId);
- return this.page(page, queryWrapper);
+ public IPage<TechnologyRoutingVo> pageTechnologyRouting(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
+ return technologyRoutingMapper.pageTechnologyRouting(page, technologyRoutingDto);
+ }
+
+ @Override
+ public TechnologyRoutingVo getTechnologyRoutingInfo(Long id) {
+ TechnologyRouting technologyRouting = this.getById(id);
+ if (technologyRouting == null) {
+ return null;
+ }
+ return BeanUtil.copyProperties(technologyRouting, TechnologyRoutingVo.class);
}
@Override
public Long saveTechnologyRouting(TechnologyRouting technologyRouting) {
- this.save(technologyRouting);
- if (!isNotBlank(technologyRouting.getProcessRouteCode())) {
- technologyRouting.setProcessRouteCode(buildProcessRouteCode(technologyRouting.getId()));
- technologyRoutingMapper.updateById(technologyRouting);
- }
+ String code = OrderUtils.countTodayByCreateTime(technologyRoutingMapper, "GYLX", "process_route_code");
+ technologyRouting.setProcessRouteCode(code);
+ technologyRoutingMapper.insert(technologyRouting);
+ // 甯﹀叆bom浜у搧缁撴瀯
+ syncRoutingOperationsByBom(technologyRouting);
return technologyRouting.getId();
+ }
+
+ @Override
+ public boolean updateTechnologyRouting(TechnologyRouting technologyRouting) {
+ boolean updated = this.updateById(technologyRouting);
+ if (updated) {
+ TechnologyRouting currentRouting = this.getById(technologyRouting.getId());
+ syncRoutingOperationsByBom(currentRouting);
+ }
+ return updated;
}
@Override
@@ -55,11 +79,139 @@
if (ids == null || ids.isEmpty()) {
return false;
}
+ List<TechnologyRoutingOperation> routingOperationList = technologyRoutingOperationMapper.selectList(
+ Wrappers.<TechnologyRoutingOperation>lambdaQuery()
+ .in(TechnologyRoutingOperation::getTechnologyRoutingId, ids));
+ if (!routingOperationList.isEmpty()) {
+ List<Long> routingOperationIdList = routingOperationList.stream().map(TechnologyRoutingOperation::getId).collect(Collectors.toList());
+ technologyRoutingOperationParamMapper.delete(Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
+ .in(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, routingOperationIdList));
+ }
technologyRoutingOperationMapper.delete(Wrappers.<TechnologyRoutingOperation>lambdaQuery()
.in(TechnologyRoutingOperation::getTechnologyRoutingId, ids));
return this.removeByIds(ids);
}
+ /**
+ * 鎸夊綋鍓嶉�夋嫨鐨� BOM 閲嶅缓宸ヨ壓璺嚎宸ュ簭锛�
+ * 1. 鍏堝垹闄よ宸ヨ壓璺嚎涓嬪凡鏈夊伐搴�
+ * 2. 璇诲彇 BOM 缁撴瀯涓殑 operation_id
+ * 3. 鎸� BOM 鍑虹幇椤哄簭鍘婚噸鍚庨噸鏂板啓鍏ュ伐鑹鸿矾绾垮伐搴忚〃
+ */
+ private void syncRoutingOperationsByBom(TechnologyRouting technologyRouting) {
+ List<TechnologyRoutingOperation> oldRoutingOperationList = technologyRoutingOperationMapper.selectList(
+ Wrappers.<TechnologyRoutingOperation>lambdaQuery()
+ .eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId()));
+ if (!oldRoutingOperationList.isEmpty()) {
+ List<Long> oldRoutingOperationIdList = oldRoutingOperationList.stream().map(TechnologyRoutingOperation::getId).collect(Collectors.toList());
+ technologyRoutingOperationParamMapper.delete(Wrappers.<TechnologyRoutingOperationParam>lambdaQuery()
+ .in(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, oldRoutingOperationIdList));
+ technologyRoutingOperationMapper.delete(Wrappers.<TechnologyRoutingOperation>lambdaQuery()
+ .eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId()));
+ }
+ if (technologyRouting.getBomId() == null) {
+ return;
+ }
+ List<TechnologyBomStructure> bomStructures = technologyBomStructureMapper.selectList(
+ Wrappers.<TechnologyBomStructure>lambdaQuery()
+ .eq(TechnologyBomStructure::getBomId, technologyRouting.getBomId())
+ .isNotNull(TechnologyBomStructure::getOperationId)
+ .orderByDesc(TechnologyBomStructure::getId)
+ );
+ if (bomStructures.isEmpty()) {
+ throw new ServiceException("bom浜у搧缁撴瀯涓虹┖锛�");
+ }
+
+ // 鍚屼竴涓� BOM 涓彲鑳介噸澶嶅紩鐢ㄧ浉鍚屽伐搴忥紝鎸夌収涓婁竴灞傜殑鐖惰妭鐐圭殑浜у搧鏄惁鐩稿悓鍜屽伐搴忔槸鍚︾浉鍚�
+ Map<Long, TechnologyBomStructure> structureById = new HashMap<>();
+ for (TechnologyBomStructure bomStructure : bomStructures) {
+ if (bomStructure != null && bomStructure.getId() != null) {
+ structureById.put(bomStructure.getId(), bomStructure);
+ }
+ }
+
+ Map<String, TechnologyBomStructure> uniqueOperationMap = new LinkedHashMap<>();
+ for (TechnologyBomStructure bomStructure : bomStructures) {
+ Long outputProductModelId = resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId());
+ uniqueOperationMap.putIfAbsent(buildBomOperationDedupKey(bomStructure, outputProductModelId), bomStructure);
+ }
+
+ int dragSort = 1;
+ for (TechnologyBomStructure bomStructure : uniqueOperationMap.values()) {
+ TechnologyRoutingOperation routingOperation = new TechnologyRoutingOperation();
+ routingOperation.setTechnologyRoutingId(technologyRouting.getId());
+ routingOperation.setProductModelId(resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId()));
+ routingOperation.setTechnologyOperationId(bomStructure.getOperationId());
+ routingOperation.setDragSort(dragSort++);
+ routingOperation.setIsQuality(getOperationQuality(bomStructure.getOperationId()));
+ technologyRoutingOperationMapper.insert(routingOperation);
+ syncRoutingOperationParams(routingOperation.getId(), bomStructure.getOperationId());
+ }
+ }
+
+ private String buildBomOperationDedupKey(TechnologyBomStructure bomStructure, Long outputProductModelId) {
+ Long operationId = bomStructure == null ? null : bomStructure.getOperationId();
+ Long parentId = bomStructure == null ? null : bomStructure.getParentId();
+ return operationId + "#"
+ + outputProductModelId + "#"
+ + parentId;
+ }
+
+ private Long resolveOutputProductModelId(TechnologyBomStructure bomStructure,
+ Map<Long, TechnologyBomStructure> structureById,
+ Long routingProductModelId) {
+ if (bomStructure == null) {
+ return routingProductModelId;
+ }
+ Long parentId = bomStructure.getParentId();
+ if (parentId == null) {
+ return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
+ }
+ TechnologyBomStructure parent = structureById.get(parentId);
+ if (parent != null && parent.getProductModelId() != null) {
+ return parent.getProductModelId();
+ }
+ return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
+ }
+
+ private void syncRoutingOperationParams(Long technologyRoutingOperationId, Long technologyOperationId) {
+ List<TechnologyOperationParam> operationParamList = technologyOperationParamMapper.selectList(
+ Wrappers.<TechnologyOperationParam>lambdaQuery()
+ .eq(TechnologyOperationParam::getTechnologyOperationId, technologyOperationId)
+ .orderByAsc(TechnologyOperationParam::getId));
+ if (operationParamList.isEmpty()) {
+ return;
+ }
+ for (TechnologyOperationParam operationParam : operationParamList) {
+ TechnologyParam technologyParam = technologyParamMapper.selectById(operationParam.getTechnologyParamId());
+ if (technologyParam == null) {
+ continue;
+ }
+ TechnologyRoutingOperationParam snapshot = new TechnologyRoutingOperationParam();
+ snapshot.setTechnologyRoutingOperationId(technologyRoutingOperationId);
+ snapshot.setTechnologyOperationParamId(operationParam.getId());
+ snapshot.setTechnologyOperationId(operationParam.getTechnologyOperationId());
+ snapshot.setParamId(technologyParam.getId());
+ snapshot.setParamCode(technologyParam.getParamCode());
+ snapshot.setParamName(technologyParam.getParamName());
+ snapshot.setParamType(technologyParam.getParamType());
+ snapshot.setParamFormat(technologyParam.getParamFormat());
+ snapshot.setUnit(technologyParam.getUnit());
+ snapshot.setIsRequired(technologyParam.getIsRequired());
+ snapshot.setRemark(technologyParam.getRemark());
+ snapshot.setStandardValue(operationParam.getStandardValue());
+ technologyRoutingOperationParamMapper.insert(snapshot);
+ }
+ }
+
+ /**
+ * 璐ㄦ鏍囪瘑浠ュ伐搴忓熀纭�琛ㄥ畾涔変负鍑嗐��
+ */
+ private Boolean getOperationQuality(Long operationId) {
+ TechnologyOperation technologyOperation = technologyOperationMapper.selectById(operationId);
+ return technologyOperation != null ? technologyOperation.getIsQuality() : null;
+ }
+
private String buildProcessRouteCode(Long id) {
String dateStr = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String idStr = String.format("%06d", id);
--
Gitblit v1.9.3