From 33ade9bc31d66d3074d221d8b80d66e7d1955b87 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Thu, 4 Feb 2021 18:25:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9<=E6=9C=AA=E9=94=81=E9=97=AD?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BA=E6=AE=B5>=E7=A7=BB=E5=8A=A8=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E7=BB=88=E7=82=B9=E5=88=A4=E5=AE=9A=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
index d70b31b52..6cde06a06 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/ATP/ground/ZCLogicLoop.java
@@ -143,7 +143,16 @@ public class ZCLogicLoop {
             ++count;
             // 区段未进路锁闭或延时解锁中（转换轨除外，因为出库列车加载到转换轨没有进路）
             if (!section.isTransferTrack()) {
-                if (!section.isRouteLock() || section.isDelayUnlock()) {
+                if (section.isDelayUnlock()) {
+                    deviceEnd = new MovementAuthority.End(section, MovementAuthority.EndType.UNLOCK_SECTION);
+                    break;
+                }
+                if (section.isTurnBackTrack()) {
+                    if (!section.isRouteLock()) {
+                        deviceEnd = new MovementAuthority.End(section, MovementAuthority.EndType.UNLOCK_SECTION);
+                        break;
+                    }
+                } else if (!section.isRouteLockOn(right)) {
                     deviceEnd = new MovementAuthority.End(section, MovementAuthority.EndType.UNLOCK_SECTION);
                     break;
                 }