From bc116c55a44bc344e5575b5bdd4c2591bc0475aa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 17 三月 2026 16:43:36 +0800
Subject: [PATCH] fix: BOM模块的导入、模板下载、新增、编辑修改
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 109 insertions(+), 2 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 86df76a..cc9e2fe 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemServiceImpl.java
@@ -1,27 +1,134 @@
package com.ruoyi.production.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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 com.ruoyi.production.service.ProductMaterialSkuService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@Service
@AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class ProcessRouteItemServiceImpl extends ServiceImpl<ProcessRouteItemMapper, ProcessRouteItem> implements ProcessRouteItemService {
@Autowired
private ProcessRouteItemMapper processRouteItemMapper;
+ @Autowired
+ private ProcessRouteItemParamMapper processRouteItemParamMapper;
+
+ @Autowired
+ private ProductMaterialSkuService productMaterialSkuService;
+
@Override
public List<ProcessRouteItemDto> listProcessRouteItemDto(ProcessRouteItemDto processRouteItemDto) {
return processRouteItemMapper.listProcessRouteItemDto( processRouteItemDto);
}
+
+ //鎺掑簭
+ @Override
+ public int sort(ProcessRouteItem processRouteItem) {
+ //鏌ヨ琚敼鍔ㄧ殑杩欐潯鏁版嵁
+ ProcessRouteItem oldProcessRouteItem = processRouteItemMapper.selectById(processRouteItem.getId());
+ //鏌ヨ璇ュ伐鑹鸿矾绾跨殑鎵�鏈夊伐搴忓苟鎸夌収椤哄簭鎺掑簭
+ List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery()
+ .eq(ProcessRouteItem::getRouteId, oldProcessRouteItem.getRouteId())
+ .orderByAsc(ProcessRouteItem::getDragSort));
+ // 鑾峰彇鐩爣浣嶇疆锛堢Щ鍔ㄥ埌绗嚑涓箣鍚庯級
+ Integer targetPosition = processRouteItem.getDragSort();
+ if (targetPosition != null && targetPosition >= 0) {
+ // 绉诲姩鍏冪礌鍒版柊鐨勪綅缃�
+ processRouteItems.remove(oldProcessRouteItem);
+ processRouteItems.add(targetPosition-1, oldProcessRouteItem);
+ // 鏇存柊鎵�鏈夊彈褰卞搷鐨勬帓搴忓瓧娈�
+ for (int i = 0; i < processRouteItems.size(); i++) {
+ ProcessRouteItem item = processRouteItems.get(i);
+ if (!item.getId().equals(oldProcessRouteItem.getId())) {
+ // 妫�鏌ユ槸鍚﹂渶瑕佹洿鏂版帓搴忓��
+ if (item.getDragSort() != i+1) {
+ item.setDragSort(i+1);
+ processRouteItemMapper.updateById(item);
+ }
+ } else {
+ // 鏇存柊鍘熻褰曠殑鏂版帓搴忎綅缃�
+ oldProcessRouteItem.setDragSort(targetPosition);
+ processRouteItemMapper.updateById(oldProcessRouteItem);
+ }
+ }
+ return 1;
+ }
+ return 0;
+ }
+
+ @Override
+ public String batchDelete(Long id) {
+ // 鏌ヨ瑕佸垹闄ょ殑鏁版嵁
+ ProcessRouteItem deleteProcessRouteItem = processRouteItemMapper.selectById(id);
+ if (deleteProcessRouteItem == null) {
+ return "鍒犻櫎澶辫触锛屾湭鎵惧埌瀵瑰簲鏁版嵁";
+ }
+ 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)
+ .orderByAsc(ProcessRouteItem::getDragSort));
+ // 閲嶆柊璁剧疆鎺掑簭鍊硷紝浣垮簭鍙疯繛缁�
+ for (int i = 0; i < processRouteItems.size(); i++) {
+ ProcessRouteItem item = processRouteItems.get(i);
+ if (!item.getDragSort().equals(i+1)) {
+ item.setDragSort(i+1);
+ processRouteItemMapper.updateById(item);
+ }
+ }
+ return "鍒犻櫎鎴愬姛";
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateProcess(ProcessRouteItem processRouteItem) {
+ if (processRouteItem == null) {
+ throw new ServiceException("鏁版嵁涓嶈兘涓虹┖");
+ }
+ if (processRouteItem.getProductModelId() != null) {
+ Object product = productMaterialSkuService.getById(processRouteItem.getProductModelId());
+ if (product == null) {
+ throw new ServiceException("鎿嶄綔澶辫触锛氬叧鑱旂殑浜у搧(ID:" + processRouteItem.getProductModelId() + ")涓嶅瓨鍦�");
+ }
+ } else {
+ throw new ServiceException("浜у搧ID涓嶈兘涓虹┖");
+ }
+ 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