From 7d27cdccf8b92f32e80499f1f06c4b8ab93936c1 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 19:25:34 +0800
Subject: [PATCH] 修改空板移库，任务完成后无法加入历史档问题
---
rsf-server/src/main/java/com/vincent/rsf/server/api/utils/LocUtils.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 705260a..db1abfc 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
@@ -5,13 +5,19 @@
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.DeviceBind;
-import com.vincent.rsf.server.manager.entity.Loc;
-import com.vincent.rsf.server.manager.service.DeviceBindService;
-import com.vincent.rsf.server.manager.service.LocService;
+import com.vincent.rsf.server.manager.entity.*;
+import com.vincent.rsf.server.manager.enums.LocStsType;
+import com.vincent.rsf.server.manager.enums.TaskType;
+import com.vincent.rsf.server.manager.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import javax.annotation.RegEx;
+import javax.annotation.Resource;
import java.util.List;
public class LocUtils {
@@ -49,7 +55,12 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
LocService locService = SpringUtils.getBean(LocService.class);
Loc depLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, deepLoc));
- int row = depLoc.getRow()-1;
+ int row;
+ if (depLoc.getRow() != 1) {
+ row = depLoc.getRow()-1;
+ } else {
+ row = depLoc.getRow();
+ }
boolean contains = slaveProperties.getDoubleLocs().contains(row);
Loc shallowLoc = null;
if (!contains) {
@@ -99,10 +110,7 @@
//搴撲綅鎺掑彿鍒嗛厤
public static int[] LocNecessaryParameters(DeviceBind deviceBind, Integer curRow, Integer crnNumber) {
-
return LocNecessaryParametersDoubleExtension(curRow, crnNumber); //宸插畬鍠�
-
-
}
//缁忓吀鍙屼几搴撲綅
--
Gitblit v1.9.1