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

UAS_DeviceMonitor/CustomerControl/AutoDataGridControl/AutoDataGridControl.cs

@@ -132,6 +132,8 @@ namespace UAS_DeviceMonitor.CustomerControl.AutoDataGridControl
                 rowCount = dt.Rows.Count;
                 DataSource = dt;
                 getDataSQL = firstsql;
+                //调用列自适应，自动调整最合适列宽
+                (MainView as GridViewWithSerialNum.GridViewWithSerialNum).BestFitColumns();
             }
             DataRefresh?.Invoke(new object(), new EventArgs());
         }

UAS_DeviceMonitor/CustomerControl/Button/ButtonSaveGrid.cs

@@ -40,20 +40,22 @@ namespace UAS_DeviceMonitor.CustomerControl.Button
             }
         }
 
+        public string[] LastSaveID;
+
         public ButtonSaveGrid()
         {
             InitializeComponent();
         }
 
         /// <summary>
-        /// 处理完其他Click事件提供回调函数重新触发保存事件
+        /// 内部调用，重新刷新数据
         /// </summary>
-        public void DoSave()
+        private void DoSave()
         {
             DataTable dt = ((DataTable)grid.DataSource).GetChanges();
             if (dt != null && dt.Rows.Count > 0)
             {
-                SystemInf.dh.SaveDataTable(dt, grid.TableName, grid.ID, grid.InsertSQL);
+                SystemInf.dh.SaveDataTable(dt, grid.TableName, grid.ID, out LastSaveID, grid.InsertSQL);
                 grid.RefreshData();
                 XtraMessageBox.Show("保存成功", "提示");
             }
@@ -63,6 +65,23 @@ namespace UAS_DeviceMonitor.CustomerControl.Button
             }
         }
 
+        /// <summary>
+        /// 外部调用，不重新刷新数据
+        /// </summary>
+        public void DoSaveAfterHandler()
+        {
+            DataTable dt = ((DataTable)grid.DataSource).GetChanges();
+            if (dt != null && dt.Rows.Count > 0)
+            {
+                SystemInf.dh.SaveDataTable(dt, grid.TableName, grid.ID, out LastSaveID, grid.InsertSQL);
+                XtraMessageBox.Show("保存成功", "提示");
+            }
+            else
+            {
+                XtraMessageBox.Show("没有修改过的数据", "提示");
+            }
+        }
+
         private void ButtonSaveGrid_Click(object sender, EventArgs e)
         {
             if (!handlerOtherFirst)

UAS_DeviceMonitor/Main.Designer.cs

@@ -49,18 +49,35 @@ namespace UAS_DeviceMonitor
             this.RibDeviceCommand = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.MainTabControl = new DevExpress.XtraTab.XtraTabControl();
             this.PageDeviceList = new DevExpress.XtraTab.XtraTabPage();
-            this.ToolPageControlDeviceList = new UAS_DeviceMonitor.CustomerControl.PagingControl.PageControl();
+            this.ButtonAddDevice = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
+            this.ButtonDeleteDevice = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
+            this.ButtonSaveDevice = new UAS_DeviceMonitor.CustomerControl.Button.ButtonSaveGrid();
+            this.ComBoxDeviceListMan = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.em_code = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.em_name = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.ComBoxDeviceListMan_label = new DevExpress.XtraEditors.LabelControl();
+            this.ComboxDeviceListWC = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.ComboxDeviceListLC = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.ComboxDeviceListLC_label = new DevExpress.XtraEditors.LabelControl();
+            this.ComboxDeviceListWC_label = new DevExpress.XtraEditors.LabelControl();
             this.GridDeviceList = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
             this.GridViewDeviceList = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
+            this.DeviceListCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dpc_enableCheckEdit = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.de_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_code = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_name = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_runstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_stepcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_stepname = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_indate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_spec = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_inman = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_vendcode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_vendname = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_address = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.de_linecode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_wccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PageCommandSet = new DevExpress.XtraTab.XtraTabPage();
             this.ButtonDeleteCommand = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
@@ -75,10 +92,14 @@ namespace UAS_DeviceMonitor
             this.dc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dc_code = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dc_name = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dc_type = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dc_value = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dc_sendcoding = new DevExpress.XtraGrid.Columns.GridColumn();
             this.CommandSetRepositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.dc_receivecoding = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dc_man = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dc_date = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.db_name = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PageDeviceNetSetting = new DevExpress.XtraTab.XtraTabPage();
             this.ButtonDeleteNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
             this.ButtonAddNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
@@ -86,7 +107,6 @@ namespace UAS_DeviceMonitor
             this.GridDeviceNetSetting = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
             this.GridViewDeviceNetSetting = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
             this.NetSettingCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.dpc_enableCheckEdit = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.dnc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dnc_getway = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -115,7 +135,9 @@ namespace UAS_DeviceMonitor
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_function = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_enable = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.em_name1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.dpc_man = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.POLLSETTINGSTATUSCOLUMN = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PollingSetItemLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
@@ -148,8 +170,13 @@ namespace UAS_DeviceMonitor
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
             this.MainTabControl.SuspendLayout();
             this.PageDeviceList.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.ComBoxDeviceListMan.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ComboxDeviceListWC.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ComboxDeviceListLC.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridDeviceList)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceList)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dpc_enableCheckEdit)).BeginInit();
             this.PageCommandSet.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Brand.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridCommandSetting)).BeginInit();
@@ -159,7 +186,6 @@ namespace UAS_DeviceMonitor
             this.PageDeviceNetSetting.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridDeviceNetSetting)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceNetSetting)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dpc_enableCheckEdit)).BeginInit();
             this.PagePollingSetting.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).BeginInit();
@@ -221,7 +247,7 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonCommandSet
             // 
-            this.ButtonCommandSet.Caption = "通信规则定义";
+            this.ButtonCommandSet.Caption = "设备指令设置";
             this.ButtonCommandSet.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.Glyph")));
             this.ButtonCommandSet.Id = 9;
             this.ButtonCommandSet.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.LargeGlyph")));
@@ -319,21 +345,154 @@ namespace UAS_DeviceMonitor
             // 
             // PageDeviceList
             // 
-            this.PageDeviceList.Controls.Add(this.ToolPageControlDeviceList);
+            this.PageDeviceList.Controls.Add(this.ButtonAddDevice);
+            this.PageDeviceList.Controls.Add(this.ButtonDeleteDevice);
+            this.PageDeviceList.Controls.Add(this.ButtonSaveDevice);
+            this.PageDeviceList.Controls.Add(this.ComBoxDeviceListMan);
+            this.PageDeviceList.Controls.Add(this.ComBoxDeviceListMan_label);
+            this.PageDeviceList.Controls.Add(this.ComboxDeviceListWC);
+            this.PageDeviceList.Controls.Add(this.ComboxDeviceListLC);
+            this.PageDeviceList.Controls.Add(this.ComboxDeviceListLC_label);
+            this.PageDeviceList.Controls.Add(this.ComboxDeviceListWC_label);
             this.PageDeviceList.Controls.Add(this.GridDeviceList);
             this.PageDeviceList.Name = "PageDeviceList";
             this.PageDeviceList.PageVisible = false;
             this.PageDeviceList.Size = new System.Drawing.Size(1027, 577);
             this.PageDeviceList.Text = "xtraTabPage1";
+            this.PageDeviceList.VisibleChanged += new System.EventHandler(this.PageDeviceList_VisibleChanged);
+            // 
+            // ButtonAddDevice
+            // 
+            this.ButtonAddDevice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonAddDevice.Grid = null;
+            this.ButtonAddDevice.Location = new System.Drawing.Point(811, 4);
+            this.ButtonAddDevice.Name = "ButtonAddDevice";
+            this.ButtonAddDevice.Size = new System.Drawing.Size(64, 23);
+            this.ButtonAddDevice.TabIndex = 16;
+            this.ButtonAddDevice.Text = "新增";
+            // 
+            // ButtonDeleteDevice
+            // 
+            this.ButtonDeleteDevice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDeleteDevice.Grid = null;
+            this.ButtonDeleteDevice.Location = new System.Drawing.Point(951, 4);
+            this.ButtonDeleteDevice.Name = "ButtonDeleteDevice";
+            this.ButtonDeleteDevice.Size = new System.Drawing.Size(64, 23);
+            this.ButtonDeleteDevice.TabIndex = 15;
+            this.ButtonDeleteDevice.Text = "删除";
+            // 
+            // ButtonSaveDevice
+            // 
+            this.ButtonSaveDevice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonSaveDevice.Grid = null;
+            this.ButtonSaveDevice.HandlerOtherFirst = true;
+            this.ButtonSaveDevice.Location = new System.Drawing.Point(881, 4);
+            this.ButtonSaveDevice.Name = "ButtonSaveDevice";
+            this.ButtonSaveDevice.Size = new System.Drawing.Size(64, 23);
+            this.ButtonSaveDevice.TabIndex = 14;
+            this.ButtonSaveDevice.Text = "保存";
+            this.ButtonSaveDevice.Click += new System.EventHandler(this.ButtonSaveDevice_Click);
+            // 
+            // ComBoxDeviceListMan
+            // 
+            this.ComBoxDeviceListMan.EditValue = "";
+            this.ComBoxDeviceListMan.Location = new System.Drawing.Point(360, 5);
+            this.ComBoxDeviceListMan.MenuManager = this.RibbonNav;
+            this.ComBoxDeviceListMan.Name = "ComBoxDeviceListMan";
+            this.ComBoxDeviceListMan.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 8F);
+            this.ComBoxDeviceListMan.Properties.Appearance.Options.UseFont = true;
+            this.ComBoxDeviceListMan.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.ComBoxDeviceListMan.Properties.DisplayMember = "EM_NAME";
+            this.ComBoxDeviceListMan.Properties.NullText = "";
+            this.ComBoxDeviceListMan.Properties.ValueMember = "EM_CODE";
+            this.ComBoxDeviceListMan.Properties.View = this.searchLookUpEdit1View;
+            this.ComBoxDeviceListMan.Size = new System.Drawing.Size(100, 22);
+            this.ComBoxDeviceListMan.TabIndex = 12;
+            this.ComBoxDeviceListMan.Visible = false;
+            this.ComBoxDeviceListMan.EditValueChanged += new System.EventHandler(this.ComBoxDeviceListMan_EditValueChanged);
+            // 
+            // searchLookUpEdit1View
+            // 
+            this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.em_code,
+            this.em_name});
+            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // em_code
+            // 
+            this.em_code.Caption = "编号";
+            this.em_code.FieldName = "EM_CODE";
+            this.em_code.Name = "em_code";
+            this.em_code.Visible = true;
+            this.em_code.VisibleIndex = 0;
+            // 
+            // em_name
+            // 
+            this.em_name.Caption = "名称";
+            this.em_name.FieldName = "EM_NAME";
+            this.em_name.Name = "em_name";
+            this.em_name.Visible = true;
+            this.em_name.VisibleIndex = 1;
+            // 
+            // ComBoxDeviceListMan_label
+            // 
+            this.ComBoxDeviceListMan_label.Appearance.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ComBoxDeviceListMan_label.Location = new System.Drawing.Point(318, 8);
+            this.ComBoxDeviceListMan_label.Name = "ComBoxDeviceListMan_label";
+            this.ComBoxDeviceListMan_label.Size = new System.Drawing.Size(32, 16);
+            this.ComBoxDeviceListMan_label.TabIndex = 11;
+            this.ComBoxDeviceListMan_label.Text = "人员";
+            this.ComBoxDeviceListMan_label.Visible = false;
+            // 
+            // ComboxDeviceListWC
+            // 
+            this.ComboxDeviceListWC.Location = new System.Drawing.Point(49, 5);
+            this.ComboxDeviceListWC.MenuManager = this.RibbonNav;
+            this.ComboxDeviceListWC.Name = "ComboxDeviceListWC";
+            this.ComboxDeviceListWC.Properties.Appearance.Font = new System.Drawing.Font("黑体", 11F);
+            this.ComboxDeviceListWC.Properties.Appearance.Options.UseFont = true;
+            this.ComboxDeviceListWC.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.ComboxDeviceListWC.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.ComboxDeviceListWC.Size = new System.Drawing.Size(100, 22);
+            this.ComboxDeviceListWC.TabIndex = 6;
+            this.ComboxDeviceListWC.SelectedIndexChanged += new System.EventHandler(this.ComboxDeviceListWC_SelectedIndexChanged);
+            // 
+            // ComboxDeviceListLC
+            // 
+            this.ComboxDeviceListLC.Location = new System.Drawing.Point(201, 5);
+            this.ComboxDeviceListLC.MenuManager = this.RibbonNav;
+            this.ComboxDeviceListLC.Name = "ComboxDeviceListLC";
+            this.ComboxDeviceListLC.Properties.Appearance.Font = new System.Drawing.Font("黑体", 11F);
+            this.ComboxDeviceListLC.Properties.Appearance.Options.UseFont = true;
+            this.ComboxDeviceListLC.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.ComboxDeviceListLC.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.ComboxDeviceListLC.Size = new System.Drawing.Size(100, 22);
+            this.ComboxDeviceListLC.TabIndex = 7;
+            this.ComboxDeviceListLC.SelectedIndexChanged += new System.EventHandler(this.ComboxDeviceListLC_SelectedIndexChanged);
+            // 
+            // ComboxDeviceListLC_label
+            // 
+            this.ComboxDeviceListLC_label.Appearance.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ComboxDeviceListLC_label.Location = new System.Drawing.Point(161, 8);
+            this.ComboxDeviceListLC_label.Name = "ComboxDeviceListLC_label";
+            this.ComboxDeviceListLC_label.Size = new System.Drawing.Size(32, 16);
+            this.ComboxDeviceListLC_label.TabIndex = 9;
+            this.ComboxDeviceListLC_label.Text = "线别";
             // 
-            // ToolPageControlDeviceList
+            // ComboxDeviceListWC_label
             // 
-            this.ToolPageControlDeviceList.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.ToolPageControlDeviceList.Gridcontrol = null;
-            this.ToolPageControlDeviceList.Location = new System.Drawing.Point(0, 548);
-            this.ToolPageControlDeviceList.Name = "ToolPageControlDeviceList";
-            this.ToolPageControlDeviceList.Size = new System.Drawing.Size(1027, 29);
-            this.ToolPageControlDeviceList.TabIndex = 1;
+            this.ComboxDeviceListWC_label.Appearance.Font = new System.Drawing.Font("黑体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ComboxDeviceListWC_label.Location = new System.Drawing.Point(10, 8);
+            this.ComboxDeviceListWC_label.Name = "ComboxDeviceListWC_label";
+            this.ComboxDeviceListWC_label.Size = new System.Drawing.Size(32, 16);
+            this.ComboxDeviceListWC_label.TabIndex = 8;
+            this.ComboxDeviceListWC_label.Text = "车间";
             // 
             // GridDeviceList
             // 
@@ -344,12 +503,12 @@ namespace UAS_DeviceMonitor
             this.GridDeviceList.GetDataSQL = null;
             this.GridDeviceList.ID = null;
             this.GridDeviceList.InsertSQL = null;
-            this.GridDeviceList.Location = new System.Drawing.Point(0, 0);
+            this.GridDeviceList.Location = new System.Drawing.Point(0, 31);
             this.GridDeviceList.MainView = this.GridViewDeviceList;
             this.GridDeviceList.MenuManager = this.RibbonNav;
             this.GridDeviceList.Name = "GridDeviceList";
             this.GridDeviceList.RowCount = 0;
-            this.GridDeviceList.Size = new System.Drawing.Size(1027, 545);
+            this.GridDeviceList.Size = new System.Drawing.Size(1027, 546);
             this.GridDeviceList.TabIndex = 0;
             this.GridDeviceList.TableName = null;
             this.GridDeviceList.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -358,15 +517,20 @@ namespace UAS_DeviceMonitor
             // GridViewDeviceList
             // 
             this.GridViewDeviceList.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.DeviceListCheckedColumn,
             this.de_id,
             this.de_code,
             this.de_name,
             this.de_runstatus,
+            this.de_stepcode,
+            this.de_stepname,
             this.de_indate,
             this.de_spec,
+            this.de_inman,
             this.de_vendcode,
             this.de_vendname,
             this.de_address,
+            this.de_linecode,
             this.de_wccode});
             this.GridViewDeviceList.GridControl = this.GridDeviceList;
             this.GridViewDeviceList.IndicatorWidth = 30;
@@ -374,6 +538,24 @@ namespace UAS_DeviceMonitor
             this.GridViewDeviceList.OptionsView.ShowGroupPanel = false;
             this.GridViewDeviceList.RowCellClick += new DevExpress.XtraGrid.Views.Grid.RowCellClickEventHandler(this.GridViewDeviceList_RowCellClick);
             // 
+            // DeviceListCheckedColumn
+            // 
+            this.DeviceListCheckedColumn.Caption = " ";
+            this.DeviceListCheckedColumn.ColumnEdit = this.dpc_enableCheckEdit;
+            this.DeviceListCheckedColumn.FieldName = "CHECKEDCOLUMN";
+            this.DeviceListCheckedColumn.Name = "DeviceListCheckedColumn";
+            this.DeviceListCheckedColumn.Visible = true;
+            this.DeviceListCheckedColumn.VisibleIndex = 0;
+            // 
+            // dpc_enableCheckEdit
+            // 
+            this.dpc_enableCheckEdit.AutoHeight = false;
+            this.dpc_enableCheckEdit.Name = "dpc_enableCheckEdit";
+            this.dpc_enableCheckEdit.NullStyle = DevExpress.XtraEditors.Controls.StyleIndeterminate.Unchecked;
+            this.dpc_enableCheckEdit.NullText = "0";
+            this.dpc_enableCheckEdit.ValueChecked = "-1";
+            this.dpc_enableCheckEdit.ValueUnchecked = "0";
+            // 
             // de_id
             // 
             this.de_id.Caption = "de_id";
@@ -386,7 +568,7 @@ namespace UAS_DeviceMonitor
             this.de_code.FieldName = "DE_CODE";
             this.de_code.Name = "de_code";
             this.de_code.Visible = true;
-            this.de_code.VisibleIndex = 0;
+            this.de_code.VisibleIndex = 1;
             // 
             // de_name
             // 
@@ -394,7 +576,7 @@ namespace UAS_DeviceMonitor
             this.de_name.FieldName = "DE_NAME";
             this.de_name.Name = "de_name";
             this.de_name.Visible = true;
-            this.de_name.VisibleIndex = 1;
+            this.de_name.VisibleIndex = 2;
             // 
             // de_runstatus
             // 
@@ -402,7 +584,23 @@ namespace UAS_DeviceMonitor
             this.de_runstatus.FieldName = "DE_RUNSTATUS";
             this.de_runstatus.Name = "de_runstatus";
             this.de_runstatus.Visible = true;
-            this.de_runstatus.VisibleIndex = 2;
+            this.de_runstatus.VisibleIndex = 3;
+            // 
+            // de_stepcode
+            // 
+            this.de_stepcode.Caption = "工序编号";
+            this.de_stepcode.FieldName = "DE_STEPCODE";
+            this.de_stepcode.Name = "de_stepcode";
+            this.de_stepcode.Visible = true;
+            this.de_stepcode.VisibleIndex = 5;
+            // 
+            // de_stepname
+            // 
+            this.de_stepname.Caption = "工序名称";
+            this.de_stepname.FieldName = "DE_STEPNAME";
+            this.de_stepname.Name = "de_stepname";
+            this.de_stepname.Visible = true;
+            this.de_stepname.VisibleIndex = 6;
             // 
             // de_indate
             // 
@@ -413,7 +611,7 @@ namespace UAS_DeviceMonitor
             this.de_indate.FilterMode = DevExpress.XtraGrid.ColumnFilterMode.DisplayText;
             this.de_indate.Name = "de_indate";
             this.de_indate.Visible = true;
-            this.de_indate.VisibleIndex = 3;
+            this.de_indate.VisibleIndex = 4;
             // 
             // de_spec
             // 
@@ -421,15 +619,21 @@ namespace UAS_DeviceMonitor
             this.de_spec.FieldName = "DE_SPEC";
             this.de_spec.Name = "de_spec";
             this.de_spec.Visible = true;
-            this.de_spec.VisibleIndex = 4;
+            this.de_spec.VisibleIndex = 7;
+            // 
+            // de_inman
+            // 
+            this.de_inman.Caption = "维护人员";
+            this.de_inman.FieldName = "DE_INMAN";
+            this.de_inman.Name = "de_inman";
+            this.de_inman.Visible = true;
+            this.de_inman.VisibleIndex = 8;
             // 
             // de_vendcode
             // 
             this.de_vendcode.Caption = "供应商编号";
             this.de_vendcode.FieldName = "DE_VENDCODE";
             this.de_vendcode.Name = "de_vendcode";
-            this.de_vendcode.Visible = true;
-            this.de_vendcode.VisibleIndex = 5;
             // 
             // de_vendname
             // 
@@ -437,7 +641,7 @@ namespace UAS_DeviceMonitor
             this.de_vendname.FieldName = "DE_VENDNAME";
             this.de_vendname.Name = "de_vendname";
             this.de_vendname.Visible = true;
-            this.de_vendname.VisibleIndex = 6;
+            this.de_vendname.VisibleIndex = 9;
             // 
             // de_address
             // 
@@ -445,7 +649,15 @@ namespace UAS_DeviceMonitor
             this.de_address.FieldName = "DE_ADDRESS";
             this.de_address.Name = "de_address";
             this.de_address.Visible = true;
-            this.de_address.VisibleIndex = 7;
+            this.de_address.VisibleIndex = 10;
+            // 
+            // de_linecode
+            // 
+            this.de_linecode.Caption = "线别";
+            this.de_linecode.FieldName = "DE_LINECODE";
+            this.de_linecode.Name = "de_linecode";
+            this.de_linecode.Visible = true;
+            this.de_linecode.VisibleIndex = 11;
             // 
             // de_wccode
             // 
@@ -453,7 +665,7 @@ namespace UAS_DeviceMonitor
             this.de_wccode.FieldName = "DE_WCCODE";
             this.de_wccode.Name = "de_wccode";
             this.de_wccode.Visible = true;
-            this.de_wccode.VisibleIndex = 8;
+            this.de_wccode.VisibleIndex = 12;
             // 
             // PageCommandSet
             // 
@@ -471,9 +683,9 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonDeleteCommand
             // 
-            this.ButtonDeleteCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDeleteCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonDeleteCommand.Grid = null;
-            this.ButtonDeleteCommand.Location = new System.Drawing.Point(816, 551);
+            this.ButtonDeleteCommand.Location = new System.Drawing.Point(945, 5);
             this.ButtonDeleteCommand.Name = "ButtonDeleteCommand";
             this.ButtonDeleteCommand.Size = new System.Drawing.Size(64, 23);
             this.ButtonDeleteCommand.TabIndex = 6;
@@ -504,9 +716,9 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonNewCommand
             // 
-            this.ButtonNewCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonNewCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonNewCommand.Grid = null;
-            this.ButtonNewCommand.Location = new System.Drawing.Point(886, 551);
+            this.ButtonNewCommand.Location = new System.Drawing.Point(805, 5);
             this.ButtonNewCommand.Name = "ButtonNewCommand";
             this.ButtonNewCommand.Size = new System.Drawing.Size(64, 23);
             this.ButtonNewCommand.TabIndex = 3;
@@ -514,10 +726,10 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonSaveCommand
             // 
-            this.ButtonSaveCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonSaveCommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonSaveCommand.Grid = null;
             this.ButtonSaveCommand.HandlerOtherFirst = true;
-            this.ButtonSaveCommand.Location = new System.Drawing.Point(956, 551);
+            this.ButtonSaveCommand.Location = new System.Drawing.Point(875, 5);
             this.ButtonSaveCommand.Name = "ButtonSaveCommand";
             this.ButtonSaveCommand.Size = new System.Drawing.Size(64, 23);
             this.ButtonSaveCommand.TabIndex = 2;
@@ -541,7 +753,7 @@ namespace UAS_DeviceMonitor
             this.CheckEditCommandSet,
             this.CommandSetRepositoryItemComboBox1});
             this.GridCommandSetting.RowCount = 0;
-            this.GridCommandSetting.Size = new System.Drawing.Size(1027, 517);
+            this.GridCommandSetting.Size = new System.Drawing.Size(1027, 546);
             this.GridCommandSetting.TabIndex = 1;
             this.GridCommandSetting.TableName = null;
             this.GridCommandSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -554,9 +766,13 @@ namespace UAS_DeviceMonitor
             this.dc_id,
             this.dc_code,
             this.dc_name,
+            this.dc_type,
             this.dc_value,
             this.dc_sendcoding,
-            this.dc_receivecoding});
+            this.dc_receivecoding,
+            this.dc_man,
+            this.dc_date,
+            this.db_name});
             this.GridViewCommandSet.GridControl = this.GridCommandSetting;
             this.GridViewCommandSet.IndicatorWidth = 30;
             this.GridViewCommandSet.Name = "GridViewCommandSet";
@@ -572,7 +788,7 @@ namespace UAS_DeviceMonitor
             this.CommandSetCheckedColumn.Tag = "0";
             this.CommandSetCheckedColumn.Visible = true;
             this.CommandSetCheckedColumn.VisibleIndex = 0;
-            this.CommandSetCheckedColumn.Width = 60;
+            this.CommandSetCheckedColumn.Width = 46;
             // 
             // CheckEditCommandSet
             // 
@@ -592,7 +808,7 @@ namespace UAS_DeviceMonitor
             this.dc_code.Name = "dc_code";
             this.dc_code.Visible = true;
             this.dc_code.VisibleIndex = 1;
-            this.dc_code.Width = 95;
+            this.dc_code.Width = 64;
             // 
             // dc_name
             // 
@@ -601,7 +817,16 @@ namespace UAS_DeviceMonitor
             this.dc_name.Name = "dc_name";
             this.dc_name.Visible = true;
             this.dc_name.VisibleIndex = 2;
-            this.dc_name.Width = 99;
+            this.dc_name.Width = 71;
+            // 
+            // dc_type
+            // 
+            this.dc_type.Caption = "指令类型";
+            this.dc_type.FieldName = "DC_TYPE";
+            this.dc_type.Name = "dc_type";
+            this.dc_type.Visible = true;
+            this.dc_type.VisibleIndex = 3;
+            this.dc_type.Width = 57;
             // 
             // dc_value
             // 
@@ -609,8 +834,8 @@ namespace UAS_DeviceMonitor
             this.dc_value.FieldName = "DC_VALUE";
             this.dc_value.Name = "dc_value";
             this.dc_value.Visible = true;
-            this.dc_value.VisibleIndex = 3;
-            this.dc_value.Width = 291;
+            this.dc_value.VisibleIndex = 4;
+            this.dc_value.Width = 154;
             // 
             // dc_sendcoding
             // 
@@ -619,8 +844,8 @@ namespace UAS_DeviceMonitor
             this.dc_sendcoding.FieldName = "DC_SENDCODING";
             this.dc_sendcoding.Name = "dc_sendcoding";
             this.dc_sendcoding.Visible = true;
-            this.dc_sendcoding.VisibleIndex = 4;
-            this.dc_sendcoding.Width = 219;
+            this.dc_sendcoding.VisibleIndex = 5;
+            this.dc_sendcoding.Width = 138;
             // 
             // CommandSetRepositoryItemComboBox1
             // 
@@ -636,8 +861,37 @@ namespace UAS_DeviceMonitor
             this.dc_receivecoding.FieldName = "DC_RECEIVECODING";
             this.dc_receivecoding.Name = "dc_receivecoding";
             this.dc_receivecoding.Visible = true;
-            this.dc_receivecoding.VisibleIndex = 5;
-            this.dc_receivecoding.Width = 231;
+            this.dc_receivecoding.VisibleIndex = 6;
+            this.dc_receivecoding.Width = 139;
+            // 
+            // dc_man
+            // 
+            this.dc_man.Caption = "维护人员";
+            this.dc_man.FieldName = "DC_MAN";
+            this.dc_man.Name = "dc_man";
+            this.dc_man.OptionsColumn.AllowEdit = false;
+            this.dc_man.Visible = true;
+            this.dc_man.VisibleIndex = 8;
+            this.dc_man.Width = 217;
+            // 
+            // dc_date
+            // 
+            this.dc_date.Caption = "维护时间";
+            this.dc_date.FieldName = "DC_DATE";
+            this.dc_date.Name = "dc_date";
+            this.dc_date.OptionsColumn.AllowEdit = false;
+            this.dc_date.Visible = true;
+            this.dc_date.VisibleIndex = 9;
+            this.dc_date.Width = 52;
+            // 
+            // db_name
+            // 
+            this.db_name.Caption = "品牌";
+            this.db_name.FieldName = "DB_NAME";
+            this.db_name.Name = "db_name";
+            this.db_name.Visible = true;
+            this.db_name.VisibleIndex = 7;
+            this.db_name.Width = 57;
             // 
             // PageDeviceNetSetting
             // 
@@ -651,9 +905,9 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonDeleteNetConfig
             // 
-            this.ButtonDeleteNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDeleteNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonDeleteNetConfig.Grid = null;
-            this.ButtonDeleteNetConfig.Location = new System.Drawing.Point(813, 548);
+            this.ButtonDeleteNetConfig.Location = new System.Drawing.Point(942, 7);
             this.ButtonDeleteNetConfig.Name = "ButtonDeleteNetConfig";
             this.ButtonDeleteNetConfig.Size = new System.Drawing.Size(64, 23);
             this.ButtonDeleteNetConfig.TabIndex = 12;
@@ -661,9 +915,9 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonAddNetConfig
             // 
-            this.ButtonAddNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonAddNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonAddNetConfig.Grid = null;
-            this.ButtonAddNetConfig.Location = new System.Drawing.Point(883, 548);
+            this.ButtonAddNetConfig.Location = new System.Drawing.Point(802, 7);
             this.ButtonAddNetConfig.Name = "ButtonAddNetConfig";
             this.ButtonAddNetConfig.Size = new System.Drawing.Size(64, 23);
             this.ButtonAddNetConfig.TabIndex = 11;
@@ -671,10 +925,10 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonSaveNetConfig
             // 
-            this.ButtonSaveNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonSaveNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonSaveNetConfig.Grid = null;
             this.ButtonSaveNetConfig.HandlerOtherFirst = false;
-            this.ButtonSaveNetConfig.Location = new System.Drawing.Point(953, 548);
+            this.ButtonSaveNetConfig.Location = new System.Drawing.Point(872, 7);
             this.ButtonSaveNetConfig.Name = "ButtonSaveNetConfig";
             this.ButtonSaveNetConfig.Size = new System.Drawing.Size(64, 23);
             this.ButtonSaveNetConfig.TabIndex = 10;
@@ -689,14 +943,14 @@ namespace UAS_DeviceMonitor
             this.GridDeviceNetSetting.GetDataSQL = null;
             this.GridDeviceNetSetting.ID = null;
             this.GridDeviceNetSetting.InsertSQL = null;
-            this.GridDeviceNetSetting.Location = new System.Drawing.Point(0, 2);
+            this.GridDeviceNetSetting.Location = new System.Drawing.Point(0, 34);
             this.GridDeviceNetSetting.MainView = this.GridViewDeviceNetSetting;
             this.GridDeviceNetSetting.MenuManager = this.RibbonNav;
             this.GridDeviceNetSetting.Name = "GridDeviceNetSetting";
             this.GridDeviceNetSetting.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.dpc_enableCheckEdit});
             this.GridDeviceNetSetting.RowCount = 0;
-            this.GridDeviceNetSetting.Size = new System.Drawing.Size(1024, 540);
+            this.GridDeviceNetSetting.Size = new System.Drawing.Size(1024, 543);
             this.GridDeviceNetSetting.TabIndex = 0;
             this.GridDeviceNetSetting.TableName = null;
             this.GridDeviceNetSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -731,15 +985,6 @@ namespace UAS_DeviceMonitor
             this.NetSettingCheckedColumn.Visible = true;
             this.NetSettingCheckedColumn.VisibleIndex = 0;
             // 
-            // dpc_enableCheckEdit
-            // 
-            this.dpc_enableCheckEdit.AutoHeight = false;
-            this.dpc_enableCheckEdit.Name = "dpc_enableCheckEdit";
-            this.dpc_enableCheckEdit.NullStyle = DevExpress.XtraEditors.Controls.StyleIndeterminate.Unchecked;
-            this.dpc_enableCheckEdit.NullText = "0";
-            this.dpc_enableCheckEdit.ValueChecked = "-1";
-            this.dpc_enableCheckEdit.ValueUnchecked = "0";
-            // 
             // dnc_id
             // 
             this.dnc_id.Caption = "ID";
@@ -818,9 +1063,9 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonDeleteCommandSet
             // 
-            this.ButtonDeleteCommandSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonDeleteCommandSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonDeleteCommandSet.Grid = null;
-            this.ButtonDeleteCommandSet.Location = new System.Drawing.Point(816, 549);
+            this.ButtonDeleteCommandSet.Location = new System.Drawing.Point(950, 6);
             this.ButtonDeleteCommandSet.Name = "ButtonDeleteCommandSet";
             this.ButtonDeleteCommandSet.Size = new System.Drawing.Size(64, 23);
             this.ButtonDeleteCommandSet.TabIndex = 9;
@@ -828,9 +1073,9 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonNewCommandSet
             // 
-            this.ButtonNewCommandSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonNewCommandSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonNewCommandSet.Grid = null;
-            this.ButtonNewCommandSet.Location = new System.Drawing.Point(886, 549);
+            this.ButtonNewCommandSet.Location = new System.Drawing.Point(810, 6);
             this.ButtonNewCommandSet.Name = "ButtonNewCommandSet";
             this.ButtonNewCommandSet.Size = new System.Drawing.Size(64, 23);
             this.ButtonNewCommandSet.TabIndex = 8;
@@ -838,19 +1083,20 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonSaveCommandSet
             // 
-            this.ButtonSaveCommandSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonSaveCommandSet.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.ButtonSaveCommandSet.Grid = null;
-            this.ButtonSaveCommandSet.HandlerOtherFirst = false;
-            this.ButtonSaveCommandSet.Location = new System.Drawing.Point(956, 549);
+            this.ButtonSaveCommandSet.HandlerOtherFirst = true;
+            this.ButtonSaveCommandSet.Location = new System.Drawing.Point(880, 6);
             this.ButtonSaveCommandSet.Name = "ButtonSaveCommandSet";
             this.ButtonSaveCommandSet.Size = new System.Drawing.Size(64, 23);
             this.ButtonSaveCommandSet.TabIndex = 7;
             this.ButtonSaveCommandSet.Text = "保存";
+            this.ButtonSaveCommandSet.Click += new System.EventHandler(this.ButtonSaveCommandSet_Click);
             // 
             // ButtonPausePolling
             // 
-            this.ButtonPausePolling.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonPausePolling.Location = new System.Drawing.Point(734, 549);
+            this.ButtonPausePolling.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonPausePolling.Location = new System.Drawing.Point(729, 6);
             this.ButtonPausePolling.Name = "ButtonPausePolling";
             this.ButtonPausePolling.Size = new System.Drawing.Size(75, 23);
             this.ButtonPausePolling.TabIndex = 2;
@@ -859,8 +1105,8 @@ namespace UAS_DeviceMonitor
             // 
             // ButtonStartPolling
             // 
-            this.ButtonStartPolling.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.ButtonStartPolling.Location = new System.Drawing.Point(653, 549);
+            this.ButtonStartPolling.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.ButtonStartPolling.Location = new System.Drawing.Point(648, 6);
             this.ButtonStartPolling.Name = "ButtonStartPolling";
             this.ButtonStartPolling.Size = new System.Drawing.Size(75, 23);
             this.ButtonStartPolling.TabIndex = 1;
@@ -876,7 +1122,7 @@ namespace UAS_DeviceMonitor
             this.GridPollingSetting.GetDataSQL = null;
             this.GridPollingSetting.ID = null;
             this.GridPollingSetting.InsertSQL = null;
-            this.GridPollingSetting.Location = new System.Drawing.Point(0, 0);
+            this.GridPollingSetting.Location = new System.Drawing.Point(0, 34);
             this.GridPollingSetting.MainView = this.GridViewPollSetting;
             this.GridPollingSetting.MenuManager = this.RibbonNav;
             this.GridPollingSetting.Name = "GridPollingSetting";
@@ -885,7 +1131,7 @@ namespace UAS_DeviceMonitor
             this.PollingSetItemLookUpEdit,
             this.PollSettingItemSearchLookUpEdit});
             this.GridPollingSetting.RowCount = 0;
-            this.GridPollingSetting.Size = new System.Drawing.Size(1027, 544);
+            this.GridPollingSetting.Size = new System.Drawing.Size(1027, 543);
             this.GridPollingSetting.TabIndex = 0;
             this.GridPollingSetting.TableName = null;
             this.GridPollingSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -901,7 +1147,9 @@ namespace UAS_DeviceMonitor
             this.dpc_dccode,
             this.dpc_function,
             this.dpc_enable,
+            this.em_name1,
             this.dpc_status,
+            this.dpc_man,
             this.dpc_remark,
             this.POLLSETTINGSTATUSCOLUMN});
             this.GridViewPollSetting.GridControl = this.GridPollingSetting;
@@ -909,6 +1157,7 @@ namespace UAS_DeviceMonitor
             this.GridViewPollSetting.Name = "GridViewPollSetting";
             this.GridViewPollSetting.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
             this.GridViewPollSetting.OptionsView.ShowGroupPanel = false;
+            this.GridViewPollSetting.CellValueChanged += new DevExpress.XtraGrid.Views.Base.CellValueChangedEventHandler(this.GridViewPollSetting_CellValueChanged);
             this.GridViewPollSetting.CellValueChanging += new DevExpress.XtraGrid.Views.Base.CellValueChangedEventHandler(this.GridViewPollSetting_CellValueChanging);
             // 
             // PollSettingCheckedColumn
@@ -1020,6 +1269,15 @@ namespace UAS_DeviceMonitor
             this.dpc_enable.VisibleIndex = 5;
             this.dpc_enable.Width = 90;
             // 
+            // em_name1
+            // 
+            this.em_name1.Caption = "维护人";
+            this.em_name1.FieldName = "EM_NAME";
+            this.em_name1.Name = "em_name1";
+            this.em_name1.OptionsColumn.AllowEdit = false;
+            this.em_name1.Visible = true;
+            this.em_name1.VisibleIndex = 9;
+            // 
             // dpc_status
             // 
             this.dpc_status.Caption = "状态";
@@ -1030,6 +1288,13 @@ namespace UAS_DeviceMonitor
             this.dpc_status.VisibleIndex = 6;
             this.dpc_status.Width = 90;
             // 
+            // dpc_man
+            // 
+            this.dpc_man.Caption = "维护人";
+            this.dpc_man.FieldName = "DPC_MAN";
+            this.dpc_man.Name = "dpc_man";
+            this.dpc_man.OptionsColumn.AllowEdit = false;
+            // 
             // dpc_remark
             // 
             this.dpc_remark.Caption = "备注";
@@ -1343,8 +1608,14 @@ namespace UAS_DeviceMonitor
             ((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).EndInit();
             this.MainTabControl.ResumeLayout(false);
             this.PageDeviceList.ResumeLayout(false);
+            this.PageDeviceList.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.ComBoxDeviceListMan.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ComboxDeviceListWC.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.ComboxDeviceListLC.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridDeviceList)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceList)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dpc_enableCheckEdit)).EndInit();
             this.PageCommandSet.ResumeLayout(false);
             this.PageCommandSet.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.Brand.Properties)).EndInit();
@@ -1355,7 +1626,6 @@ namespace UAS_DeviceMonitor
             this.PageDeviceNetSetting.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.GridDeviceNetSetting)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceNetSetting)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dpc_enableCheckEdit)).EndInit();
             this.PagePollingSetting.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).EndInit();
@@ -1407,7 +1677,6 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraGrid.Columns.GridColumn de_vendname;
         private DevExpress.XtraGrid.Columns.GridColumn de_address;
         private DevExpress.XtraGrid.Columns.GridColumn de_wccode;
-        private CustomerControl.PagingControl.PageControl ToolPageControlDeviceList;
         private AutoDataGridControl GridCommandSetting;
         private DevExpress.XtraGrid.Columns.GridColumn dc_id;
         private DevExpress.XtraGrid.Columns.GridColumn dc_code;
@@ -1489,5 +1758,28 @@ namespace UAS_DeviceMonitor
         private CheckEdit CheckEditDeviceStatusEnable;
         private ComboBoxEdit ComboxDeviceStatusLC;
         private ComboBoxEdit ComboxDeviceStatusWC;
+        private LabelControl ComBoxDeviceListMan_label;
+        private ComboBoxEdit ComboxDeviceListWC;
+        private ComboBoxEdit ComboxDeviceListLC;
+        private LabelControl ComboxDeviceListLC_label;
+        private LabelControl ComboxDeviceListWC_label;
+        private SearchLookUpEdit ComBoxDeviceListMan;
+        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+        private DevExpress.XtraGrid.Columns.GridColumn em_code;
+        private DevExpress.XtraGrid.Columns.GridColumn em_name;
+        private DevExpress.XtraGrid.Columns.GridColumn de_inman;
+        private DevExpress.XtraGrid.Columns.GridColumn de_linecode;
+        private DevExpress.XtraGrid.Columns.GridColumn dc_type;
+        private DevExpress.XtraGrid.Columns.GridColumn db_name;
+        private DevExpress.XtraGrid.Columns.GridColumn dpc_man;
+        private DevExpress.XtraGrid.Columns.GridColumn em_name1;
+        private DevExpress.XtraGrid.Columns.GridColumn dc_man;
+        private DevExpress.XtraGrid.Columns.GridColumn dc_date;
+        private DevExpress.XtraGrid.Columns.GridColumn de_stepcode;
+        private DevExpress.XtraGrid.Columns.GridColumn de_stepname;
+        private CustomerControl.Button.ButtonAddRow ButtonAddDevice;
+        private CustomerControl.Button.ButtonDeleteRow ButtonDeleteDevice;
+        private CustomerControl.Button.ButtonSaveGrid ButtonSaveDevice;
+        private DevExpress.XtraGrid.Columns.GridColumn DeviceListCheckedColumn;
     }
 }

UAS_DeviceMonitor/Main.cs

@@ -24,7 +24,9 @@ namespace UAS_DeviceMonitor
         StringBuilder sql = new StringBuilder();
         //用于设备状态查询界面SQL查看
         StringBuilder DeviceStatusQuerySQL = new StringBuilder();
-        DataHelper dh=SystemInf.dh;
+        //用于设备主档资料查询界面SQL查看
+        StringBuilder DeviceListQuerySQL = new StringBuilder();
+        DataHelper dh = SystemInf.dh;
         ModeBusTCPServer mbt = new ModeBusTCPServer();
         List<string> SQL = new List<string>();
 
@@ -76,8 +78,14 @@ namespace UAS_DeviceMonitor
         private void Main_Load(object sender, EventArgs e)
         {
             //设备列表
-            GridDeviceList.GetDataSQL = "select de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode,de_vendcode,de_vendname from device order by de_code".ToUpper();
-            ToolPageControlDeviceList.Gridcontrol = GridDeviceList;
+            GridDeviceList.GetDataSQL = "SELECT 0 CHECKEDCOLUMN,DE_ID,DE_CODE,DE_NAME,DE_SPEC,DE_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME 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_INDATE,DE_RUNSTATUS,DE_ADDRESS,DE_INMAN,DE_LINECODE,DE_WCCODE,DE_VENDCODE,DE_VENDNAME,DE_STEPCODE,DE_STEPNAME) VALUES(DEVICE_SEQ.NEXTVAL,:DE_CODE,:DE_NAME,:DE_SPEC,:DE_INDATE,:DE_RUNSTATUS,:DE_ADDRESS,:DE_INMAN,:DE_LINECODE,:DE_WCCODE,:DE_VENDCODE,:DE_VENDNAME,:DE_STEPCODE,:DE_STEPNAME)";
+            ButtonAddDevice.Grid = GridDeviceList;
+            ButtonSaveDevice.Grid = GridDeviceList;
+            ButtonDeleteDevice.Grid = GridDeviceList;
+            //ToolPageControlDeviceList.Gridcontrol = GridDeviceList;
             //轮询业务
             //GridPolling.GetDataSQL = "select 0 CHECKEDCOLUMN,pl_id,pl_code,pl_name,pl_type,pl_dccode,pl_remark from polling".ToUpper();
             //GridPolling.ID = "pl_id";
@@ -87,20 +95,19 @@ namespace UAS_DeviceMonitor
             //ButtonSavePolling.Grid = GridPolling;
             //ButtonAddPolling.Grid = GridPolling;
             //轮询配置界面
-            GridPollingSetting.GetDataSQL = "SELECT '' POLLSETTINGSTATUSCOLUMN,0 CHECKEDCOLUMN,DPC_ID,DPC_DECODE ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , nvl(DPC_ENABLE,0)DPC_ENABLE,DPC_STATUS ,DPC_REMARK FROM DEVICEPOLLINGCONFIG ORDER BY DPC_ID";
+            GridPollingSetting.GetDataSQL = "SELECT '' POLLSETTINGSTATUSCOLUMN,0 CHECKEDCOLUMN,DPC_MAN,DPC_ID,DPC_DECODE ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , nvl(DPC_ENABLE,0)DPC_ENABLE,DPC_STATUS,DPC_REMARK,EM_NAME FROM DEVICEPOLLINGCONFIG left join EMPLOYEE on em_code=dpc_man WHERE DPC_MAN='" + User.UserCode + "' ORDER BY DPC_ID";
             GridPollingSetting.ID = "DPC_ID";
             GridPollingSetting.TableName = "DEVICEPOLLINGCONFIG";
-            GridPollingSetting.InsertSQL = "insert into DEVICEPOLLINGCONFIG(DPC_ID,DPC_DECODE ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , DPC_ENABLE,DPC_STATUS ,DPC_REMARK) values(DEVICEPOLLINGCONFIG_seq.nextval,:DPC_DECODE  ,:DPC_INTERVAL ,:DPC_DCCODE ,:DPC_FUNCTION , :DPC_ENABLE,:DPC_STATUS ,:DPC_REMARK)";
-
+            GridPollingSetting.InsertSQL = "insert into DEVICEPOLLINGCONFIG(DPC_ID,DPC_DECODE ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , DPC_ENABLE,DPC_STATUS ,DPC_REMARK,DPC_MAN) values(DEVICEPOLLINGCONFIG_seq.nextval,:DPC_DECODE  ,:DPC_INTERVAL ,:DPC_DCCODE ,:DPC_FUNCTION , :DPC_ENABLE,:DPC_STATUS ,:DPC_REMARK,'" + User.UserCode + "')";
             ButtonSaveCommandSet.Grid = GridPollingSetting;
             ButtonNewCommandSet.Grid = GridPollingSetting;
             ButtonDeleteCommandSet.Grid = GridPollingSetting;
 
             //指令设置界面
-            GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_value,dc_sendcoding,dc_receivecoding from devicecommand ".ToUpper();
+            GridCommandSetting.GetDataSQL = "select 0 CHECKEDCOLUMN,dc_id,dc_code,dc_name,dc_type,dc_value,dc_sendcoding,dc_receivecoding,db_name,dc_man,to_char(dc_date,'YYYY-MM-DD HH:mi:ss')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) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding)";
+            GridCommandSetting.InsertSQL = "insert into devicecommand(dc_id,dc_code,dc_name,dc_value,dc_debrand,dc_sendcoding,dc_receivecoding,dc_man,dc_date) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding,'" + User.UserName + "',sysdate)";
             ButtonSaveCommand.Grid = GridCommandSetting;
             ButtonDeleteCommand.Grid = GridCommandSetting;
             ButtonNewCommand.Grid = GridCommandSetting;
@@ -136,6 +143,71 @@ namespace UAS_DeviceMonitor
             ddi.StartPosition = FormStartPosition.CenterScreen;
             ddi.ShowDialog();
         }
+
+        private void PageDeviceList_VisibleChanged(object sender, EventArgs e)
+        {
+            if (PageDeviceList.PageVisible)
+            {
+                DataTable dt;
+                //填充人员资料，工作中心，线别下拉框
+                ComBoxDeviceListMan.Properties.DataSource = (DataTable)dh.ExecuteSql("select em_code,em_name from employee ", "select");
+                dt = (DataTable)dh.ExecuteSql("select wc_code,wc_name from workcenter", "select");
+                BaseUtil.FillComBoxEditWidthDataTable(ComboxDeviceListWC, "wc_name", "wc_code", dt, true);
+            }
+        }
+
+        private void ButtonSaveDevice_Click(object sender, EventArgs e)
+        {
+            ButtonSaveDevice.DoSaveAfterHandler();
+            sql.Clear();
+            sql.Append("update device set de_inman='" + User.UserName + "' where de_id=:de_id");
+            dh.BatchInsert(sql.ToString(), new string[] { "de_id" }, ButtonSaveDevice.LastSaveID);
+            GridDeviceList.RefreshData();
+        }
+
+        private void ComboxDeviceListWC_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            DeviceListQuerySQL.Clear();
+            string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
+            DeviceListQuerySQL.Append("select  0 CHECKEDCOLUMN,de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode,de_inman,de_linecode");
+            DeviceListQuerySQL.Append("de_vendcode,de_vendname,de_stepcode,de_stepname from device where de_wccode='" + WC + "' order by de_code");
+            sql.Clear();
+            if (WC == "全部")
+                sql.Append("select li_code,li_name from line");
+            else
+                sql.Append("select li_code,li_name from line where li_wccode='" + WC + "'");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+            BaseUtil.FillComBoxEditWidthDataTable(ComboxDeviceListLC, "li_code", "li_name", dt, true);
+            RefreshDeviceData();
+        }
+
+        private void ComboxDeviceListLC_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            DeviceListQuerySQL.Clear();
+            string WC = BaseUtil.GetComboxEditValue(ComboxDeviceListWC);
+            string LC = BaseUtil.GetComboxEditValue(ComboxDeviceListLC);
+            DeviceListQuerySQL.Append("select 0 CHECKEDCOLUMN,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 from device ");
+            if (WC != "全部" && LC != "全部")
+                DeviceListQuerySQL.Append(" where de_wccode='" + WC + "' and de_linecode='" + LC + "' ");
+            if (WC == "全部" && LC != "全部")
+                DeviceListQuerySQL.Append(" where de_linecode='" + LC + "' ");
+            if (WC != "全部" && LC == "全部")
+                DeviceListQuerySQL.Append(" where de_wccode='" + WC + "' ");
+            DeviceListQuerySQL.Append("order by de_code");
+            RefreshDeviceData();
+        }
+
+        private void ComBoxDeviceListMan_EditValueChanged(object sender, EventArgs e)
+        {
+
+        }
+
+        private void RefreshDeviceData()
+        {
+            GridDeviceList.GetDataSQL = DeviceListQuerySQL.ToString();
+            GridDeviceList.RefreshData();
+        }
         #endregion
 
         #region 界面通用事件
@@ -208,8 +280,12 @@ namespace UAS_DeviceMonitor
         /// <param name="e"></param>
         private void ButtonSaveCommand_Click(object sender, EventArgs e)
         {
-            GridCommandSetting.InsertSQL = "insert into devicecommand(dc_id,dc_code,dc_name,dc_value,dc_debrand,dc_sendcoding,dc_receivecoding) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding)";
-            ButtonSaveCommand.DoSave();
+            GridCommandSetting.InsertSQL = "insert into devicecommand(dc_id,dc_code,dc_name,dc_value,dc_debrand,dc_sendcoding,dc_receivecoding,dc_man,dc_date) values(devicecommand_seq.nextval,:dc_code,:dc_name,:dc_value,'" + BaseUtil.GetComboxEditValue(Brand) + "',:dc_sendcoding,:dc_receivecoding,'" + User.UserName + "',sysdate)";
+            ButtonSaveCommand.DoSaveAfterHandler();
+            sql.Clear();
+            sql.Append("update devicecommand set dc_man='" + User.UserName + "',dc_date=sysdate where dc_id=:dc_id");
+            dh.BatchInsert(sql.ToString(), new string[] { "dc_id" }, ButtonSaveCommand.LastSaveID);
+            GridCommandSetting.RefreshData();
         }
 
         /// <summary>
@@ -394,11 +470,14 @@ namespace UAS_DeviceMonitor
 
         private void GridViewPollSetting_CellValueChanging(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
         {
-            GridViewPollSetting.SetRowCellValue(e.RowHandle, e.Column, e.Value);
             if (e.Column.Name.ToUpper() == "DPC_ENABLE")
             {
+                GridViewPollSetting.SetRowCellValue(e.RowHandle, e.Column, e.Value);
                 if (GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_ENABLE").ToString() == "0")
                 {
+                    //DialogResult cancel = XtraMessageBox.Show("确认禁用该轮询？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                    //if (cancel.ToString() == "Yes")
+                    //{
                     int id = int.Parse(GridViewPollSetting.GetRowCellValue(e.RowHandle, "DPC_ID").ToString());
                     if (Ptime.ContainsKey(id))
                     {
@@ -406,6 +485,12 @@ namespace UAS_DeviceMonitor
                         Ptime.Remove(id);
                         PollSettingPaintRowIndex.Remove(e.RowHandle);
                     }
+                    //}
+                    //else
+                    //{
+                    //    Cancel = false;
+                    //    GridViewPollSetting.SetRowCellValue(e.RowHandle, e.Column, -1);
+                    //}
                 }
                 else
                 {
@@ -423,6 +508,19 @@ namespace UAS_DeviceMonitor
             }
         }
 
+        private void GridViewPollSetting_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
+        {
+
+        }
+
+        private void ButtonSaveCommandSet_Click(object sender, EventArgs e)
+        {
+            ButtonSaveCommandSet.DoSaveAfterHandler();
+            sql.Clear();
+            sql.Append("update DEVICEPOLLINGCONFIG set dpc_man='" + User.UserCode + "' where dpc_id=:dpc_id");
+            dh.BatchInsert(sql.ToString(), new string[] { "dpc_id" }, ButtonSaveCommandSet.LastSaveID);
+            GridPollingSetting.RefreshData();
+        }
         /// <summary>
         /// 设置GridView多选放大镜
         /// </summary>

UAS_DeviceMonitor/Main.resx

@@ -474,7 +474,7 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="CommonTipController.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>362, 17</value>
+    <value>164, 18</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>