From bb80ead86615da40c73ed60a04944461e52929e7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 20 三月 2026 16:19:25 +0800
Subject: [PATCH] fix: 工艺路线查询未携带状态
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java | 190 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 190 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java
new file mode 100644
index 0000000..e5fdd97
--- /dev/null
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemServiceImpl.java
@@ -0,0 +1,190 @@
+package com.ruoyi.production.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.production.dto.ProductionOrderRouteItemDto;
+import com.ruoyi.production.mapper.ProductionOrderRouteItemMapper;
+import com.ruoyi.production.pojo.ProductProcess;
+import com.ruoyi.production.pojo.ProductProcessParam;
+import com.ruoyi.production.pojo.ProductionOrderRouteItem;
+import com.ruoyi.production.pojo.ProductionOrderRouteItemParam;
+import com.ruoyi.production.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 鐢熶骇璁㈠崟缁戝畾鐨勫伐鑹鸿矾绾�--宸ュ簭琛� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author deslrey
+ * @since 2026-03-20
+ */
+@Slf4j
+@Service
+public class ProductionOrderRouteItemServiceImpl extends ServiceImpl<ProductionOrderRouteItemMapper, ProductionOrderRouteItem> implements IProductionOrderRouteItemService {
+
+ @Resource
+ private ProductProcessService productProcessService;
+
+ @Resource
+ private IProductionOrderRouteItemParamService productionOrderRouteItemParamService;
+
+ @Resource
+ private ProcessRouteItemParamService processRouteItemParamService;
+
+ @Resource
+ private ProductProcessParamService productProcessParamService;
+
+ @Override
+ public List<ProductionOrderRouteItemDto> getProcessItem(Long orderId) {
+ List<ProductionOrderRouteItem> list = list(new LambdaQueryWrapper<ProductionOrderRouteItem>()
+ .eq(ProductionOrderRouteItem::getOrderId, orderId)
+ .orderByAsc(ProductionOrderRouteItem::getDragSort));
+ return list.stream().map(item -> {
+ ProductionOrderRouteItemDto dto = new ProductionOrderRouteItemDto();
+ BeanUtils.copyProperties(item, dto);
+ if (item.getProcessId() != null) {
+ ProductProcess process = productProcessService.getById(item.getProcessId());
+ if (process != null) {
+ dto.setProcessName(process.getName());
+ }
+ }
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ @Override
+ public void addProcessItem(ProductionOrderRouteItemDto dto) {
+ if (dto == null) {
+ throw new ServiceException("鏂板鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (dto.getOrderId() == null) {
+ throw new ServiceException("鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (dto.getProcessId() == null) {
+ throw new ServiceException("宸ュ簭ID涓嶈兘涓虹┖");
+ }
+ ProductionOrderRouteItem entity = new ProductionOrderRouteItem();
+ BeanUtils.copyProperties(dto, entity);
+ entity.setId(null);
+ entity.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+ entity.setCreateTime(LocalDateTime.now());
+
+ // 鍙栧綋鍓嶈鍗曚笅鏈�澶� dragSort + 1
+ ProductionOrderRouteItem maxSortItem = getOne(new LambdaQueryWrapper<ProductionOrderRouteItem>()
+ .eq(ProductionOrderRouteItem::getOrderId, dto.getOrderId())
+ .orderByDesc(ProductionOrderRouteItem::getDragSort)
+ .last("limit 1"));
+ entity.setDragSort(maxSortItem != null && maxSortItem.getDragSort() != null ? maxSortItem.getDragSort() + 1 : 1);
+ save(entity);
+
+ // 杩佺Щ璇ュ伐搴忕殑鍩虹鍙傛暟
+ List<ProductProcessParam> processParams = productProcessParamService.list(
+ new LambdaQueryWrapper<ProductProcessParam>().eq(ProductProcessParam::getProcessId, dto.getProcessId()));
+ if (!processParams.isEmpty()) {
+ List<ProductionOrderRouteItemParam> orderParams = processParams.stream().map(p -> {
+ ProductionOrderRouteItemParam op = new ProductionOrderRouteItemParam();
+ BeanUtils.copyProperties(p, op, "id");
+ op.setOrderId(dto.getOrderId());
+ op.setRouteItemId(entity.getId());
+ op.setProcessParamId(p.getId());
+ return op;
+ }).collect(Collectors.toList());
+ productionOrderRouteItemParamService.saveBatch(orderParams);
+ }
+ }
+
+ @Override
+ public void updateProcessItem(ProductionOrderRouteItemDto dto) {
+ if (dto == null || dto.getId() == null) {
+ throw new ServiceException("鏇存柊鏁版嵁鎴朓D涓嶈兘涓虹┖");
+ }
+ ProductionOrderRouteItem old = getById(dto.getId());
+ if (old == null) {
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ // 宸ュ簭鍙樻洿锛屽垹闄ゆ棫鍙傛暟闄勮〃锛岃縼绉绘柊宸ュ簭鍙傛暟
+ if (dto.getProcessId() != null && !dto.getProcessId().equals(old.getProcessId())) {
+ // 鍒犻櫎宸ヨ壓璺嚎宸ュ簭鍙傛暟闄勮〃
+ productionOrderRouteItemParamService.remove(new LambdaQueryWrapper<ProductionOrderRouteItemParam>()
+ .eq(ProductionOrderRouteItemParam::getOrderId, old.getOrderId())
+ .eq(ProductionOrderRouteItemParam::getRouteItemId, old.getId()));
+
+ // 杩佺Щ鏂板伐搴忕殑 product_process_param
+ List<ProductProcessParam> processParams = productProcessParamService.list(
+ new LambdaQueryWrapper<ProductProcessParam>().eq(ProductProcessParam::getProcessId, dto.getProcessId()));
+ if (!processParams.isEmpty()) {
+ List<ProductionOrderRouteItemParam> newInstances = processParams.stream().map(p -> {
+ ProductionOrderRouteItemParam instance = new ProductionOrderRouteItemParam();
+ BeanUtils.copyProperties(p, instance, "id");
+ instance.setOrderId(old.getOrderId());
+ instance.setRouteItemId(old.getId());
+ instance.setProcessParamId(p.getId());
+ return instance;
+ }).collect(Collectors.toList());
+ productionOrderRouteItemParamService.saveBatch(newInstances);
+ }
+ }
+ ProductionOrderRouteItem entity = new ProductionOrderRouteItem();
+ BeanUtils.copyProperties(dto, entity);
+ entity.setUpdateTime(LocalDateTime.now());
+ updateById(entity);
+ }
+
+ @Override
+ public void deleteProcessItem(Long id) {
+ if (id == null) {
+ throw new ServiceException("ID涓嶈兘涓虹┖");
+ }
+ ProductionOrderRouteItem old = getById(id);
+ if (old == null) {
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ // 鍒犻櫎宸ヨ壓璺嚎宸ュ簭鍙傛暟闄勮〃
+ productionOrderRouteItemParamService.remove(new LambdaQueryWrapper<ProductionOrderRouteItemParam>()
+ .eq(ProductionOrderRouteItemParam::getOrderId, old.getOrderId())
+ .eq(ProductionOrderRouteItemParam::getRouteItemId, id));
+ removeById(id);
+ }
+
+ @Override
+ public void sortProcessItem(ProductionOrderRouteItemDto dto) {
+ if (dto == null || dto.getId() == null) {
+ throw new ServiceException("鏁版嵁鎴朓D涓嶈兘涓虹┖");
+ }
+ ProductionOrderRouteItem old = getById(dto.getId());
+ if (old == null) {
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ List<ProductionOrderRouteItem> items = list(new LambdaQueryWrapper<ProductionOrderRouteItem>()
+ .eq(ProductionOrderRouteItem::getOrderId, old.getOrderId())
+ .orderByAsc(ProductionOrderRouteItem::getDragSort));
+ Integer targetPosition = dto.getDragSort();
+ if (targetPosition != null && targetPosition >= 1) {
+ items.removeIf(item -> item.getId().equals(old.getId()));
+ items.add(targetPosition - 1, old);
+ for (int i = 0; i < items.size(); i++) {
+ ProductionOrderRouteItem item = items.get(i);
+ int newSort = i + 1;
+ if (!item.getId().equals(old.getId())) {
+ if (!Integer.valueOf(newSort).equals(item.getDragSort())) {
+ item.setDragSort(newSort);
+ updateById(item);
+ }
+ } else {
+ old.setDragSort(newSort);
+ updateById(old);
+ }
+ }
+ }
+ }
+}
--
Gitblit v1.9.3