From c48e3aabf2947e45a9db2eac3ef91190e8647655 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 02 九月 2025 17:03:34 +0800
Subject: [PATCH] agv站点功能调整
---
rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
index 0b4fc0b..9a56570 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java
@@ -1,17 +1,14 @@
package com.vincent.rsf.server.api.utils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.vincent.rsf.framework.common.Arith;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.TaskInParam;
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.entity.dto.LocTypeDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.enums.TaskStsType;
-import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.service.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,8 +17,6 @@
import javax.annotation.PostConstruct;
-import javax.annotation.RegEx;
-import javax.annotation.Resource;
import java.util.List;
@Component
@@ -115,13 +110,13 @@
}
//鑾峰彇绔欑偣瀵瑰簲鐨勫簱绫诲瀷
- public static Long getAreaType(Integer sourceStaNo) {
+ public static Long getAreaType(String sourceStaNo) {
DeviceBindService rowLastnoService = SpringUtils.getBean(DeviceBindService.class);
List<DeviceBind> deviceBinds = rowLastnoService.list(new LambdaQueryWrapper<DeviceBind>());
for (DeviceBind deviceBind : deviceBinds) {
String[] staNoList = deviceBind.getStaList().split(";");
for (String staNo : staNoList) {
- if (staNo.equals(sourceStaNo.toString())) {
+ if (staNo.equals(sourceStaNo)) {
return deviceBind.getId();
}
}
@@ -247,7 +242,7 @@
* @param ioType 浣滀笟绫诲瀷锛�*蹇呬紶鍙傛暟锛�
* @return
*/
- public static InTaskMsgDto getLocNoCrn(DeviceBind deviceBind, Long area, Integer sourceStaNo, String matnr, String batch, LocTypeDto locTypeDto, int times, Integer ioType) {
+ public static InTaskMsgDto getLocNoCrn(DeviceBind deviceBind, Long area, String sourceStaNo, String matnr, String batch, LocTypeDto locTypeDto, int times, Integer ioType) {
DeviceBindService deviceBindService = SpringUtils.getBean(DeviceBindService.class);
DeviceSiteService deviceSiteService = SpringUtils.getBean(DeviceSiteService.class);
LocService locService = SpringUtils.getBean(LocService.class);
@@ -343,7 +338,7 @@
if (Cools.isEmpty(deviceSite)) {
channel = 0;
} else {
- inTaskMsgDto.setStaNo(Integer.parseInt(deviceSite.getDeviceSite()));
+ inTaskMsgDto.setStaNo(deviceSite.getDeviceSite());
}
//鏇存柊褰撳墠鎺�
--
Gitblit v1.9.1