From 124a6178ae918de05886b52199b7755d4fa1ece3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 17:06:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
index 4834dcc..30c2680 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -1,12 +1,15 @@
package com.ruoyi.production.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.SecurityUtils;
import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.mapper.ProcessRouteItemMapper;
+import com.ruoyi.production.mapper.ProcessRouteItemParamMapper;
import com.ruoyi.production.pojo.ProcessRouteItem;
+import com.ruoyi.production.pojo.ProcessRouteItemParam;
import com.ruoyi.production.service.ProcessRouteItemService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +26,9 @@
@Autowired
private ProcessRouteItemMapper processRouteItemMapper;
+ @Autowired
+ private ProcessRouteItemParamMapper processRouteItemParamMapper;
+
@Override
public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
return processRouteItemMapper.listProcessRouteItemDto( processRouteItemDto);
@@ -37,8 +43,6 @@
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
.eq(ProcessRouteItem::getRouteId, oldProcessRouteItem.getRouteId())
.orderByAsc(ProcessRouteItem::getDragSort));
- //鏌ヨ琚洿鏀圭殑閭ｆ潯鏁版嵁鍘熸潵鏄鍑犳潯
- int oldIndex = processRouteItems.indexOf(oldProcessRouteItem);
// 鑾峰彇鐩爣浣嶇疆锛堢Щ鍔ㄥ埌绗嚑涓箣鍚庯級
Integer targetPosition = processRouteItem.getDragSort();
if (targetPosition != null && targetPosition >= 0) {
@@ -75,6 +79,9 @@
Long routeId = deleteProcessRouteItem.getRouteId();
// 鍒犻櫎鎸囧畾鏁版嵁
processRouteItemMapper.deleteById(id);
+ // 鍒犻櫎瀵瑰簲鐨勫弬鏁板垪琛�
+ processRouteItemParamMapper.delete(new LambdaQueryWrapper<ProcessRouteItemParam>().eq(ProcessRouteItemParam::getRouteItemId,id));
+
// 鏌ヨ璇ュ伐鑹鸿矾绾跨殑鎵�鏈夊伐搴忓苟鎸夌収椤哄簭鎺掑簭
List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
.eq(ProcessRouteItem::getRouteId, routeId)
@@ -89,4 +96,28 @@
}
return "鍒犻櫎鎴愬姛";
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateProcess(ProcessRouteItem processRouteItem) {
+ if (processRouteItem == null) {
+ throw new ServiceException("鏁版嵁涓嶈兘涓虹┖");
+ }
+
+ Long tenantId = SecurityUtils.getLoginUser().getTenantId();
+ processRouteItem.setTenantId(tenantId);
+
+ boolean result;
+ if (processRouteItem.getId() == null) {
+ Long maxSort = processRouteItemMapper.selectCount(Wrappers.<ProcessRouteItem>lambdaQuery().eq(ProcessRouteItem::getRouteId, processRouteItem.getRouteId()));
+ processRouteItem.setDragSort((int) (maxSort + 1));
+
+ result = this.save(processRouteItem);
+ processRouteItemParamMapper.insertFromProcessTemplate(processRouteItem.getId(), processRouteItem.getProcessId(), tenantId);
+ } else {
+ result = this.updateById(processRouteItem);
+ }
+
+ return result;
+ }
}
--
Gitblit v1.9.3