From eb5eb35a7ef56a01a4c788a8c2efef9fc7b823e7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 27 三月 2023 14:04:54 +0800
Subject: [PATCH] 四向穿梭车线程完善
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index fe2fd1e..0a51a73 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -54,8 +54,8 @@
}
@Override
- public Boolean isOutMost(String locNo) {
- return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo);
+ public Boolean isOutMost(String locNo, Boolean pakin) {
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo, pakin);
}
@Override
@@ -65,11 +65,16 @@
@Override
public Boolean isShuttle(String locNo) {
- int row = Utils.getRow(locNo);
- if (row >= 2 && row <= 30) {
- return Boolean.TRUE;
- }
- return Boolean.FALSE;
+// int row = Utils.getRow(locNo);
+// if (row >= 2 && row <= 30) {
+// return Boolean.TRUE;
+// }
+ return Boolean.TRUE;
+ }
+
+ @Override
+ public Integer getOutCrnNo(LocMast locMast) {
+ return 1;
}
}
--
Gitblit v1.9.1