From ffbbe935af41b3b3a21327a553e3eef1ce9a22b8 Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Fri, 29 Dec 2023 21:12:27 +0900
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=8E=92=E6=96=99?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B5=8B=E8=AF=95=E8=BF=98=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9A=82?=
 =?UTF-8?q?=E5=81=9C=E9=A9=AC=E4=B8=8A=E5=8F=88=E7=82=B9=E5=87=BB=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=EF=BC=8C=E8=BF=99=E6=97=B6=E8=AE=BE=E5=A4=87=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rs.SkyLine/Commom/Ops.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rs.SkyLine/Commom/Ops.cs b/Rs.SkyLine/Commom/Ops.cs
index 82adf7f..0092ed0 100644
--- a/Rs.SkyLine/Commom/Ops.cs
+++ b/Rs.SkyLine/Commom/Ops.cs
@@ -160,7 +160,8 @@ namespace Rs.MotionPlat.Commom
                     DischargeFlow.Instance.Start();
                     TurnoverFlow.Instance.Start();
                     MachineManage.Instance.SetCenterMachineStatus(ERunStatus.Started);
-                    if (DischargeFlow.Instance.GetCurStep() == "等待任务" && TurnoverFlow.Instance.GetStep() == "等待任务")
+                    //if (DischargeFlow.Instance.GetCurStep() == "等待任务" && TurnoverFlow.Instance.GetStep() == "等待任务")
+                    if(MachineManage.Instance.GetLoadUnloadStatus() != ERunState.Busying)
                     {
                         MachineManage.Instance.SetLoadUnloadStatus(ERunState.Waiting);
                     }