fix

WCS_Client/Extensions/JsonExtensions.cs

@@ -109,84 +109,84 @@ namespace WCS_Client
                 values[0] = describle;
                 values[1] = proname;
 
-                switch (proname)
-                {
-                    case "TaskID":
-                        values[1] = "任务号";
-                        break;
-
-                    case "TaskType":
-                        values[1] = "任务类型";
-                        break;
-
-                    case "WorkMode":
-                        values[1] = "运行模式";
-                        break;
-
-                    case "SystemStatus":
-                        values[1] = "运行状态";
-                        break;
-
-                    case "StartPosition":
-                        values[1] = "起始地址";
-                        break;
-
-                    case "PH_Status":
-                        values[1] = "光电信号";
-                        break;
-
-                    case "DestPosition":
-                        values[1] = "目标地址";
-                        break;
-
-                    //case "ACT_V":
-                    //    values[1] = "实际速度";
-                    //    break;
-
-                    case "GOODSSTART":
-                        values[1] = "起始地址";
-                        break;
-
-                    case "GOODSEND":
-                        values[1] = "目标地址";
-                        break;
-
-                    case "REQUEST":
-                        values[1] = "请求";
-                        break;
-
-                    case "RES1":
-                        values[1] = "手动入库";
-                        break;
-
-                    case "HEIGHT":
-                        values[1] = "高度";
-                        break;
-
-                    case "GOODSCODE":
-                        values[1] = "货物编码";
-                        break;
-
-                    case "GOODSTYPE":
-                        values[1] = "货物类型";
-                        break;
-
-                    case "GOODSSIZE":
-                        values[1] = "货物尺寸";
-                        break;
-
-                    case "PH_STATUS":
-                        values[1] = "光电信号";
-                        break;
-
-                    case "TASKNUM":
-                        values[1] = "任务号";
-                        break;
-                }
-
-                string P_regex = "^[\u4E00-\u9FA5]{0,}$";
-                var match = Regex.IsMatch(values[1].ToString(), P_regex, RegexOptions.IgnoreCase);
-                if (!match) continue;
+                //switch (proname)
+                //{
+                //    case "TaskID":
+                //        values[1] = "任务号";
+                //        break;
+
+                //    case "TaskType":
+                //        values[1] = "任务类型";
+                //        break;
+
+                //    case "WorkMode":
+                //        values[1] = "运行模式";
+                //        break;
+
+                //    case "SystemStatus":
+                //        values[1] = "运行状态";
+                //        break;
+
+                //    case "StartPosition":
+                //        values[1] = "起始地址";
+                //        break;
+
+                //    case "PH_Status":
+                //        values[1] = "光电信号";
+                //        break;
+
+                //    case "DestPosition":
+                //        values[1] = "目标地址";
+                //        break;
+
+                //    //case "ACT_V":
+                //    //    values[1] = "实际速度";
+                //    //    break;
+
+                //    case "GOODSSTART":
+                //        values[1] = "起始地址";
+                //        break;
+
+                //    case "GOODSEND":
+                //        values[1] = "目标地址";
+                //        break;
+
+                //    case "REQUEST":
+                //        values[1] = "请求";
+                //        break;
+
+                //    case "RES1":
+                //        values[1] = "手动入库";
+                //        break;
+
+                //    case "HEIGHT":
+                //        values[1] = "高度";
+                //        break;
+
+                //    case "GOODSCODE":
+                //        values[1] = "货物编码";
+                //        break;
+
+                //    case "GOODSTYPE":
+                //        values[1] = "货物类型";
+                //        break;
+
+                //    case "GOODSSIZE":
+                //        values[1] = "货物尺寸";
+                //        break;
+
+                //    case "PH_STATUS":
+                //        values[1] = "光电信号";
+                //        break;
+
+                //    case "TASKNUM":
+                //        values[1] = "任务号";
+                //        break;
+                //}
+
+                //string P_regex = "^[\u4E00-\u9FA5]{0,}$";
+                //var match = Regex.IsMatch(values[1].ToString(), P_regex, RegexOptions.IgnoreCase);
+                //if (!match) continue;
                 values[2] = abc;
                 tb.Rows.Add(values);
             }

WCS_Client/Frm/FrmMain.cs

@@ -122,7 +122,7 @@ namespace WCS_Client
                 AddMenu("MBtn_Task", "MBtn_AgvTask_Dis", "Agv历史任务查询", typeof(Frm.MBtn_AgvTaskDis.MBtn_AgvTask_Dis), Btn_Click);
                 ////MBtn_Monitor
                 AddMenu("MBtn_Monitor", "MBtn_SCANN", "扫码信息查询", typeof(Frm.MBtn_SCANN), Btn_Click);
-
+                AddMenu("MBtn_Monitor", "MBtn_EQUMsg", "设备信号查询", typeof(Frm.FrmEquMsg), Btn_Click);
                 AddMenu("MBtn_Monitor", "MBtn_Mont", "设备监控查看", typeof(Frm.Frm_YongGuanMontior), Btn_Click);
 
                 //MBtn_Sys

WCS_Client/Frm/MBtn_Monitor/FrmEquMsg.cs

@@ -2,12 +2,7 @@
 using DevComponents.DotNetBar.SuperGrid;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using WCS_Client.UC;
 using WCS_Client.Utility;
@@ -21,31 +16,32 @@ namespace WCS_Client.Frm
             InitializeComponent();
             InitFrm();
         }
-        private void InitFrm() 
+
+        private void InitFrm()
         {
             List<GridColumn> GCList = new List<GridColumn>()
             {
-                SuperGridUtil.Get_GridColumn("Equ_No", "设备编号", 80),
-                SuperGridUtil.Get_GridColumn("Equ_PlcName", "PLC名称", 100),
-                SuperGridUtil.Get_GridColumn("Equ_Area", "设备区域", 100),
-                SuperGridUtil.Get_GridColumn("Equ_Type", "设备类型", 100),
-                SuperGridUtil.Get_GridColumn("Equ_BarCode", "条码", 100),
-                SuperGridUtil.Get_GridColumn("Equ_SystemStatus", "系统状态", 100),
-                SuperGridUtil.Get_GridColumn("Equ_WorkMode", "工作模式", 100),
-                SuperGridUtil.Get_GridColumn("Equ_AlaramsMsg", "报警消息", 500),
-                //SuperGridUtil.Get_GridColumn("PLC_NOTES", "说明", 200),
-                SuperGridUtil.Get_GridColumn("Equ_Notes", "备注", 200)
+                SuperGridUtil.Get_GridColumn("DEVICECODE", "设备编号", 80),
+                //SuperGridUtil.Get_GridColumn("Equ_PlcName", "PLC名称", 100),
+                //SuperGridUtil.Get_GridColumn("Equ_Area", "设备区域", 100),
+                //SuperGridUtil.Get_GridColumn("Equ_Type", "设备类型", 100),
+                //SuperGridUtil.Get_GridColumn("Equ_BarCode", "条码", 100),
+                //SuperGridUtil.Get_GridColumn("Equ_SystemStatus", "系统状态", 100),
+                //SuperGridUtil.Get_GridColumn("Equ_WorkMode", "工作模式", 100),
+                //SuperGridUtil.Get_GridColumn("Equ_AlaramsMsg", "报警消息", 500),
+                ////SuperGridUtil.Get_GridColumn("PLC_NOTES", "说明", 200),
+                //SuperGridUtil.Get_GridColumn("Equ_Notes", "备注", 200)
             };
             List<LayoutControlItem> LCIList = new List<LayoutControlItem>();
             LCIList.Add(LCItemUtil.Add_TextboxX("STA_EQUIPMENTNO", "设备编号:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_No like '%{0}%'" };
+            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "DEVICECODE like '%{0}%'" };
 
-            LCIList.Add(LCItemUtil.Add_TextboxX("STA_PLCNAME", "PLC名称:", 20, SubmitMethods, null));
-            LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_PlcName like '%{0}%'" };
+            //LCIList.Add(LCItemUtil.Add_TextboxX("STA_PLCNAME", "PLC名称:", 20, SubmitMethods, null));
+            //LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_PlcName like '%{0}%'" };
 
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", "查询", 80, 30, SubmitMethods));
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QClear", "重置", 80, 30, SubmitMethods));
-            LCIList.Add(LCItemUtil.Add_ButtonX("updateEquNotes", "修改备注", 100, 30, SubmitMethods));
+            //LCIList.Add(LCItemUtil.Add_ButtonX("updateEquNotes", "修改备注", 100, 30, SubmitMethods));
 
             uC_QueryPage1.Init_QueryPage(30, true, true, "", GCList, LCIList, QueryPageDataMethodsms, RefreshRoleMethodsms, DoubleClikMethod, null, ClikMethod);
             CommonShow.ShowProcessing("正在处理中，请稍候...", this, (obj) =>
@@ -53,16 +49,17 @@ namespace WCS_Client.Frm
                 uC_QueryPage1.RefreshData(1, 0);
             }, null);
         }
+
         private PageData QueryPageDataMethodsms(int PageIndex, int PageSize)
         {
-            string _SQLText = string.Format(@"SELECT  [Equ_No],[Equ_Sequence],[Equ_Area],[Equ_PlcName],[Equ_Type],[Equ_BarCode],[Equ_AlaramsMsg],a.Equ_SystemStatus,a.Equ_WorkMode,a.Equ_Notes   
-FROM [dbo].[WCS_EQUIPMENTINFO] a left join dbo.WCS_PLC b on a.Equ_PlcName=b.PLC_NAME where Equ_Area='A' ");
-            string _Orderby = "Equ_No asc";
+            string _SQLText = string.Format(@"SELECT distinct(DEVICECODE) FROM [dbo].[WCS_DEVICEPROTOCOL] WHERE ENABLED=1 ");
+            string _Orderby = "DEVICECODE asc";
 
             PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, 3000);
             return pd;
         }
-        private void SubmitMethods(string LCName) 
+
+        private void SubmitMethods(string LCName)
         {
             if (LCName == "btn_QDB")
             {
@@ -83,67 +80,43 @@ FROM [dbo].[WCS_EQUIPMENTINFO] a left join dbo.WCS_PLC b on a.Equ_PlcName=b.PLC_
                     MessageUtil.ShowTips("请选择配置信息。");
                     return;
                 }
-                var frmupdate = new Frm.MBtn_Monitor.FrmUpdateEquMsg (dt.Rows[0]);
+                var frmupdate = new Frm.MBtn_Monitor.FrmUpdateEquMsg(dt.Rows[0]);
                 frmupdate.ShowDialog();
                 uC_QueryPage1.RefreshData(1, 0);
             }
         }
+
         private void RefreshRoleMethodsms(bool ChkValue)
         {
-
         }
+
         private void DoubleClikMethod(DataRow dr)
         {
             Current.RefreshData();
-            //string plc_name = dr["Equ_PlcName"].ToString();
-            string equ_no = dr["Equ_No"].ToString();
-            //var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == plc_name);
-            //var equ = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == equ_no);
-            //string result = string.Empty;
-            //DataTable dt = null;
-            //if (equ.Equ_Type == EquipmentType.srm.ToString())
+            string code = dr["DEVICECODE"].ToString();
+            //var pack = eqpData.deviceDataPack;
+
+            //if (code.Contains("SRM"))
+            //{
+            //}
+            //else if (code.Contains("BCR"))
             //{
-            //    result = equ.EquSignal_Srm.ToJson();
-            //    dt = equ.EquSignal_Srm.GetAttributesDataTable();
             //}
-            //else if (equ.Equ_Type == EquipmentType.rgv.ToString())
+            //else if (code.Contains("RGV"))
             //{
-            //    result = equ.EquSignal_Rgv.ToJson();
-            //    dt = equ.EquSignal_Rgv.GetAttributesDataTable();
             //}
-            //else if (equ.Equ_Type == EquipmentType.conveyor.ToString())
+            //else
             //{
-            //    result = equ.EquSignal_Conv.ToJson();
-            //    dt = equ.EquSignal_Conv.GetAttributesDataTable();
             //}
-            FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equ_no);
+
+            FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(code);
             Frm.Show();
         }
-        private void ClikMethod(DataRow dr) 
+
+        private void ClikMethod(DataRow dr)
         {
             try
             {
-                //Current.RefreshData();
-                //string plc_name = dr["Equ_PlcName"].ToString();
-                //string equ_no = dr["Equ_No"].ToString();
-                //var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == plc_name);
-                //var equ = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.DEVICECODE == equ_no);
-                //string result = string.Empty;
-                //if (equ.Equ_Type == EquipmentType.srm.ToString())
-                //    result = equ.EquSignal_Srm.ToJson();
-                //else if (equ.Equ_Type == EquipmentType.rgv.ToString())
-                //    result = equ.EquSignal_Rgv.ToJson();
-                //else if (equ.Equ_Type == EquipmentType.conveyor.ToString())
-                //    result = equ.EquSignal_Conv.ToJson();
-
-                //string QeuMsg = null;
-                ////string wcs_task_no =dr["STA_DATA"].ToString();
-                //string[] msg = result.Split(',');
-                //for (int i = 0; i < msg.Count(); i++)
-                //{
-                //    QeuMsg += msg[i] + "\r\n";
-                //}
-                //textBox1.Text = QeuMsg;
             }
             catch (Exception ex)
             {
@@ -151,4 +124,4 @@ FROM [dbo].[WCS_EQUIPMENTINFO] a left join dbo.WCS_PLC b on a.Equ_PlcName=b.PLC_
             }
         }
     }
-}
+}

WCS_Client/Frm/MBtn_Monitor/FrmEquMsg_dtl.cs

@@ -12,23 +12,22 @@ namespace WCS_Client.Frm
     public partial class FrmEquMsg_dtl : Form
     {
         private DataTable dt = null;
-        private string equName = string.Empty;
+        private string DEVICECODE = string.Empty;
 
         public FrmEquMsg_dtl(string equNo)
         {
             InitializeComponent();
-            equName = equNo.ToUpper();
+            DEVICECODE = equNo.ToUpper();
             InitFrm();
         }
 
         private void InitFrm()
         {
             var pack = eqpData.deviceDataPack;
-            //string[] str = (string[])pack.StationDatas.Datas.Select(p => p.Code);
-            if (pack.StationDatas.Datas.Any(p => p.Code == equName))
+            if (pack.StationDatas.Datas.Any(p => p.Code == DEVICECODE))
             {
                 var convdata = pack.StationDatas;//输送机数据
-                var plcItem = pack.StationDatas.Datas.Where(o => o.Code == equName).FirstOrDefault();
+                var plcItem = pack.StationDatas.Datas.Where(o => o.Code == DEVICECODE).FirstOrDefault();
                 if (plcItem == null)
                 {
                     MessageBox.Show("该设备无数据。");
@@ -37,11 +36,22 @@ namespace WCS_Client.Frm
                 dt = plcItem.D521.GetAttributesDataTable();
             }
 
-            //string[] str2 = (string[])pack.RGVDatas.Datas.Select(p => p.Code);
-            if (pack.RGVDatas.Datas.Any(p => p.Code == equName))
+            if (pack.RGVDatas.Datas.Any(p => p.Code == DEVICECODE))
             {
                 var rgvdata = pack.RGVDatas;//输送机数据
-                var plcItem = pack.RGVDatas.Datas.Where(o => o.Code == equName).FirstOrDefault();
+                var plcItem = pack.RGVDatas.Datas.Where(o => o.Code == DEVICECODE).FirstOrDefault();
+                if (plcItem == null)
+                {
+                    MessageBox.Show("该设备无数据。");
+                    return;
+                }
+                dt = plcItem.D521.GetAttributesDataTable();
+            }
+
+            if (pack.SCDatas.Datas.Any(p => p.Code == DEVICECODE))
+            {
+                var rgvdata = pack.RGVDatas;//输送机数据
+                var plcItem = pack.RGVDatas.Datas.Where(o => o.Code == DEVICECODE).FirstOrDefault();
                 if (plcItem == null)
                 {
                     MessageBox.Show("该设备无数据。");
@@ -59,7 +69,7 @@ namespace WCS_Client.Frm
                 SuperGridUtil.Get_GridColumn("信号说明", "信号说明", 900),
             };
             List<LayoutControlItem> LCIList = new List<LayoutControlItem>();
-            string buttonName = string.Format("刷新(设备编号:[{0}])", equName);
+            string buttonName = string.Format("刷新(设备编号:[{0}])", DEVICECODE);
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", buttonName, 180, 30, SubmitMethods));
 
             uC_QueryPage1.Init_QueryPage(30, true, true, "", GCList, LCIList, QueryPageDataMethodsms, RefreshRoleMethodsms, DoubleClikMethod, null, null);
@@ -87,28 +97,6 @@ namespace WCS_Client.Frm
         {
             if (LCName == "btn_QDB")
             {
-                //Current.RefreshData();
-                //var plcItem = Current.PlcSet.FirstOrDefault(v => v.WCS_EquipmentInfoSet.Any(t => t.Equ_No == equName));
-                //var equ = plcItem.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == equName);
-                //string result = string.Empty;
-
-                //if (equ.Equ_Type == EquipmentType.srm.ToString())
-                //{
-                //    //result = equ.EquSignal_Srm.ToJson();
-                //    dt = equ.EquSignal_Srm.GetAttributesDataTable();
-                //}
-                //else if (equ.Equ_Type == EquipmentType.rgv.ToString())
-                //{
-                //    //result = equ.EquSignal_Rgv.ToJson();
-                //    dt = equ.EquSignal_Rgv.GetAttributesDataTable();
-                //}
-                //else if (equ.Equ_Type == EquipmentType.conveyor.ToString())
-                //{
-                //    //result = equ.EquSignal_Conv.ToJson();
-                //    dt = equ.EquSignal_Conv.GetAttributesDataTable();
-                //}
-
-                //uC_QueryPage1.RefreshData();
             }
         }
     }

WCS_Client/Frm/MBtn_Monitor/FrmUpdateEquMsg.cs

@@ -14,7 +14,7 @@ namespace WCS_Client.Frm.MBtn_Monitor
             InitializeComponent();
             dr = datarow;
 
-            txtEqu_No.Text = datarow["Equ_No"].ToString();
+            txtEqu_No.Text = datarow["DEVICECODE"].ToString();
             txtEqu_PlcName.Text = datarow["Equ_PlcName"].ToString();
             txtEqu_Area.Text = datarow["Equ_Area"].ToString();
             txtEqu_Type.Text = datarow["Equ_Type"].ToString();