托盘禁用信息传给服务器

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -1156,7 +1156,7 @@ namespace OnlineStore.DeviceLibrary
                             alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
                         }
                         else if (equip is FeedingEquip && equip.MoveInfo.MoveStep.Equals(LineMoveStep.FI_09_TrayLocation_Before))
-                        { 
+                        {
                             alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
                         }
                         else if (equip is FeedingEquip && equip.MoveInfo.MoveStep.Equals(LineMoveStep.FO_09_TrayLocation_Before))
@@ -1164,10 +1164,10 @@ namespace OnlineStore.DeviceLibrary
                             alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
                         }
                     }
-                      //出料机构->皮带线放料，等待夹爪信号灭的报警也发给服务器
-                 
-                    else  if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("获取库位号超时") ||
-                        equip.alarmType.Equals(LineAlarmType.IoSingleTimeOut))
+                    //出料机构->皮带线放料，等待夹爪信号灭的报警也发给服务器
+
+                    else if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("获取库位号超时") ||
+                       equip.alarmType.Equals(LineAlarmType.IoSingleTimeOut))
                     {
                         continue;
                     }
@@ -1175,6 +1175,12 @@ namespace OnlineStore.DeviceLibrary
                     {
                         alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
                     }
+
+                    List<TrayDisableInfo> list = TrayDisableManager.GetDisableList();
+                    foreach (TrayDisableInfo t in list)
+                    {
+                        alarmList.Add(new AlarmMsg("托盘" + t.TrayCode + "禁用", "line.tray_" + t.TrayCode, t.DDescribe));
+                    }
                 }
                 SServerManager.updateDeviceAlarmMsg(alarmList);
             }