|
|
@@ -45,6 +45,7 @@ namespace UAS_PLCDataReader
|
|
|
this.ButtonWorkCenterStatus = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.ButtonDeviceRunLog = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.ButtonClientParam = new DevExpress.XtraBars.BarButtonItem();
|
|
|
+ this.ButtonDeviceData = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.DeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPage();
|
|
|
this.RibDeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
|
|
|
this.DeviceCommandSetting = new DevExpress.XtraBars.Ribbon.RibbonPage();
|
|
|
@@ -203,6 +204,14 @@ namespace UAS_PLCDataReader
|
|
|
this.ButtonSaveClientParam = new DevExpress.XtraEditors.SimpleButton();
|
|
|
this.UpdateTimeSpan = new System.Windows.Forms.NumericUpDown();
|
|
|
this.label1 = new System.Windows.Forms.Label();
|
|
|
+ this.PageDeviceData = new DevExpress.XtraTab.XtraTabPage();
|
|
|
+ this.GridDeviceData = new UAS_PLCDataReader.CustomerControl.AutoDataGridControl.AutoDataGridControl();
|
|
|
+ this.GridViewDeviceData = new UAS_PLCDataReader.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
|
|
|
+ this.dr_decode = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dr_dename = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dr_runstatus = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dr_qty = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dr_inqty = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.TimerDeviceStatus = new System.Windows.Forms.Timer(this.components);
|
|
|
this.CommonTipController = new DevExpress.Utils.ToolTipController(this.components);
|
|
|
this.TimerUpdateDevice = new System.Windows.Forms.Timer(this.components);
|
|
|
@@ -258,6 +267,9 @@ namespace UAS_PLCDataReader
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GirdViewDeviceRunLog)).BeginInit();
|
|
|
this.PageClientParam.SuspendLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.UpdateTimeSpan)).BeginInit();
|
|
|
+ this.PageDeviceData.SuspendLayout();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridDeviceData)).BeginInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceData)).BeginInit();
|
|
|
this.SuspendLayout();
|
|
|
//
|
|
|
// RibbonNav
|
|
|
@@ -275,14 +287,15 @@ namespace UAS_PLCDataReader
|
|
|
this.ButtonDeviceStatus,
|
|
|
this.ButtonWorkCenterStatus,
|
|
|
this.ButtonDeviceRunLog,
|
|
|
- this.ButtonClientParam});
|
|
|
+ this.ButtonClientParam,
|
|
|
+ this.ButtonDeviceData});
|
|
|
this.RibbonNav.Location = new System.Drawing.Point(0, 0);
|
|
|
- this.RibbonNav.MaxItemId = 17;
|
|
|
+ this.RibbonNav.MaxItemId = 18;
|
|
|
this.RibbonNav.Name = "RibbonNav";
|
|
|
this.RibbonNav.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
|
|
|
this.DeviceInf,
|
|
|
this.DeviceCommandSetting});
|
|
|
- this.RibbonNav.Size = new System.Drawing.Size(1040, 128);
|
|
|
+ this.RibbonNav.Size = new System.Drawing.Size(1040, 126);
|
|
|
//
|
|
|
// ButtonDeviceList
|
|
|
//
|
|
|
@@ -373,6 +386,16 @@ namespace UAS_PLCDataReader
|
|
|
this.ButtonClientParam.Tag = "PageClientParam";
|
|
|
this.ButtonClientParam.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
//
|
|
|
+ // ButtonDeviceData
|
|
|
+ //
|
|
|
+ this.ButtonDeviceData.Caption = "设备运行数据查看";
|
|
|
+ this.ButtonDeviceData.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceData.Glyph")));
|
|
|
+ this.ButtonDeviceData.Id = 17;
|
|
|
+ this.ButtonDeviceData.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceData.LargeGlyph")));
|
|
|
+ this.ButtonDeviceData.Name = "ButtonDeviceData";
|
|
|
+ this.ButtonDeviceData.Tag = "PageDeviceData";
|
|
|
+ this.ButtonDeviceData.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
+ //
|
|
|
// DeviceInf
|
|
|
//
|
|
|
this.DeviceInf.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
|
|
|
@@ -401,6 +424,7 @@ namespace UAS_PLCDataReader
|
|
|
// RibDeviceCommand
|
|
|
//
|
|
|
this.RibDeviceCommand.ItemLinks.Add(this.ButtonDeviceStatus);
|
|
|
+ this.RibDeviceCommand.ItemLinks.Add(this.ButtonDeviceData);
|
|
|
this.RibDeviceCommand.ItemLinks.Add(this.ButtonDeviceRunLog);
|
|
|
this.RibDeviceCommand.Name = "RibDeviceCommand";
|
|
|
this.RibDeviceCommand.Text = "ribbonPageGroup3";
|
|
|
@@ -408,11 +432,11 @@ namespace UAS_PLCDataReader
|
|
|
// MainTabControl
|
|
|
//
|
|
|
this.MainTabControl.Dock = System.Windows.Forms.DockStyle.Fill;
|
|
|
- this.MainTabControl.Location = new System.Drawing.Point(0, 128);
|
|
|
+ this.MainTabControl.Location = new System.Drawing.Point(0, 126);
|
|
|
this.MainTabControl.Name = "MainTabControl";
|
|
|
this.MainTabControl.SelectedTabPage = this.PageDeviceList;
|
|
|
this.MainTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.False;
|
|
|
- this.MainTabControl.Size = new System.Drawing.Size(1040, 584);
|
|
|
+ this.MainTabControl.Size = new System.Drawing.Size(1040, 586);
|
|
|
this.MainTabControl.TabIndex = 3;
|
|
|
this.MainTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
|
|
|
this.PageDeviceList,
|
|
|
@@ -423,7 +447,8 @@ namespace UAS_PLCDataReader
|
|
|
this.PageDeviceStatus,
|
|
|
this.PageWorkCenterStatus,
|
|
|
this.PageDeviceRunLog,
|
|
|
- this.PageClientParam});
|
|
|
+ this.PageClientParam,
|
|
|
+ this.PageDeviceData});
|
|
|
//
|
|
|
// PageDeviceList
|
|
|
//
|
|
|
@@ -2018,6 +2043,86 @@ namespace UAS_PLCDataReader
|
|
|
this.label1.TabIndex = 0;
|
|
|
this.label1.Text = "数据上传时间";
|
|
|
//
|
|
|
+ // PageDeviceData
|
|
|
+ //
|
|
|
+ this.PageDeviceData.Controls.Add(this.GridDeviceData);
|
|
|
+ this.PageDeviceData.Name = "PageDeviceData";
|
|
|
+ this.PageDeviceData.PageVisible = false;
|
|
|
+ this.PageDeviceData.Size = new System.Drawing.Size(1034, 580);
|
|
|
+ //
|
|
|
+ // GridDeviceData
|
|
|
+ //
|
|
|
+ this.GridDeviceData.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
|
|
+ | System.Windows.Forms.AnchorStyles.Left)
|
|
|
+ | System.Windows.Forms.AnchorStyles.Right)));
|
|
|
+ this.GridDeviceData.Condition = null;
|
|
|
+ this.GridDeviceData.GetDataSQL = null;
|
|
|
+ this.GridDeviceData.ID = null;
|
|
|
+ this.GridDeviceData.InsertSQL = null;
|
|
|
+ this.GridDeviceData.Location = new System.Drawing.Point(0, 0);
|
|
|
+ this.GridDeviceData.MainView = this.GridViewDeviceData;
|
|
|
+ this.GridDeviceData.MenuManager = this.RibbonNav;
|
|
|
+ this.GridDeviceData.Name = "GridDeviceData";
|
|
|
+ this.GridDeviceData.RowCount = 0;
|
|
|
+ this.GridDeviceData.Size = new System.Drawing.Size(1034, 580);
|
|
|
+ this.GridDeviceData.TabIndex = 0;
|
|
|
+ this.GridDeviceData.TableName = null;
|
|
|
+ this.GridDeviceData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
+ this.GridViewDeviceData});
|
|
|
+ //
|
|
|
+ // GridViewDeviceData
|
|
|
+ //
|
|
|
+ this.GridViewDeviceData.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
|
|
|
+ this.dr_decode,
|
|
|
+ this.dr_dename,
|
|
|
+ this.dr_runstatus,
|
|
|
+ this.dr_qty,
|
|
|
+ this.dr_inqty});
|
|
|
+ this.GridViewDeviceData.GridControl = this.GridDeviceData;
|
|
|
+ this.GridViewDeviceData.IndicatorWidth = 30;
|
|
|
+ this.GridViewDeviceData.Name = "GridViewDeviceData";
|
|
|
+ this.GridViewDeviceData.OptionsView.ShowGroupPanel = false;
|
|
|
+ //
|
|
|
+ // dr_decode
|
|
|
+ //
|
|
|
+ this.dr_decode.Caption = "设备编号";
|
|
|
+ this.dr_decode.FieldName = "DR_DECODE";
|
|
|
+ this.dr_decode.Name = "dr_decode";
|
|
|
+ this.dr_decode.Visible = true;
|
|
|
+ this.dr_decode.VisibleIndex = 0;
|
|
|
+ //
|
|
|
+ // dr_dename
|
|
|
+ //
|
|
|
+ this.dr_dename.Caption = "设备名称";
|
|
|
+ this.dr_dename.FieldName = "DR_DENAME";
|
|
|
+ this.dr_dename.Name = "dr_dename";
|
|
|
+ this.dr_dename.Visible = true;
|
|
|
+ this.dr_dename.VisibleIndex = 1;
|
|
|
+ //
|
|
|
+ // dr_runstatus
|
|
|
+ //
|
|
|
+ this.dr_runstatus.Caption = "运行状态";
|
|
|
+ this.dr_runstatus.FieldName = "DR_RUNSTATUS";
|
|
|
+ this.dr_runstatus.Name = "dr_runstatus";
|
|
|
+ this.dr_runstatus.Visible = true;
|
|
|
+ this.dr_runstatus.VisibleIndex = 2;
|
|
|
+ //
|
|
|
+ // dr_qty
|
|
|
+ //
|
|
|
+ this.dr_qty.Caption = "投入";
|
|
|
+ this.dr_qty.FieldName = "DR_QTY";
|
|
|
+ this.dr_qty.Name = "dr_qty";
|
|
|
+ this.dr_qty.Visible = true;
|
|
|
+ this.dr_qty.VisibleIndex = 3;
|
|
|
+ //
|
|
|
+ // dr_inqty
|
|
|
+ //
|
|
|
+ this.dr_inqty.Caption = "产出";
|
|
|
+ this.dr_inqty.FieldName = "DR_OKQTY";
|
|
|
+ this.dr_inqty.Name = "dr_inqty";
|
|
|
+ this.dr_inqty.Visible = true;
|
|
|
+ this.dr_inqty.VisibleIndex = 4;
|
|
|
+ //
|
|
|
// TimerDeviceStatus
|
|
|
//
|
|
|
this.TimerDeviceStatus.Interval = 10000;
|
|
|
@@ -2110,6 +2215,9 @@ namespace UAS_PLCDataReader
|
|
|
this.PageClientParam.ResumeLayout(false);
|
|
|
this.PageClientParam.PerformLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.UpdateTimeSpan)).EndInit();
|
|
|
+ this.PageDeviceData.ResumeLayout(false);
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridDeviceData)).EndInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceData)).EndInit();
|
|
|
this.ResumeLayout(false);
|
|
|
this.PerformLayout();
|
|
|
|
|
|
@@ -2289,5 +2397,14 @@ namespace UAS_PLCDataReader
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn de_currentcentername;
|
|
|
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
|
|
|
private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit DeviceItemSearchLookUpEdit;
|
|
|
+ private DevExpress.XtraBars.BarButtonItem ButtonDeviceData;
|
|
|
+ private DevExpress.XtraTab.XtraTabPage PageDeviceData;
|
|
|
+ private UAS_PLCDataReader.CustomerControl.AutoDataGridControl.AutoDataGridControl GridDeviceData;
|
|
|
+ private UAS_PLCDataReader.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum GridViewDeviceData;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dr_decode;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dr_dename;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dr_runstatus;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dr_qty;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dr_inqty;
|
|
|
}
|
|
|
}
|
章政