From 0df6e7bb33c9f6a18f026a500776b00cbf2ae62c Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 24 十二月 2024 09:48:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
index d4f60b1..3cb4367 100644
--- a/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleDispatchUtils.java
@@ -103,6 +103,11 @@
continue;
}
+ if (shuttleProtocol.getWorkingMode() == 0) {
+ //灏忚溅澶勪簬鎵嬪姩妯″紡
+ continue;
+ }
+
int currentLev = shuttleProtocol.getPoint().getZ();//灏忚溅褰撳墠灞傞珮
String currentLocNo = shuttleProtocol.getCurrentLocNo();//灏忚溅褰撳墠搴撲綅鍙�
@@ -316,11 +321,7 @@
NyShuttleProtocol.NyShuttlePointClass point = null;
if (shuttleProtocol.getPoint() == null) {
- BasShuttle basShuttle = basShuttleService.selectById(shuttle.getId());//灏忚溅濡傛灉娌℃湁鏁版嵁锛屼粠鏁版嵁搴撳彇鏁版嵁
- if (basShuttle == null || basShuttle.getPoint() == null) {
- continue;
- }
- point = JSON.parseObject(basShuttle.getPoint(), NyShuttleProtocol.NyShuttlePointClass.class);
+ continue;
}else {
point = shuttleProtocol.getPoint();
}
--
Gitblit v1.9.1