参数名称更新提交

PLCDataReader/Device/Information/DeviceStatusInfo.cs

@@ -43,10 +43,16 @@ namespace UAS_PLCDataReader.Device.Infomation
             }
             //查询设备参数信息
             sql.Clear();
-            sql.Append("select dr_updatedate,dc_name,case when dc_type='INQTY' then dr_qty when dc_type='OUTQTY' then dr_okqty when dc_type='TEMPERATURE' ");
-            sql.Append("then dr_TEMPERATURE when dc_type='PARAM1' then dr_value1 when dc_type='PARAM2' then dr_value2 when dc_type='PARAM3' then dr_value3 end ");
-            sql.Append("data from DEVICEPOLLINGCONFIG left join devicecommand on dpc_dccode = dc_code left join DEVICERUNSTATUS ");
-            sql.Append("on dpc_decode = dr_decode where dpc_decode = '" + de_code + "'");
+            sql.Append("select dr_updatedate,case when dc_type='INQTY' then '投入' when dc_type='OUTQTY' then '产出'");
+            sql.Append("when dc_type='PARAM1' then de_item1 when dc_type='PARAM2' then de_item2 when dc_type='PARAM3' then de_item3 ");
+            sql.Append("when dc_type='PARAM4' then de_item4 when dc_type='PARAM5' then de_item5 when dc_type='PARAM6' then de_item6 ");
+            sql.Append("when dc_type='PARAM7' then de_item7 when dc_type='PARAM8' then de_item8 when dc_type='PARAM9' then de_item9 ");
+            sql.Append("when dc_type='PARAM10' then de_item10 end dc_name,case when dc_type='INQTY' then dr_qty when dc_type='OUTQTY' then dr_okqty ");
+            sql.Append("when dc_type='TEMPERATURE' then dr_TEMPERATURE when dc_type='PARAM1' then dr_value1 when dc_type='PARAM2' then dr_value2 ");
+            sql.Append("when dc_type='PARAM3' then dr_value3 when dc_type='PARAM4' then dr_value4 when dc_type='PARAM5' then dr_value5 ");
+            sql.Append("when dc_type='PARAM6' then dr_value6 when dc_type='PARAM7' then dr_value7 when dc_type='PARAM8' then dr_value8 ");
+            sql.Append("when dc_type='PARAM9' then dr_value9 when dc_type='PARAM10' then dr_value10 end data from DEVICEPOLLINGCONFIG ");
+            sql.Append("left join devicecommand on dpc_dccode = dc_code left join DEVICERUNSTATUS on dpc_decode = dr_decode left join device on dpc_decode=de_code where dpc_decode='"+ de_code + "' order by dc_dataindex");
             GridDeivceStatusInfo.DataSource = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             GridViewDeviceStatusInfo.BestFitColumns();
             sql.Clear();

PLCDataReader/Main.Designer.cs

@@ -216,6 +216,13 @@ 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();
             ((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
@@ -295,7 +302,7 @@ namespace UAS_PLCDataReader
             this.RibbonNav.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
             this.DeviceInf,
             this.DeviceCommandSetting});
-            this.RibbonNav.Size = new System.Drawing.Size(1040, 126);
+            this.RibbonNav.Size = new System.Drawing.Size(1040, 128);
             // 
             // ButtonDeviceList
             // 
@@ -432,11 +439,11 @@ namespace UAS_PLCDataReader
             // MainTabControl
             // 
             this.MainTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.MainTabControl.Location = new System.Drawing.Point(0, 126);
+            this.MainTabControl.Location = new System.Drawing.Point(0, 128);
             this.MainTabControl.Name = "MainTabControl";
             this.MainTabControl.SelectedTabPage = this.PageDeviceList;
             this.MainTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.False;
-            this.MainTabControl.Size = new System.Drawing.Size(1040, 586);
+            this.MainTabControl.Size = new System.Drawing.Size(1040, 584);
             this.MainTabControl.TabIndex = 3;
             this.MainTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.PageDeviceList,
@@ -646,7 +653,14 @@ namespace UAS_PLCDataReader
             this.de_wccode,
             this.de_item1,
             this.de_item2,
-            this.de_item3});
+            this.de_item3,
+            this.de_item4,
+            this.de_item5,
+            this.de_item6,
+            this.de_item7,
+            this.de_item8,
+            this.de_item9,
+            this.de_item10});
             this.GridViewDeviceList.GridControl = this.GridDeviceList;
             this.GridViewDeviceList.IndicatorWidth = 30;
             this.GridViewDeviceList.Name = "GridViewDeviceList";
@@ -822,7 +836,6 @@ namespace UAS_PLCDataReader
             // de_item1
             // 
             this.de_item1.Caption = "参数1";
-            this.de_item1.ColumnEdit = this.DataItemRepositoryItemComboBox1;
             this.de_item1.FieldName = "DE_ITEM1";
             this.de_item1.Name = "de_item1";
             this.de_item1.Visible = true;
@@ -838,7 +851,6 @@ namespace UAS_PLCDataReader
             // de_item2
             // 
             this.de_item2.Caption = "参数2";
-            this.de_item2.ColumnEdit = this.DataItemRepositoryItemComboBox1;
             this.de_item2.FieldName = "DE_ITEM2";
             this.de_item2.Name = "de_item2";
             this.de_item2.Visible = true;
@@ -847,7 +859,6 @@ namespace UAS_PLCDataReader
             // de_item3
             // 
             this.de_item3.Caption = "参数3";
-            this.de_item3.ColumnEdit = this.DataItemRepositoryItemComboBox1;
             this.de_item3.FieldName = "DE_ITEM3";
             this.de_item3.Name = "de_item3";
             this.de_item3.Visible = true;
@@ -2048,7 +2059,7 @@ namespace UAS_PLCDataReader
             this.PageDeviceData.Controls.Add(this.GridDeviceData);
             this.PageDeviceData.Name = "PageDeviceData";
             this.PageDeviceData.PageVisible = false;
-            this.PageDeviceData.Size = new System.Drawing.Size(1034, 580);
+            this.PageDeviceData.Size = new System.Drawing.Size(1034, 578);
             // 
             // GridDeviceData
             // 
@@ -2064,7 +2075,7 @@ namespace UAS_PLCDataReader
             this.GridDeviceData.MenuManager = this.RibbonNav;
             this.GridDeviceData.Name = "GridDeviceData";
             this.GridDeviceData.RowCount = 0;
-            this.GridDeviceData.Size = new System.Drawing.Size(1034, 580);
+            this.GridDeviceData.Size = new System.Drawing.Size(1034, 578);
             this.GridDeviceData.TabIndex = 0;
             this.GridDeviceData.TableName = null;
             this.GridDeviceData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2088,6 +2099,7 @@ namespace UAS_PLCDataReader
             this.dr_decode.Caption = "设备编号";
             this.dr_decode.FieldName = "DR_DECODE";
             this.dr_decode.Name = "dr_decode";
+            this.dr_decode.OptionsColumn.AllowEdit = false;
             this.dr_decode.Visible = true;
             this.dr_decode.VisibleIndex = 0;
             // 
@@ -2096,6 +2108,7 @@ namespace UAS_PLCDataReader
             this.dr_dename.Caption = "设备名称";
             this.dr_dename.FieldName = "DR_DENAME";
             this.dr_dename.Name = "dr_dename";
+            this.dr_dename.OptionsColumn.AllowEdit = false;
             this.dr_dename.Visible = true;
             this.dr_dename.VisibleIndex = 1;
             // 
@@ -2104,6 +2117,7 @@ namespace UAS_PLCDataReader
             this.dr_runstatus.Caption = "运行状态";
             this.dr_runstatus.FieldName = "DR_RUNSTATUS";
             this.dr_runstatus.Name = "dr_runstatus";
+            this.dr_runstatus.OptionsColumn.AllowEdit = false;
             this.dr_runstatus.Visible = true;
             this.dr_runstatus.VisibleIndex = 2;
             // 
@@ -2112,6 +2126,7 @@ namespace UAS_PLCDataReader
             this.dr_qty.Caption = "投入";
             this.dr_qty.FieldName = "DR_QTY";
             this.dr_qty.Name = "dr_qty";
+            this.dr_qty.OptionsColumn.AllowEdit = false;
             this.dr_qty.Visible = true;
             this.dr_qty.VisibleIndex = 3;
             // 
@@ -2120,6 +2135,7 @@ namespace UAS_PLCDataReader
             this.dr_inqty.Caption = "产出";
             this.dr_inqty.FieldName = "DR_OKQTY";
             this.dr_inqty.Name = "dr_inqty";
+            this.dr_inqty.OptionsColumn.AllowEdit = false;
             this.dr_inqty.Visible = true;
             this.dr_inqty.VisibleIndex = 4;
             // 
@@ -2142,6 +2158,62 @@ namespace UAS_PLCDataReader
             this.TimerUpdateSQL.Interval = 5000;
             this.TimerUpdateSQL.Tick += new System.EventHandler(this.TimerUpdateSQL_Tick);
             // 
+            // 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;
+            // 
             // Main
             // 
             this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
@@ -2406,5 +2478,12 @@ namespace UAS_PLCDataReader
         private DevExpress.XtraGrid.Columns.GridColumn dr_runstatus;
         private DevExpress.XtraGrid.Columns.GridColumn dr_qty;
         private DevExpress.XtraGrid.Columns.GridColumn dr_inqty;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item4;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item5;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item6;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item7;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item8;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item9;
+        private DevExpress.XtraGrid.Columns.GridColumn de_item10;
     }
 }

PLCDataReader/Main.cs

@@ -85,12 +85,40 @@ namespace UAS_PLCDataReader
             ComboBoxData cbd8 = new ComboBoxData();
             cbd8.Text = "参数3";
             cbd8.Value = "PARAM3";
+            ComboBoxData cbd9 = new ComboBoxData();
+            cbd9.Text = "参数4";
+            cbd9.Value = "PARAM4";
+            ComboBoxData cbd10 = new ComboBoxData();
+            cbd10.Text = "参数5";
+            cbd10.Value = "PARAM5";
+            ComboBoxData cbd11 = new ComboBoxData();
+            cbd11.Text = "参数6";
+            cbd11.Value = "PARAM6";
+            ComboBoxData cbd12 = new ComboBoxData();
+            cbd12.Text = "参数7";
+            cbd12.Value = "PARAM7";
+            ComboBoxData cbd13 = new ComboBoxData();
+            cbd13.Text = "参数8";
+            cbd13.Value = "PARAM8";
+            ComboBoxData cbd14 = new ComboBoxData();
+            cbd14.Text = "参数9";
+            cbd14.Value = "PARAM9";
+            ComboBoxData cbd15 = new ComboBoxData();
+            cbd15.Text = "参数10";
+            cbd15.Value = "PARAM10";
             DataItemRepositoryItemComboBox1.Items.Add(cbd3);
             DataItemRepositoryItemComboBox1.Items.Add(cbd4);
             DataItemRepositoryItemComboBox1.Items.Add(cbd5);
             DataItemRepositoryItemComboBox1.Items.Add(cbd6);
             DataItemRepositoryItemComboBox1.Items.Add(cbd7);
             DataItemRepositoryItemComboBox1.Items.Add(cbd8);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd9);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd10);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd11);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd12);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd13);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd14);
+            DataItemRepositoryItemComboBox1.Items.Add(cbd15);
             #endregion
         }
 
@@ -136,10 +164,10 @@ namespace UAS_PLCDataReader
         private void Main_Load(object sender, EventArgs e)
         {
             //设备列表
-            GridDeviceList.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DE_ID,DE_CODE,DE_NAME,DE_CURRENTCENTERCODE,DE_CURRENTCENTERNAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME,DE_SOURCECODE,DE_ITEM1,DE_ITEM2,DE_ITEM3 FROM DEVICE ORDER BY DE_CODE".ToUpper();
+            GridDeviceList.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DE_ID,DE_CODE,DE_NAME,DE_CURRENTCENTERCODE,DE_CURRENTCENTERNAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME,DE_SOURCECODE,DE_ITEM1,DE_ITEM2,DE_ITEM3,DE_ITEM4,DE_ITEM5,DE_ITEM6,DE_ITEM7,DE_ITEM8,DE_ITEM9,DE_ITEM10 FROM DEVICE ORDER BY DE_CODE".ToUpper();
             GridDeviceList.TableName = "device";
             GridDeviceList.ID = "de_id";
-            GridDeviceList.InsertSQL = "INSERT INTO DEVICE(DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_CURRENTCENTERCODE,DE_CURRENTCENTERNAME,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME,DE_SOURCECODE,DE_ITEM1,DE_ITEM2,DE_ITEM3) VALUES(DEVICE_SEQ.NEXTVAL,:DE_CODE,:DE_NAME,:DE_CURRENTCENTERCODE,:DE_CURRENTCENTERNAME,:DE_SPEC,sysdate,:DE_RUNSTATUS,:DE_ADDRESS,:DE_INMAN,:DE_LINECODE,:DE_WCCODE,:DE_VENDCODE,:DE_VENDNAME,:DE_STEPCODE,:DE_STEPNAME,:DE_SOURCECODE,:DE_ITEM1,:DE_ITEM2,:DE_ITEM3)";
+            GridDeviceList.InsertSQL = "INSERT INTO DEVICE(DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_CURRENTCENTERCODE,DE_CURRENTCENTERNAME,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME,DE_SOURCECODE,DE_ITEM1,DE_ITEM2,DE_ITEM3,DE_ITEM4,DE_ITEM5,DE_ITEM6,DE_ITEM7,DE_ITEM8,DE_ITEM9,DE_ITEM10) VALUES(DEVICE_SEQ.NEXTVAL,:DE_CODE,:DE_NAME,:DE_CURRENTCENTERCODE,:DE_CURRENTCENTERNAME,:DE_SPEC,sysdate,:DE_RUNSTATUS,:DE_ADDRESS,:DE_INMAN,:DE_LINECODE,:DE_WCCODE,:DE_VENDCODE,:DE_VENDNAME,:DE_STEPCODE,:DE_STEPNAME,:DE_SOURCECODE,:DE_ITEM1,:DE_ITEM2,:DE_ITEM3,:DE_ITEM4,:DE_ITEM5,:DE_ITEM6,:DE_ITEM7,:DE_ITEM8,:DE_ITEM9,:DE_ITEM10)";
             ButtonAddDevice.Grid = GridDeviceList;
             ButtonSaveDevice.Grid = GridDeviceList;
             ButtonDeleteDevice.Grid = GridDeviceList;
@@ -153,7 +181,7 @@ namespace UAS_PLCDataReader
             ButtonDeleteCommandSet.Grid = GridPollingSetting;
 
             //指令设置界面
-            GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,case when dc_type='INQTY' then '投入' when dc_type='OUTQTY' then '产出' when dc_type='TEMPERATURE' then '温度' when dc_type='PARAM1' then '参数1' when dc_type='PARAM2' then '参数2' when dc_type='PARAM3' then '参数3'  end dc_typename,dc_value,dc_dataindex,dc_sendcoding,dc_receivecoding,db_name,dc_man,dc_date from devicecommand left join devicebrand on db_code=dc_debrand".ToUpper();
+            GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,case when dc_type='INQTY' then '投入' when dc_type='OUTQTY' then '产出' when dc_type='TEMPERATURE' then '温度' when dc_type='PARAM1' then '参数1' when dc_type='PARAM2' then '参数2' when dc_type='PARAM3' then '参数3' when dc_type='PARAM4' then '参数4' when dc_type='PARAM5' then '参数5' when dc_type='PARAM6' then '参数6' when dc_type='PARAM7' then '参数7' when dc_type='PARAM8' then '参数8' when dc_type='PARAM9' then '参数9' when dc_type='PARAM10' then '参数10' when dc_type='PARAM3' then '参数3'  end dc_typename,dc_value,dc_dataindex,dc_sendcoding,dc_receivecoding,db_name,dc_man,dc_date from devicecommand left join devicebrand on db_code=dc_debrand ".ToUpper();
             GridCommandSetting.TableName = "devicecommand";
             GridCommandSetting.ID = "dc_id";
             GridCommandSetting.InsertSQL = "insert into devicecommand(dc_id,dc_code,dc_name,dc_value,dc_debrand,dc_sendcoding,dc_receivecoding,dc_man,dc_date,dc_dataindex,dc_type) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding,'" + User.UserName + "',sysdate,:dc_dataindex,:dc_type)";
@@ -270,7 +298,7 @@ namespace UAS_PLCDataReader
             string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
             string LC = BaseUtil.GetComboxEditValue(ComboxDeviceListLC);
             DeviceListQuerySQL.Append("select 0 CHECKEDCOLUMN,DE_CURRENTCENTERCODE,DE_CURRENTCENTERNAME,de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode, ");
-            DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_inman,de_linecode,de_stepcode,de_stepname,DE_SOURCECODE,de_item1,de_item2,de_item3 from device where 1=1");
+            DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_inman,de_linecode,de_stepcode,de_stepname,DE_SOURCECODE,de_item1,de_item2,de_item3,de_item4,de_item5,de_item6,de_item7,de_item8,de_item9,de_item10 from device where 1=1");
             if (WC != "全部")
                 DeviceListQuerySQL.Append(" and de_wccode='" + WC + "' ");
             if (LC != "全部")
@@ -397,13 +425,13 @@ namespace UAS_PLCDataReader
 
                 DataTable dt = (DataTable)SystemInf.dh.ExecuteSql("select * from devicebrand", "select");
                 BaseUtil.FillComBoxEditWidthDataTable(Brand, "db_name", "db_code", dt);
-                GridCommandSetting.Condition = " where dc_debrand='" + BaseUtil.GetComboxEditValue(Brand) + "' order by dc_id";
+                GridCommandSetting.Condition = " where dc_debrand='" + BaseUtil.GetComboxEditValue(Brand) + "' order by dc_code,dc_dataindex";
             }
         }
 
         private void Brand_SelectedIndexChanged(object sender, EventArgs e)
         {
-            GridCommandSetting.Condition = " where dc_debrand='" + BaseUtil.GetComboxEditValue(Brand) + "' order by dc_id";
+            GridCommandSetting.Condition = " where dc_debrand='" + BaseUtil.GetComboxEditValue(Brand) + "' order by dc_code,dc_dataindex";
             GridCommandSetting.RefreshData();
         }