From 7ea8883ca6b47ec014a32ed57c3bea64544e893e Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 19 三月 2026 17:09:34 +0800
Subject: [PATCH] feat: 生产订单绑定工艺路线、BOM、工艺路线、工序参数新增修改
---
src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 175 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java b/src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java
index 153521d..ef7888b 100644
--- a/src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/appendix/service/impl/ProcessRouteItemInstanceServiceImpl.java
@@ -1,11 +1,31 @@
package com.ruoyi.appendix.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.appendix.dto.ProcessRouteItemInstanceDto;
import com.ruoyi.appendix.mapper.ProcessRouteItemInstanceMapper;
import com.ruoyi.appendix.pojo.ProcessRouteItemInstance;
+import com.ruoyi.appendix.pojo.ProcessRouteItemParamInstance;
import com.ruoyi.appendix.service.ProcessRouteItemInstanceService;
+import com.ruoyi.appendix.service.ProcessRouteItemParamInstanceService;
+import com.ruoyi.basic.pojo.BaseParam;
+import com.ruoyi.basic.service.BaseParamService;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
+import com.ruoyi.production.pojo.ProductProcess;
+import com.ruoyi.production.service.ProcessRouteItemParamService;
+import com.ruoyi.production.service.ProductProcessService;
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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <br>
@@ -20,5 +40,159 @@
@Service
public class ProcessRouteItemInstanceServiceImpl extends ServiceImpl<ProcessRouteItemInstanceMapper, ProcessRouteItemInstance> implements ProcessRouteItemInstanceService {
+ @Resource
+ private ProductProcessService productProcessService;
-}
\ No newline at end of file
+ @Resource
+ private ProcessRouteItemParamInstanceService processRouteItemParamInstanceService;
+
+ @Resource
+ private ProcessRouteItemParamService processRouteItemParamService;
+
+ @Resource
+ private BaseParamService baseParamService;
+
+ @Override
+ public List<ProcessRouteItemInstanceDto> getProcessItem(Long orderId) {
+ List<ProcessRouteItemInstance> list = list(new LambdaQueryWrapper<ProcessRouteItemInstance>()
+ .eq(ProcessRouteItemInstance::getOrderId, orderId)
+ .orderByAsc(ProcessRouteItemInstance::getDragSort));
+ return list.stream().map(item -> {
+ ProcessRouteItemInstanceDto dto = new ProcessRouteItemInstanceDto();
+ 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(ProcessRouteItemInstanceDto dto) {
+ if (dto == null) {
+ throw new ServiceException("鏂板鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (dto.getOrderId() == null) {
+ throw new ServiceException("鐢熶骇璁㈠崟ID涓嶈兘涓虹┖");
+ }
+ if (dto.getProcessId() == null) {
+ throw new ServiceException("宸ュ簭ID涓嶈兘涓虹┖");
+ }
+ ProcessRouteItemInstance entity = new ProcessRouteItemInstance();
+ BeanUtils.copyProperties(dto, entity);
+ entity.setId(null);
+ entity.setTenantId(SecurityUtils.getLoginUser().getTenantId());
+ entity.setCreateTime(LocalDateTime.now());
+
+ // 鍙栧綋鍓嶈鍗曚笅鏈�澶� dragSort + 1
+ ProcessRouteItemInstance maxSortItem = getOne(new LambdaQueryWrapper<ProcessRouteItemInstance>()
+ .eq(ProcessRouteItemInstance::getOrderId, dto.getOrderId())
+ .orderByDesc(ProcessRouteItemInstance::getDragSort)
+ .last("limit 1"));
+ entity.setDragSort(maxSortItem != null && maxSortItem.getDragSort() != null ? maxSortItem.getDragSort() + 1 : 1);
+ save(entity);
+ }
+
+ @Override
+ public void updateProcessItem(ProcessRouteItemInstanceDto dto) {
+ if (dto == null || dto.getId() == null) {
+ throw new ServiceException("鏇存柊鏁版嵁鎴朓D涓嶈兘涓虹┖");
+ }
+ ProcessRouteItemInstance old = getById(dto.getId());
+ if (old == null) {
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ // 宸ュ簭鍙樻洿锛屽垹闄ゆ棫鍙傛暟闄勮〃锛岃縼绉绘柊宸ュ簭鍙傛暟
+ if (dto.getProcessId() != null && !dto.getProcessId().equals(old.getProcessId())) {
+ // 鍒犻櫎宸ヨ壓璺嚎宸ュ簭鍙傛暟闄勮〃
+ processRouteItemParamInstanceService.remove(new LambdaQueryWrapper<ProcessRouteItemParamInstance>()
+ .eq(ProcessRouteItemParamInstance::getOrderId, old.getOrderId())
+ .eq(ProcessRouteItemParamInstance::getRouteItemId, old.getId()));
+
+ // 杩佺Щ鏂板伐搴忕殑 process_route_item_param
+ List<ProcessRouteItemParam> routeItemParams = processRouteItemParamService.list(
+ new LambdaQueryWrapper<ProcessRouteItemParam>().eq(ProcessRouteItemParam::getRouteItemId, old.getId()));
+ if (!routeItemParams.isEmpty()) {
+ // 鎵归噺鏌ヨ base_param
+ List<Long> paramIds = routeItemParams.stream().map(ProcessRouteItemParam::getParamId)
+ .filter(id -> id != null).distinct().collect(Collectors.toList());
+ Map<Long, BaseParam> baseParamMap = new HashMap<>();
+ if (!paramIds.isEmpty()) {
+ baseParamService.listByIds(paramIds).forEach(bp -> baseParamMap.put(bp.getId(), bp));
+ }
+ List<ProcessRouteItemParamInstance> newInstances = routeItemParams.stream().map(p -> {
+ ProcessRouteItemParamInstance instance = new ProcessRouteItemParamInstance();
+ BeanUtils.copyProperties(p, instance, "id");
+ instance.setOrderId(old.getOrderId());
+ BaseParam bp = baseParamMap.get(p.getParamId());
+ if (bp != null) {
+ instance.setParamKey(bp.getParamKey());
+ instance.setParamName(bp.getParamName());
+ instance.setParamType(bp.getParamType());
+ instance.setParamFormat(bp.getParamFormat());
+ instance.setValueMode(bp.getValueMode());
+ instance.setUnit(bp.getUnit());
+ instance.setRemark(bp.getRemark());
+ }
+ return instance;
+ }).collect(Collectors.toList());
+ processRouteItemParamInstanceService.saveBatch(newInstances);
+ }
+ }
+ ProcessRouteItemInstance entity = new ProcessRouteItemInstance();
+ BeanUtils.copyProperties(dto, entity);
+ entity.setUpdateTime(LocalDateTime.now());
+ updateById(entity);
+ }
+
+ @Override
+ public void deleteProcessItem(Long id) {
+ if (id == null) {
+ throw new ServiceException("ID涓嶈兘涓虹┖");
+ }
+ ProcessRouteItemInstance old = getById(id);
+ if (old == null) {
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ // 鍒犻櫎宸ヨ壓璺嚎宸ュ簭鍙傛暟闄勮〃
+ processRouteItemParamInstanceService.remove(new LambdaQueryWrapper<ProcessRouteItemParamInstance>()
+ .eq(ProcessRouteItemParamInstance::getOrderId, old.getOrderId())
+ .eq(ProcessRouteItemParamInstance::getRouteItemId, id));
+ removeById(id);
+ }
+
+ @Override
+ public void sortProcessItem(ProcessRouteItemInstanceDto dto) {
+ if (dto == null || dto.getId() == null) {
+ throw new ServiceException("鏁版嵁鎴朓D涓嶈兘涓虹┖");
+ }
+ ProcessRouteItemInstance old = getById(dto.getId());
+ if (old == null) {
+ throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+ }
+ List<ProcessRouteItemInstance> items = list(new LambdaQueryWrapper<ProcessRouteItemInstance>()
+ .eq(ProcessRouteItemInstance::getOrderId, old.getOrderId())
+ .orderByAsc(ProcessRouteItemInstance::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++) {
+ ProcessRouteItemInstance 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