bug修改。托盘信息界面用标志显示是否禁用

source/AssemblyLineClient/FrmIOStatus.Designer.cs

@@ -306,6 +306,7 @@
             this.tableLayoutPanel3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             this.tableLayoutPanel3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.tableLayoutPanel3.AutoScroll = true;
             this.tableLayoutPanel3.ColumnCount = 1;
             this.tableLayoutPanel3.ColumnCount = 1;
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 14);
             this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 14);

source/AssemblyLineClient/FrmLineStore.cs

@@ -925,14 +925,20 @@ namespace OnlineStore.AssemblyLine
 
 
         private void btnTrayInfo_Click(object sender, EventArgs e)
         private void btnTrayInfo_Click(object sender, EventArgs e)
         {
         {
-            string msg = "";
+            string msg ="";
+          
             List<TrayInfo> tray = TrayManager.getTrayList();
             List<TrayInfo> tray = TrayManager.getTrayList();
             LogUtil.info("-------------------开始打印托盘信息：");
             LogUtil.info("-------------------开始打印托盘信息：");
             msg += "-------------------开始打印托盘信息：\r\n";
             msg += "-------------------开始打印托盘信息：\r\n";
             foreach (TrayInfo t in tray)
             foreach (TrayInfo t in tray)
             {
             {
-                LogUtil.info(t.ToStr());
-                msg += t.ToStr() + "\r\n";
+                string disstr = gouStr;
+                if (TrayDisableManager.DisableTray(t.TrayCode))
+                {
+                    disstr = "✘";
+                }
+                LogUtil.info(disstr+ t.ToStr());
+                msg += disstr + t.ToStr() + "\r\n";
             }
             }
             LogUtil.info("-------------------结束打印托盘信息");
             LogUtil.info("-------------------结束打印托盘信息");
             msg += "-------------------结束打印托盘信息";
             msg += "-------------------结束打印托盘信息";

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -1091,24 +1091,19 @@ namespace OnlineStore.DeviceLibrary
                 List<AlarmMsg> alarmList = new List<AlarmMsg>();
                 List<AlarmMsg> alarmList = new List<AlarmMsg>();
                 if (!alarmType.Equals(LineAlarmType.None))
                 if (!alarmType.Equals(LineAlarmType.None))
                 { 
                 { 
-                    alarmList.Add(new AlarmMsg(Name, "line_" + alarmType, WarnMsg));
+                    alarmList.Add(new AlarmMsg(Name, "line." + alarmType, WarnMsg));
                 }
                 }
                 int num = TrayDisableManager.GetDisableList().Count;
                 int num = TrayDisableManager.GetDisableList().Count;
                 if (num >= 5)
                 if (num >= 5)
                 {
                 {
-                    alarmList.Add(new AlarmMsg(Name, "line_Tray", "已有[" + num + "]个托盘被禁用，请尽快处理"));
+                    alarmList.Add(new AlarmMsg(Name, "line.Tray", "已有[" + num + "]个托盘被禁用，请尽快处理"));
                 }
                 }
                 else if (num >= 1)
                 else if (num >= 1)
                 {
                 {
-                    alarmList.Add(new AlarmMsg(Name, "line_Tray", "已有[" + num + "]个托盘被禁用，请尽快处理"));
+                    alarmList.Add(new AlarmMsg(Name, "line.Tray", "已有[" + num + "]个托盘被禁用，请尽快处理"));
                 }
                 }
                 foreach (EquipBase equip in AllEquipMap.Values)
                 foreach (EquipBase equip in AllEquipMap.Values)
                 {
                 {
-                    //if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("等待空托盘到达超时"))
-                    //{
-                    //    continue;
-                    //}
-                    //else
                     if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("获取库位号超时"))
                     if (equip.alarmType.Equals(LineAlarmType.None) || equip.WarnMsg.Contains("获取库位号超时"))
                     {
                     {
                         continue;
                         continue;

source/DeviceLibrary/assemblymanager/TrayDisableManager.cs

@@ -67,8 +67,12 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.info("启用托盘：" + removeInfo.ToStr());
                 LogUtil.info("启用托盘：" + removeInfo.ToStr());
             }
             }
         }
         }
-
-        internal static bool DisableTray(int currTrayNum)
+        /// <summary>
+        /// 判断托盘是否被禁用
+        /// </summary>
+        /// <param name="currTrayNum"></param>
+        /// <returns></returns>
+        public  static bool DisableTray(int currTrayNum)
         {
         {
             return TrayDisableMap.ContainsKey(currTrayNum);
             return TrayDisableMap.ContainsKey(currTrayNum);
         }
         }