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/TechnologyRoutingServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 14 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 e112b7d..6066cb7 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -6,10 +6,16 @@
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.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.TechnologyBomStructureMapper;
+import com.ruoyi.technology.mapper.TechnologyOperationMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingMapper;
import com.ruoyi.technology.mapper.TechnologyRoutingOperationMapper;
+import com.ruoyi.technology.pojo.TechnologyBomStructure;
+import com.ruoyi.technology.pojo.TechnologyOperation;
import com.ruoyi.technology.pojo.TechnologyRouting;
import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import com.ruoyi.technology.service.TechnologyRoutingService;
@@ -19,7 +25,9 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
@Service
@Transactional(rollbackFor = Exception.class)
@@ -30,17 +38,13 @@
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
+ private final TechnologyBomStructureMapper technologyBomStructureMapper;
+
+ private final TechnologyOperationMapper technologyOperationMapper;
+
@Override
public IPage<TechnologyRoutingVo> pageTechnologyRouting(Page<TechnologyRoutingDto> page, TechnologyRoutingDto technologyRoutingDto) {
- LambdaQueryWrapper<TechnologyRouting> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.eq(technologyRoutingDto.getId() != null, TechnologyRouting::getId, technologyRoutingDto.getId())
- .eq(technologyRoutingDto.getProductModelId() != null, TechnologyRouting::getProductModelId, technologyRoutingDto.getProductModelId())
- .eq(technologyRoutingDto.getBomId() != null, TechnologyRouting::getBomId, technologyRoutingDto.getBomId())
- .like(isNotBlank(technologyRoutingDto.getProcessRouteCode()), TechnologyRouting::getProcessRouteCode, technologyRoutingDto.getProcessRouteCode())
- .like(isNotBlank(technologyRoutingDto.getDescription()), TechnologyRouting::getDescription, technologyRoutingDto.getDescription())
- .orderByDesc(TechnologyRouting::getId);
- Page<TechnologyRouting> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
- return this.page(entityPage, queryWrapper).convert(item -> BeanUtil.copyProperties(item, TechnologyRoutingVo.class));
+ return technologyRoutingMapper.pageTechnologyRouting(page, technologyRoutingDto);
}
@Override
@@ -54,12 +58,22 @@
@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
@@ -72,6 +86,54 @@
return this.removeByIds(ids);
}
+ /**
+ * 鎸夊綋鍓嶉�夋嫨鐨� BOM 閲嶅缓宸ヨ壓璺嚎宸ュ簭锛�
+ * 1. 鍏堝垹闄よ宸ヨ壓璺嚎涓嬪凡鏈夊伐搴�
+ * 2. 璇诲彇 BOM 缁撴瀯涓殑 operation_id
+ * 3. 鎸� BOM 鍑虹幇椤哄簭鍘婚噸鍚庨噸鏂板啓鍏ュ伐鑹鸿矾绾垮伐搴忚〃
+ */
+ private void syncRoutingOperationsByBom(TechnologyRouting technologyRouting) {
+ 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, Long.valueOf(technologyRouting.getBomId()))
+ .isNotNull(TechnologyBomStructure::getOperationId)
+ .orderByAsc(TechnologyBomStructure::getId)
+ );
+ if (bomStructures.isEmpty()) {
+ throw new ServiceException("bom浜у搧缁撴瀯涓虹┖锛�");
+ }
+
+ // 鍚屼竴涓� BOM 涓彲鑳介噸澶嶅紩鐢ㄧ浉鍚屽伐搴忥紝杩欓噷鎸夐娆″嚭鐜伴『搴忓幓閲嶃��
+ Map<Long, TechnologyBomStructure> uniqueOperationMap = new LinkedHashMap<>();
+ for (TechnologyBomStructure bomStructure : bomStructures) {
+ uniqueOperationMap.putIfAbsent(bomStructure.getOperationId(), bomStructure);
+ }
+
+ int dragSort = 1;
+ for (TechnologyBomStructure bomStructure : uniqueOperationMap.values()) {
+ TechnologyRoutingOperation routingOperation = new TechnologyRoutingOperation();
+ routingOperation.setTechnologyRoutingId(technologyRouting.getId());
+ routingOperation.setProductModelId(technologyRouting.getProductModelId());
+ routingOperation.setTechnologyOperationId(bomStructure.getOperationId());
+ routingOperation.setDragSort(dragSort++);
+ routingOperation.setIsQuality(getOperationQuality(bomStructure.getOperationId()));
+ technologyRoutingOperationMapper.insert(routingOperation);
+ }
+ }
+
+ /**
+ * 璐ㄦ鏍囪瘑浠ュ伐搴忓熀纭�琛ㄥ畾涔変负鍑嗐��
+ */
+ 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