From a497406167f500741ac6cc1d24e086589972eb49 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 19 三月 2026 18:03:54 +0800
Subject: [PATCH] fix: 工艺路线工序参数表取消绑定基础参数表
---
src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java
index 0f63221..1f87c34 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteItemParamServiceImpl.java
@@ -4,8 +4,6 @@
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.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.dto.ProcessRouteItemParamDto;
@@ -13,7 +11,6 @@
import com.ruoyi.production.pojo.ProcessRouteItemParam;
import com.ruoyi.production.service.ProcessRouteItemParamService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,9 +28,6 @@
@Slf4j
@Service
public class ProcessRouteItemParamServiceImpl extends ServiceImpl<ProcessRouteItemParamMapper, ProcessRouteItemParam> implements ProcessRouteItemParamService {
-
- @Autowired
- private BaseParamService baseParamService;
@Override
public IPage<ProcessRouteItemParamDto> pageList(Page<ProcessRouteItemParam> page, ProcessRouteItemParam param) {
@@ -57,22 +51,17 @@
if (param == null) {
throw new ServiceException("鏂板澶辫触,鍙傛暟涓嶈兘涓虹┖");
}
- if (param.getRouteItemId() == null || param.getParamId() == null) {
- throw new ServiceException("鍏宠仈宸ュ簭ID鍜屽弬鏁伴」ID涓嶈兘涓虹┖");
+ if (param.getRouteItemId() == null || param.getParamKey() == null) {
+ throw new ServiceException("鍏宠仈宸ュ簭ID鍜屽弬鏁版爣璇嗕笉鑳戒负绌�");
}
Long tenantId = SecurityUtils.getLoginUser().getTenantId();
Long count = baseMapper.selectCount(Wrappers.<ProcessRouteItemParam>lambdaQuery()
.eq(ProcessRouteItemParam::getRouteItemId, param.getRouteItemId())
- .eq(ProcessRouteItemParam::getParamId, param.getParamId())
+ .eq(ProcessRouteItemParam::getParamKey, param.getParamKey())
.eq(ProcessRouteItemParam::getTenantId, tenantId));
if (count > 0) {
- throw new ServiceException("璇ュ伐搴忓凡瀛樺湪姝ゅ弬鏁伴」锛岃鍕块噸澶嶆坊鍔�");
- }
-
- BaseParam baseParam = baseParamService.getById(param.getParamId());
- if (baseParam == null) {
- throw new ServiceException("鏂板澶辫触,璇ュ熀纭�鍙傛暟涓嶅瓨鍦�");
+ throw new ServiceException("璇ュ伐搴忓凡瀛樺湪鍙傛暟椤癸紝璇峰嬁閲嶅娣诲姞");
}
Integer maxSort = baseMapper.selectMaxSortByRouteItemId(param.getRouteItemId());
--
Gitblit v1.9.3