Bläddra i källkod

单击显示信号

xu.lu 3 år sedan
förälder
incheckning
bc2616a92a
2 ändrade filer med 88 tillägg och 20 borttagningar
  1. 15 15
      WCS_Client/Extensions/JsonExtensions.cs
  2. 73 5
      WCS_Client/Frm/MBtn_Monitor/FrmEquMsg.cs

+ 15 - 15
WCS_Client/Extensions/JsonExtensions.cs

@@ -176,7 +176,7 @@ namespace WCS_Client
                         describle = "";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "Layer_1":
                         describle = "当前层";
@@ -421,7 +421,7 @@ namespace WCS_Client
                         describle = "ID";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "RES1_1":
                         describle = "货物数量";
@@ -507,7 +507,7 @@ namespace WCS_Client
                         describle = "ID";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "SCAlarm":
                         describle = "警报";
@@ -564,10 +564,10 @@ namespace WCS_Client
                         describle = "设备";
                         break;
                     case "ENABLED":
-                        describle = "";
+                        describle = "是否可用";
                         break;
                     case "FRAME":
-                        describle = "";
+                        describle = "时间";
                         break;
                     case "GoodsSize":
                         describle = "货物高度";
@@ -589,7 +589,7 @@ namespace WCS_Client
                         describle = "";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "Request":
                         describle = "请求";
@@ -604,7 +604,7 @@ namespace WCS_Client
                         describle = "更新用户";
                         break;
                     case "VER":
-                        describle = "";
+                        describle = "版本";
                         break;
                     case "VoucherNo":
                         describle = "凭证号 每次累加";
@@ -640,10 +640,10 @@ namespace WCS_Client
                         describle = "设备";
                         break;
                     case "ENABLED":
-                        describle = "";
+                        describle = "是否可用";
                         break;
                     case "FRAME":
-                        describle = "";
+                        describle = "时间";
                         break;
                     case "GoodsSize":
                         describle = "货物高度";
@@ -665,7 +665,7 @@ namespace WCS_Client
                         describle = "";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "Request":
                         describle = "请求";
@@ -680,7 +680,7 @@ namespace WCS_Client
                         describle = "更新用户";
                         break;
                     case "VER":
-                        describle = "";
+                        describle = "版本";
                         break;
                     case "VoucherNo":
                         describle = "凭证号 每次累加";
@@ -721,7 +721,7 @@ namespace WCS_Client
                         describle = "编码";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
 
                     case "RES":
@@ -794,7 +794,7 @@ namespace WCS_Client
                         describle = "ID";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "Mileage":
                         describle = "里程";
@@ -910,7 +910,7 @@ namespace WCS_Client
                         describle = "ID";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "PRIORITY_1":
                         describle = "优先级";
@@ -1005,7 +1005,7 @@ namespace WCS_Client
                         describle = "RGV2工位故障";
                         break;
                     case "ISLAST":
-                        describle = "";
+                        describle = "是否最新";
                         break;
                     case "Status":
                         describle = "环穿状态";

+ 73 - 5
WCS_Client/Frm/MBtn_Monitor/FrmEquMsg.cs

@@ -3,7 +3,9 @@ using DevComponents.DotNetBar.SuperGrid;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Windows.Forms;
+using WCS.Entity.Protocol;
 using WCS_Client.UC;
 using WCS_Client.Utility;
 
@@ -115,13 +117,79 @@ where DBCODE not like '%521%' and DBCODE not like '%523%' and DBCODE not like '%
 
         private void ClikMethod(DataRow dr)
         {
-            try
+            var pack = eqpData.deviceDataPack;
+            if (pack is null)
             {
-            }
-            catch (Exception ex)
+                MessageBox.Show("该设备无数据。");
+                return;
+            }          
+
+            TryCachHelper.TryExecute((db) =>
             {
-                MessageUtil.ShowTips(ex.Message);
-            }
+                string equName = dr["CODE"].ToString();
+                DataTable dt = null;
+                if (pack.SCDatas.Datas.Any(p => p.Code == equName))
+                {
+                    var rgvdata = pack.SCDatas;//堆垛机数据
+                    var plcItem = pack.SCDatas.Datas.Where(o => o.Code == equName).FirstOrDefault();
+                    if (plcItem == null)
+                    {
+                        MessageBox.Show("该设备无数据。");
+                        return;
+                    }
+                    dt = plcItem.GetAttributesDataTable();
+                }
+                else if (pack.RGVDatas.Datas.Any(p => p.Code == equName))
+                {
+                    var rgvdata = pack.RGVDatas;//RGV数据
+                    var plcItem = pack.RGVDatas.Datas.Where(o => o.Code == equName).FirstOrDefault();
+                    if (plcItem == null)
+                    {
+                        MessageBox.Show("该设备无数据。");
+                        return;
+                    }
+                    dt = plcItem.GetAttributesDataTable();
+                }
+                else
+                {
+                    if (pack.StationDatas.Datas.Any(p => p.Code == equName))
+                    {
+                        var convdata = pack.StationDatas;//输送机数据
+                        var plcItem = pack.StationDatas.Datas.Where(o => o.Code == equName).FirstOrDefault();
+                        if (plcItem == null)
+                        {
+                            MessageBox.Show("该设备无数据。");
+                            return;
+                        }
+                        dt = plcItem.GetAttributesDataTable();
+                    }
+                }
+                if (dt == null)
+                    return;
+                string QeuMsg = null;
+                for (int i = 0; i < dt.Rows.Count; i++)
+                {
+                    for (int j = 1; j < dt.Columns.Count; j++)
+                    {
+                        if (j == 1)
+                            QeuMsg += "[" + dt.Rows[i][0].ToString() + "]" + "\r\n" + dt.Rows[i][j] + ":";
+                        else
+                            QeuMsg += dt.Rows[i][j];
+                    }
+                    QeuMsg += "\r\n";
+                }
+                textBox1.Text = QeuMsg;
+            });
+
+
+
+            //try
+            //{
+            //}
+            //catch (Exception ex)
+            //{
+            //    MessageUtil.ShowTips(ex.Message);
+            //}
         }
     }
 }