0113

source/DeviceLibrary/doubleLine/DoubleLineBean.cs

@@ -407,6 +407,18 @@ namespace OnlineStore.DeviceLibrary
 
                             if (SOneMoveInfo.MoveType.Equals(LineMoveType.None))
                             {
+                                S1_ShelfCheck();
+                                if (S1_RightShelfId != "")
+                                {
+                                    S2CanGetShelf = false;
+                                }
+                                else
+                                {
+                                    S2CanGetShelf = true;
+                                }
+                            }
+                            else if (SOneMoveInfo.MoveType.Equals(LineMoveType.S1Shelf))
+                            {
                                 if (Monitor.TryEnter(s1ShelfLock))
                                 {
                                     try
@@ -423,18 +435,6 @@ namespace OnlineStore.DeviceLibrary
                                     }
 
                                 }
-                                if (S1_RightShelfId != "")
-                                {
-                                    S2CanGetShelf = false;
-                                }
-                                else
-                                {
-                                    S2CanGetShelf = true;
-                                }
-                            }
-                            else if (SOneMoveInfo.MoveType.Equals(LineMoveType.S1Shelf))
-                            {
-                                S1_ShelfProcess();
                                 if (S1_RightShelfId != "" && S2CanGetShelf)
                                 {
                                     S2CanGetShelf = false;