分流横移1逻辑修改：增加新料仓19的逻辑

source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs

@@ -368,14 +368,17 @@ namespace OnlineStore.DeviceLibrary
                     InOutParam inoup = trayInfo.InoutPar;
                     InOutParam inoup = trayInfo.InoutPar;
                     if (trayInfo.InOrOutStore.Equals(ReelType.InStore))
                     if (trayInfo.InOrOutStore.Equals(ReelType.InStore))
                     {
                     {
+                        int storeId = inoup.GetStoreId();
+                        List<int> storeIdList = new List<int>() { 10, 19, 25 };
+                      
                         if (inoup.InStoreNg)
                         if (inoup.InStoreNg)
                         {
                         {
                             outMsg = "入料NG料";
                             outMsg = "入料NG料";
                             return true;
                             return true;
                         }
                         }
-                        else if (inoup.GetStoreId().Equals(10).Equals(false))
+                        else if (!storeIdList.Contains(storeId))
                         {
                         {
-                            outMsg = "非10号仓入库";
+                            outMsg = "非10_19号仓入库";
                             return true;
                             return true;
                         }
                         }
                     }
                     }
@@ -393,6 +396,11 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         return false;
                         return false;
                     }
                     }
+                    MoveEquip moveEquip19 = LineManager.Line.GetMoveByDId(19);
+                    if (moveEquip19.IsWaitEmptyTray())
+                    {
+                        return false;
+                    }
                     FeedingEquip feed3 = LineManager.Line.FeedingEquipMap[103];
                     FeedingEquip feed3 = LineManager.Line.FeedingEquipMap[103];
                     if (feed3.WaitEmptyTray())
                     if (feed3.WaitEmptyTray())
                     {
                     {

source/DeviceLibrary/server/LineServer.cs

@@ -181,7 +181,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
             }
             }
             return false;
             return false;
-        } 
+        }
         public static string GetAllCID(int equipId)
         public static string GetAllCID(int equipId)
         {
         {
             //左侧19，右侧20
             //左侧19，右侧20
@@ -233,7 +233,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
             }
             }
             foreach (int id in IdList)
             foreach (int id in IdList)
-            { 
+            {
                 //   foreach (BoxInfo box in BoxMap.Values)
                 //   foreach (BoxInfo box in BoxMap.Values)
                 //{
                 //{
                 BoxInfo box = GetBoxInfo(id);
                 BoxInfo box = GetBoxInfo(id);
@@ -248,7 +248,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
                     }
                     }
                 }
                 }
-            } 
+            }
             if (result.EndsWith(","))
             if (result.EndsWith(","))
             {
             {
                 result = result.Substring(0, result.Length - 1);
                 result = result.Substring(0, result.Length - 1);