Merge branch 'master' of ssh://10.10.100.21/source/mes-client

PLCDataReader/Main.Designer.cs

@@ -88,9 +88,16 @@ namespace UAS_PLCDataReader
             this.de_linecode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_wccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_item1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.DataItemRepositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.de_item2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_item3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_item10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.DataItemRepositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.PageCommandSet = new DevExpress.XtraTab.XtraTabPage();
             this.ButtonDeleteCommand = new UAS_PLCDataReader.CustomerControl.Button.ButtonDeleteRow();
             this.Brand_label = new DevExpress.XtraEditors.LabelControl();
@@ -124,6 +131,7 @@ namespace UAS_PLCDataReader
             this.NetSettingCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_name1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_getway = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_upperip = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_port = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -216,13 +224,16 @@ namespace UAS_PLCDataReader
             this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
             this.TimerUpdateDevice = new System.Windows.Forms.Timer(this.components);
             this.TimerUpdateSQL = new System.Windows.Forms.Timer(this.components);
-            this.de_item4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.de_item5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.de_item6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.de_item7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.de_item8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.de_item9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.de_item10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dr_value10 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -841,13 +852,6 @@ namespace UAS_PLCDataReader
             this.de_item1.Visible = true;
             this.de_item1.VisibleIndex = 13;
             // 
-            // DataItemRepositoryItemComboBox1
-            // 
-            this.DataItemRepositoryItemComboBox1.AutoHeight = false;
-            this.DataItemRepositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.DataItemRepositoryItemComboBox1.Name = "DataItemRepositoryItemComboBox1";
-            // 
             // de_item2
             // 
             this.de_item2.Caption = "参数2";
@@ -864,6 +868,69 @@ namespace UAS_PLCDataReader
             this.de_item3.Visible = true;
             this.de_item3.VisibleIndex = 15;
             // 
+            // de_item4
+            // 
+            this.de_item4.Caption = "参数4";
+            this.de_item4.FieldName = "DE_ITEM4";
+            this.de_item4.Name = "de_item4";
+            this.de_item4.Visible = true;
+            this.de_item4.VisibleIndex = 16;
+            // 
+            // de_item5
+            // 
+            this.de_item5.Caption = "参数5";
+            this.de_item5.FieldName = "DE_ITEM5";
+            this.de_item5.Name = "de_item5";
+            this.de_item5.Visible = true;
+            this.de_item5.VisibleIndex = 17;
+            // 
+            // de_item6
+            // 
+            this.de_item6.Caption = "参数6";
+            this.de_item6.FieldName = "DE_ITEM6";
+            this.de_item6.Name = "de_item6";
+            this.de_item6.Visible = true;
+            this.de_item6.VisibleIndex = 18;
+            // 
+            // de_item7
+            // 
+            this.de_item7.Caption = "参数7";
+            this.de_item7.FieldName = "DE_ITEM7";
+            this.de_item7.Name = "de_item7";
+            this.de_item7.Visible = true;
+            this.de_item7.VisibleIndex = 19;
+            // 
+            // de_item8
+            // 
+            this.de_item8.Caption = "参数8";
+            this.de_item8.FieldName = "DE_ITEM8";
+            this.de_item8.Name = "de_item8";
+            this.de_item8.Visible = true;
+            this.de_item8.VisibleIndex = 20;
+            // 
+            // de_item9
+            // 
+            this.de_item9.Caption = "参数9";
+            this.de_item9.FieldName = "DE_ITEM9";
+            this.de_item9.Name = "de_item9";
+            this.de_item9.Visible = true;
+            this.de_item9.VisibleIndex = 21;
+            // 
+            // de_item10
+            // 
+            this.de_item10.Caption = "参数10";
+            this.de_item10.FieldName = "DE_ITEM10";
+            this.de_item10.Name = "de_item10";
+            this.de_item10.Visible = true;
+            this.de_item10.VisibleIndex = 22;
+            // 
+            // DataItemRepositoryItemComboBox1
+            // 
+            this.DataItemRepositoryItemComboBox1.AutoHeight = false;
+            this.DataItemRepositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.DataItemRepositoryItemComboBox1.Name = "DataItemRepositoryItemComboBox1";
+            // 
             // PageCommandSet
             // 
             this.PageCommandSet.Controls.Add(this.ButtonDeleteCommand);
@@ -1186,6 +1253,7 @@ namespace UAS_PLCDataReader
             this.NetSettingCheckedColumn,
             this.dnc_id,
             this.dnc_decode,
+            this.de_name1,
             this.dnc_getway,
             this.dnc_upperip,
             this.dnc_port,
@@ -1223,6 +1291,14 @@ namespace UAS_PLCDataReader
             this.dnc_decode.Visible = true;
             this.dnc_decode.VisibleIndex = 1;
             // 
+            // de_name1
+            // 
+            this.de_name1.Caption = "设备名称";
+            this.de_name1.FieldName = "DE_NAME";
+            this.de_name1.Name = "de_name1";
+            this.de_name1.Visible = true;
+            this.de_name1.VisibleIndex = 2;
+            // 
             // dnc_getway
             // 
             this.dnc_getway.Caption = "网关";
@@ -1241,7 +1317,7 @@ namespace UAS_PLCDataReader
             this.dnc_port.FieldName = "DNC_PORT";
             this.dnc_port.Name = "dnc_port";
             this.dnc_port.Visible = true;
-            this.dnc_port.VisibleIndex = 2;
+            this.dnc_port.VisibleIndex = 3;
             // 
             // dnc_mac
             // 
@@ -1249,7 +1325,7 @@ namespace UAS_PLCDataReader
             this.dnc_mac.FieldName = "DNC_MAC";
             this.dnc_mac.Name = "dnc_mac";
             this.dnc_mac.Visible = true;
-            this.dnc_mac.VisibleIndex = 3;
+            this.dnc_mac.VisibleIndex = 4;
             // 
             // dnc_ip
             // 
@@ -1257,7 +1333,7 @@ namespace UAS_PLCDataReader
             this.dnc_ip.FieldName = "DNC_IP";
             this.dnc_ip.Name = "dnc_ip";
             this.dnc_ip.Visible = true;
-            this.dnc_ip.VisibleIndex = 4;
+            this.dnc_ip.VisibleIndex = 5;
             // 
             // dnc_type
             // 
@@ -2088,7 +2164,17 @@ namespace UAS_PLCDataReader
             this.dr_dename,
             this.dr_runstatus,
             this.dr_qty,
-            this.dr_inqty});
+            this.dr_inqty,
+            this.dr_value1,
+            this.dr_value2,
+            this.dr_value3,
+            this.dr_value4,
+            this.dr_value5,
+            this.dr_value6,
+            this.dr_value7,
+            this.dr_value8,
+            this.dr_value9,
+            this.dr_value10});
             this.GridViewDeviceData.GridControl = this.GridDeviceData;
             this.GridViewDeviceData.IndicatorWidth = 30;
             this.GridViewDeviceData.Name = "GridViewDeviceData";
@@ -2158,61 +2244,85 @@ namespace UAS_PLCDataReader
             this.TimerUpdateSQL.Interval = 5000;
             this.TimerUpdateSQL.Tick += new System.EventHandler(this.TimerUpdateSQL_Tick);
             // 
-            // de_item4
+            // dr_value1
             // 
-            this.de_item4.Caption = "参数4";
-            this.de_item4.FieldName = "DE_ITEM4";
-            this.de_item4.Name = "de_item4";
-            this.de_item4.Visible = true;
-            this.de_item4.VisibleIndex = 16;
+            this.dr_value1.Caption = "参数1";
+            this.dr_value1.FieldName = "DR_VALUE1";
+            this.dr_value1.Name = "dr_value1";
+            this.dr_value1.Visible = true;
+            this.dr_value1.VisibleIndex = 5;
             // 
-            // de_item5
+            // dr_value2
             // 
-            this.de_item5.Caption = "参数5";
-            this.de_item5.FieldName = "DE_ITEM5";
-            this.de_item5.Name = "de_item5";
-            this.de_item5.Visible = true;
-            this.de_item5.VisibleIndex = 17;
+            this.dr_value2.Caption = "参数2";
+            this.dr_value2.FieldName = "DR_VALUE2";
+            this.dr_value2.Name = "dr_value2";
+            this.dr_value2.Visible = true;
+            this.dr_value2.VisibleIndex = 6;
             // 
-            // de_item6
+            // dr_value3
             // 
-            this.de_item6.Caption = "参数6";
-            this.de_item6.FieldName = "DE_ITEM6";
-            this.de_item6.Name = "de_item6";
-            this.de_item6.Visible = true;
-            this.de_item6.VisibleIndex = 18;
+            this.dr_value3.Caption = "参数3";
+            this.dr_value3.FieldName = "DR_VALUE3";
+            this.dr_value3.Name = "dr_value3";
+            this.dr_value3.Visible = true;
+            this.dr_value3.VisibleIndex = 7;
             // 
-            // de_item7
+            // dr_value4
             // 
-            this.de_item7.Caption = "参数7";
-            this.de_item7.FieldName = "DE_ITEM7";
-            this.de_item7.Name = "de_item7";
-            this.de_item7.Visible = true;
-            this.de_item7.VisibleIndex = 19;
+            this.dr_value4.Caption = "参数4";
+            this.dr_value4.FieldName = "DR_VALUE4";
+            this.dr_value4.Name = "dr_value4";
+            this.dr_value4.Visible = true;
+            this.dr_value4.VisibleIndex = 8;
             // 
-            // de_item8
+            // dr_value5
             // 
-            this.de_item8.Caption = "参数8";
-            this.de_item8.FieldName = "DE_ITEM8";
-            this.de_item8.Name = "de_item8";
-            this.de_item8.Visible = true;
-            this.de_item8.VisibleIndex = 20;
+            this.dr_value5.Caption = "参数5";
+            this.dr_value5.FieldName = "DR_VALUE5";
+            this.dr_value5.Name = "dr_value5";
+            this.dr_value5.Visible = true;
+            this.dr_value5.VisibleIndex = 9;
             // 
-            // de_item9
+            // dr_value6
             // 
-            this.de_item9.Caption = "参数9";
-            this.de_item9.FieldName = "DE_ITEM9";
-            this.de_item9.Name = "de_item9";
-            this.de_item9.Visible = true;
-            this.de_item9.VisibleIndex = 21;
+            this.dr_value6.Caption = "参数6";
+            this.dr_value6.FieldName = "DR_VALUE6";
+            this.dr_value6.Name = "dr_value6";
+            this.dr_value6.Visible = true;
+            this.dr_value6.VisibleIndex = 10;
             // 
-            // de_item10
+            // dr_value7
             // 
-            this.de_item10.Caption = "参数10";
-            this.de_item10.FieldName = "DE_ITEM10";
-            this.de_item10.Name = "de_item10";
-            this.de_item10.Visible = true;
-            this.de_item10.VisibleIndex = 22;
+            this.dr_value7.Caption = "参数7";
+            this.dr_value7.FieldName = "DR_VALUE7";
+            this.dr_value7.Name = "dr_value7";
+            this.dr_value7.Visible = true;
+            this.dr_value7.VisibleIndex = 11;
+            // 
+            // dr_value8
+            // 
+            this.dr_value8.Caption = "参数8";
+            this.dr_value8.FieldName = "DR_VALUE8";
+            this.dr_value8.Name = "dr_value8";
+            this.dr_value8.Visible = true;
+            this.dr_value8.VisibleIndex = 12;
+            // 
+            // dr_value9
+            // 
+            this.dr_value9.Caption = "参数9";
+            this.dr_value9.FieldName = "DR_VALUE9";
+            this.dr_value9.Name = "dr_value9";
+            this.dr_value9.Visible = true;
+            this.dr_value9.VisibleIndex = 13;
+            // 
+            // dr_value10
+            // 
+            this.dr_value10.Caption = "参数10";
+            this.dr_value10.FieldName = "DR_VALUE10";
+            this.dr_value10.Name = "dr_value10";
+            this.dr_value10.Visible = true;
+            this.dr_value10.VisibleIndex = 14;
             // 
             // Main
             // 
@@ -2485,5 +2595,16 @@ namespace UAS_PLCDataReader
         private DevExpress.XtraGrid.Columns.GridColumn de_item8;
         private DevExpress.XtraGrid.Columns.GridColumn de_item9;
         private DevExpress.XtraGrid.Columns.GridColumn de_item10;
+        private DevExpress.XtraGrid.Columns.GridColumn de_name1;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value1;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value2;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value3;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value4;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value5;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value6;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value7;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value8;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value9;
+        private DevExpress.XtraGrid.Columns.GridColumn dr_value10;
     }
 }

PLCDataReader/Main.cs

@@ -190,7 +190,7 @@ namespace UAS_PLCDataReader
             ButtonNewCommand.Grid = GridCommandSetting;
 
             //设备联网配置界面
-            GridDeviceNetSetting.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DNC_ID,DNC_DECODE,DNC_GATEWAY,DNC_UPPERIP,DNC_PORT,DNC_MAC,DNC_IP,DNC_TYPE FROM DEVICENETCONFIG order by dnc_decode";
+            GridDeviceNetSetting.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DNC_ID,DNC_DECODE,DNC_GATEWAY,DNC_UPPERIP,DNC_PORT,DNC_MAC,DNC_IP,DNC_TYPE,DE_NAME FROM DEVICENETCONFIG left join device on dnc_decode=de_code order by dnc_decode";
             GridDeviceNetSetting.ID = "dnc_id";
             GridDeviceNetSetting.TableName = "DEVICENETCONFIG";
             GridDeviceNetSetting.InsertSQL = "insert into DEVICENETCONFIG(DNC_ID,DNC_DECODE,DNC_GATEWAY,DNC_UPPERIP,DNC_PORT,DNC_MAC,DNC_IP,DNC_TYPE) values(DEVICENETCONFIG_SEQ.NEXTVAL,:DNC_DECODE,:DNC_GATEWAY,:DNC_UPPERIP,:DNC_PORT,:DNC_MAC,:DNC_IP,:DNC_TYPE)";
@@ -198,7 +198,7 @@ namespace UAS_PLCDataReader
             ButtonAddNetConfig.Grid = GridDeviceNetSetting;
             ButtonSaveNetConfig.Grid = GridDeviceNetSetting;
 
-            GridDeviceData.GetDataSQL = "select dr_decode,dr_dename,case when dr_runstatus='disconnected' then '无法连接' when dr_runstatus='stopped' then '未运行' when dr_runstatus='running' then '运行中' when dr_runstatus='noanswer' then '无应答' end dr_runstatus,dr_qty,dr_okqty from devicerunstatus";
+            GridDeviceData.GetDataSQL = "select dr_decode,dr_dename,case when dr_runstatus='disconnected' then '无法连接' when dr_runstatus='stopped' then '未运行' when dr_runstatus='running' then '运行中' when dr_runstatus='noanswer' then '无应答' end dr_runstatus,dr_qty,dr_okqty,de_item1||':'||dr_value1 dr_value1,de_item2||':'||dr_value2 dr_value2,de_item3||':'||dr_value3 dr_value3,de_item4||':'||dr_value4 dr_value4,de_item5||':'||dr_value5 dr_value5,de_item6||':'||dr_value6 dr_value6,de_item7||':'||dr_value7 dr_value7,de_item8||':'||dr_value8 dr_value8,de_item9||':'||dr_value9 dr_value9,de_item10||':'||dr_value10 dr_value10 from devicerunstatus left join device on dr_decode=de_code";
 
             GridDeviceRunLog.GetDataSQL = "SELECT * FROM DEVICERUNRECORD";
             GridDeviceRunLog.ID = "drr_id";