暂停运动亮黄灯

source/DeviceLibrary/storeBean/EquipBase.cs

@@ -565,7 +565,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     isNeedAlarmLed = true;
                     isNeedAlarmLed = true;
                 }
                 }
-                else if (alarmType.Equals(AlarmType.None).Equals(false))
+                else if (alarmType.Equals(AlarmType.None).Equals(false) || MoveStop)
                 {
                 {
                     yellowMove = true;
                     yellowMove = true;
                 }
                 }

source/DeviceLibrary/storeBean/boxBean/BoxEquip.cs

@@ -1062,7 +1062,7 @@ namespace OnlineStore.DeviceLibrary
                     return;
                     return;
                 }
                 }
 
 
-                if (CurDoorLimitState.Equals(0))
+                //if (CurDoorLimitState.Equals(0))
                 {
                 {
                     if (StoreManager.DisBoxDoorLimit)
                     if (StoreManager.DisBoxDoorLimit)
                     {
                     {
@@ -1076,7 +1076,8 @@ namespace OnlineStore.DeviceLibrary
                         SecurityAccessStop("后门门禁");
                         SecurityAccessStop("后门门禁");
                     }
                     }
                 }
                 }
-                else if (CurDoorLimitState.Equals(1))
+                //else 
+                if (CurDoorLimitState.Equals(1))
                 {
                 {
                     if (IOValue(IO_Type.FrontDoor_Limit).Equals(IO_VALUE.HIGH) &&
                     if (IOValue(IO_Type.FrontDoor_Limit).Equals(IO_VALUE.HIGH) &&
                         IOValue(IO_Type.BackDoor_Limit).Equals(IO_VALUE.HIGH))
                         IOValue(IO_Type.BackDoor_Limit).Equals(IO_VALUE.HIGH))
@@ -1109,7 +1110,7 @@ namespace OnlineStore.DeviceLibrary
                 return;
                 return;
             }
             }
 
 
-            LogUtil.info($"{Name} {doorname}被打开，停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop}，暂停运动");
+            //LogUtil.info($"{Name} {doorname}被打开，停止当前运动{MoveInfo.MoveType},MoveStop={MoveStop}，暂停运动");
             MoveStop = true;
             MoveStop = true;
             SetWarnMsg($"{doorname}被打开，{Name}暂停运动");
             SetWarnMsg($"{doorname}被打开，{Name}暂停运动");
             //Alarm(AlarmType.SuddenStop);
             //Alarm(AlarmType.SuddenStop);