灯塔出入库灯显示分开

DeviceLibrary/theMachine/MainMachine _LedProcess.cs

@@ -88,8 +88,11 @@ namespace DeviceLibrary
             MachineLedStateName[MachineLedStateE.THoutRange] = "温湿度超限";
             MachineLedState.Add(MachineLedStateE.THoutRange, nls(LedState.none, LedState.blink, LedState.blink));
             //进出库, 绿亮,黄闪
-            MachineLedStateName[MachineLedStateE.InOut] = "出入库中";
-            MachineLedState.Add(MachineLedStateE.InOut, nls(LedState.none, LedState.blink, LedState.on));
+            MachineLedStateName[MachineLedStateE.In] = "入库中";
+            MachineLedState.Add(MachineLedStateE.In, nls(LedState.none, LedState.blink, LedState.on));
+            //进出库, 绿亮,黄闪
+            MachineLedStateName[MachineLedStateE.Out] = "出库中";
+            MachineLedState.Add(MachineLedStateE.Out, nls(LedState.none, LedState.blink, LedState.on));
         }
         Dictionary<LedColor, LedState> nls(LedState AlarmLedstate, LedState StandbyLedstate, LedState RunningLedstate) {
             var a = new Dictionary<LedColor, LedState>();
@@ -111,7 +114,7 @@ namespace DeviceLibrary
             foreach (var ledcolor in ledcfg.Keys)
             {
                 if (ledcfg[ledcolor] == LedState.none)
-                    return;
+                    continue;
                 Led.LedColors[ledcolor].LedState = ledcfg[ledcolor];
             }
         }
@@ -132,13 +135,25 @@ namespace DeviceLibrary
                 ProcessLefCfg(MachineLedStateE.Running);
 
                 //出入库 绿闪 黄闪
-                if (ClampMoveInfo.MoveStep > MoveStep.Wait
-                || StoreMoveInfo.MoveStep > MoveStep.Wait
-                || (StringMoveInfo.MoveStep > MoveStep.Wait && StringMoveInfo.MoveStep != MoveStep.StringReadyPut && StringMoveInfo.MoveStep <= MoveStep.StringOut_01))
+                //if (ClampMoveInfo.MoveStep > MoveStep.Wait
+                //|| StoreMoveInfo.MoveStep > MoveStep.Wait
+                //|| (StringMoveInfo.MoveStep > MoveStep.Wait && StringMoveInfo.MoveStep != MoveStep.StringReadyPut && StringMoveInfo.MoveStep <= MoveStep.StringOut_01))
+                //{
+                //    //RunningLed.LedState = LedState.blink;
+                //    //StandbyLed.LedState = LedState.blink;
+                //    ProcessLefCfg(MachineLedStateE.InOut);
+                //}
+                if (ServerCM.storeStatus.Equals(StoreStatus.InStoreExecute))
+                {
+                    //RunningLed.LedState = LedState.blink;
+                    //StandbyLed.LedState = LedState.blink;
+                    ProcessLefCfg(MachineLedStateE.In);
+                }
+                if (ServerCM.storeStatus.Equals(StoreStatus.OutStoreExecute))
                 {
                     //RunningLed.LedState = LedState.blink;
                     //StandbyLed.LedState = LedState.blink;
-                    ProcessLefCfg(MachineLedStateE.InOut);
+                    ProcessLefCfg(MachineLedStateE.Out);
                 }
                 //温度超限 绿亮 黄闪
                 if (IsTHoutRange())
@@ -249,6 +264,7 @@ namespace DeviceLibrary
         SystemPause,
         THoutRangeOver30m,
         THoutRange,
-        InOut,
+        In,
+        Out,
     }
 }