HY1，HY2托盘放行逻辑修改。

source/AssemblyLineClient/FrmLineIO.cs

@@ -220,7 +220,7 @@ namespace OnlineStore.AssemblyLine
         private void LoadTray()
         private void LoadTray()
         {
         {
             cmbTray.Items.Clear();
             cmbTray.Items.Clear();
-            for (int i = 1; i <= 30; i++)
+            for (int i = 101; i <= 135; i++)
             {
             {
                 cmbTray.Items.Add(i.ToString());
                 cmbTray.Items.Add(i.ToString());
             }
             }

source/AssemblyLineClient/useControl/EquipControl.cs

@@ -121,12 +121,20 @@ namespace OnlineStore.AssemblyLine
                         online = "✔";
                         online = "✔";
                         if (box.SAlarmType.Equals(LineAlarmType.None))
                         if (box.SAlarmType.Equals(LineAlarmType.None))
                         {
                         {
+                          
                             lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
                             lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
-                            lblBox.BackColor = Color.Green;
+                            if (box.SRunStatus.Equals(LineRunStatus.Busy))
+                            {
+                                lblBox.BackColor = Color.LightGreen;
+                            }
+                            else
+                            {
+                                lblBox.BackColor = Color.LightBlue;
+                            }
                         }
                         }
                         else
                         else
                         {
                         {
-                            lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
+                            lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " "+box.SAlarmType+" " + box.ToShowStr();
                             lblBox.BackColor = Color.Red;
                             lblBox.BackColor = Color.Red;
                         }
                         }
                     }
                     }

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -996,6 +996,10 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     return false;
                     return false;
                 }
                 }
+                if (MoveStop)
+                {
+                    return false;
+                }
                 if (trayNum <= 0)
                 if (trayNum <= 0)
                 {
                 {
                     return false;
                     return false;

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -417,6 +417,20 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         lineName = "C9";
                         lineName = "C9";
                     }
                     }
+                    if (DeviceID.Equals(204))
+                    {
+                        lineName = "C2";
+                    }else if (DeviceID.Equals(205))
+                    {
+                        lineName = "C3";
+                    }
+                    else if (DeviceID.Equals(213))
+                    {
+                        lineName = "C6";
+                    }else if (DeviceID.Equals(216))
+                    {
+                        lineName = "C7";
+                    }
                     SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, lineName);
                     SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INBELT, lineName);
                 }
                 }
             }
             }

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -590,6 +590,17 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         return false;
                         return false;
                     }
                     }
+
+                    //如果是HY02,且T1在等待托盘，先放行一个托盘
+                    if (DeviceID.Equals(202))
+                    {
+                        FeedingEquip feed101 = LineManager.Line.FeedingEquipMap[101];
+                        if (feed101.CurrTrayIsNeed(currTrayNum, false))
+                        {
+                            return false;
+                        }
+                    }
+
                     //判断上料T是否在入库等待托盘
                     //判断上料T是否在入库等待托盘
                     FeedingEquip feedT = LineManager.Line.FeedingEquipMap[Config.WorkDeviceId];
                     FeedingEquip feedT = LineManager.Line.FeedingEquipMap[Config.WorkDeviceId];
                     if (feedT.CurrTrayIsNeed(currTrayNum, false))
                     if (feedT.CurrTrayIsNeed(currTrayNum, false))

source/DeviceLibrary/assemblymanager/TrayManager.cs

@@ -140,6 +140,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info(t.ToStr());
                 LogUtil.info(t.ToStr());
             }
             }
             TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
             TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
+            SaveMapToFile();
             LogUtil.info("-------------------点击：清空托盘。托盘内容已清空");
             LogUtil.info("-------------------点击：清空托盘。托盘内容已清空");
         }
         }