From 788434019e95e9b176011e165510e59139807d84 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 30 十月 2025 08:41:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs | 115 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 40 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
index b41c7f5..24ca7b9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
@@ -49,6 +49,8 @@
this.processNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.nextProcessNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.aboutTbBAarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -70,10 +72,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -81,10 +83,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -92,8 +95,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -102,6 +106,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -114,17 +119,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -145,9 +152,12 @@
this.daa003,
this.daa004,
this.processNo,
- this.nextProcessNo});
+ this.nextProcessNo,
+ this.aboutTbBAarcode,
+ this.itemBarcode});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -157,159 +167,182 @@
//
this.AboutGuid.Caption = "宸ュ崟guid";
this.AboutGuid.FieldName = "AboutGuid";
- this.AboutGuid.MinWidth = 24;
+ this.AboutGuid.MinWidth = 30;
this.AboutGuid.Name = "AboutGuid";
this.AboutGuid.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Max, "AboutGuid", "MAX={0}")});
this.AboutGuid.Tag = "AboutGuid";
- this.AboutGuid.Width = 90;
+ this.AboutGuid.Width = 112;
//
// itemId
//
this.itemId.Caption = "鐗╂枡ID";
this.itemId.FieldName = "itemId";
- this.itemId.MinWidth = 24;
+ this.itemId.MinWidth = 30;
this.itemId.Name = "itemId";
this.itemId.Tag = "itemId";
- this.itemId.Width = 90;
+ this.itemId.Width = 112;
//
// fid
//
this.fid.Caption = "缁勭粐ID";
this.fid.FieldName = "fid";
- this.fid.MinWidth = 24;
+ this.fid.MinWidth = 30;
this.fid.Name = "fid";
this.fid.Tag = "fid";
- this.fid.Width = 90;
+ this.fid.Width = 112;
//
// name
//
this.name.Caption = "缁勭粐鍚嶇О";
this.name.FieldName = "name";
- this.name.MinWidth = 24;
+ this.name.MinWidth = 30;
this.name.Name = "name";
this.name.Tag = "name";
this.name.Visible = true;
this.name.VisibleIndex = 8;
- this.name.Width = 90;
+ this.name.Width = 112;
//
// fNumber
//
this.fNumber.Caption = "缁勭粐缂栧彿";
this.fNumber.FieldName = "fNumber";
- this.fNumber.MinWidth = 24;
+ this.fNumber.MinWidth = 30;
this.fNumber.Name = "fNumber";
this.fNumber.Tag = "fNumber";
- this.fNumber.Width = 90;
+ this.fNumber.Width = 112;
//
// barCode
//
this.barCode.Caption = "杩芥函鐮�";
this.barCode.FieldName = "barCode";
- this.barCode.MinWidth = 24;
+ this.barCode.MinWidth = 30;
this.barCode.Name = "barCode";
this.barCode.Tag = "barCode";
this.barCode.Visible = true;
this.barCode.VisibleIndex = 0;
- this.barCode.Width = 90;
+ this.barCode.Width = 112;
//
// daa001
//
this.daa001.Caption = "鍗曞彿";
this.daa001.FieldName = "daa001";
- this.daa001.MinWidth = 24;
+ this.daa001.MinWidth = 30;
this.daa001.Name = "daa001";
this.daa001.Tag = "daa001";
this.daa001.Visible = true;
this.daa001.VisibleIndex = 1;
- this.daa001.Width = 90;
+ this.daa001.Width = 112;
//
// lineNo1
//
this.lineNo1.Caption = "浜х嚎缂栧彿";
this.lineNo1.FieldName = "lineNo1";
- this.lineNo1.MinWidth = 24;
+ this.lineNo1.MinWidth = 30;
this.lineNo1.Name = "lineNo1";
this.lineNo1.Tag = "lineNo1";
this.lineNo1.Visible = true;
this.lineNo1.VisibleIndex = 2;
- this.lineNo1.Width = 90;
+ this.lineNo1.Width = 112;
//
// daa029
//
this.daa029.Caption = "浜у搧缂栫爜";
this.daa029.FieldName = "daa029";
- this.daa029.MinWidth = 24;
+ this.daa029.MinWidth = 30;
this.daa029.Name = "daa029";
this.daa029.Tag = "daa029";
this.daa029.Visible = true;
this.daa029.VisibleIndex = 3;
- this.daa029.Width = 90;
+ this.daa029.Width = 112;
//
// daa003
//
this.daa003.Caption = "浜у搧鍚嶇О";
this.daa003.FieldName = "daa003";
- this.daa003.MinWidth = 24;
+ this.daa003.MinWidth = 30;
this.daa003.Name = "daa003";
this.daa003.Tag = "daa003";
this.daa003.Visible = true;
this.daa003.VisibleIndex = 4;
- this.daa003.Width = 90;
+ this.daa003.Width = 112;
//
// daa004
//
this.daa004.Caption = "浜у搧瑙勬牸";
this.daa004.FieldName = "daa004";
- this.daa004.MinWidth = 24;
+ this.daa004.MinWidth = 30;
this.daa004.Name = "daa004";
this.daa004.Tag = "daa004";
this.daa004.Visible = true;
this.daa004.VisibleIndex = 5;
- this.daa004.Width = 90;
+ this.daa004.Width = 112;
//
// processNo
//
this.processNo.Caption = "褰撳墠宸ュ簭";
this.processNo.FieldName = "processNo";
- this.processNo.MinWidth = 24;
+ this.processNo.MinWidth = 30;
this.processNo.Name = "processNo";
this.processNo.Tag = "processNo";
this.processNo.Visible = true;
this.processNo.VisibleIndex = 6;
- this.processNo.Width = 90;
+ this.processNo.Width = 112;
//
// nextProcessNo
//
this.nextProcessNo.Caption = "涓嬩竴閬撳伐搴�";
this.nextProcessNo.FieldName = "nextProcessNo";
- this.nextProcessNo.MinWidth = 24;
+ this.nextProcessNo.MinWidth = 30;
this.nextProcessNo.Name = "nextProcessNo";
this.nextProcessNo.Tag = "nextProcessNo";
this.nextProcessNo.Visible = true;
this.nextProcessNo.VisibleIndex = 7;
- this.nextProcessNo.Width = 90;
+ this.nextProcessNo.Width = 112;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
+ // aboutTbBAarcode
+ //
+ this.aboutTbBAarcode.Caption = "鎵樻澘鐮�";
+ this.aboutTbBAarcode.FieldName = "aboutTbBAarcode";
+ this.aboutTbBAarcode.MinWidth = 30;
+ this.aboutTbBAarcode.Name = "aboutTbBAarcode";
+ this.aboutTbBAarcode.Tag = "aboutTbBAarcode";
+ this.aboutTbBAarcode.Visible = true;
+ this.aboutTbBAarcode.VisibleIndex = 9;
+ this.aboutTbBAarcode.Width = 94;
+ //
+ // itemBarcode
+ //
+ this.itemBarcode.Caption = "鍚庣洊鐮�";
+ this.itemBarcode.FieldName = "itemBarcode";
+ this.itemBarcode.MinWidth = 30;
+ this.itemBarcode.Name = "itemBarcode";
+ this.itemBarcode.Tag = "itemBarcode";
+ this.itemBarcode.Visible = true;
+ this.itemBarcode.VisibleIndex = 10;
+ this.itemBarcode.Width = 94;
+ //
// WOTraceCodes
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1410, 834);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "WOTraceCodes";
this.Text = "鏌ヨ宸ュ崟杩芥函鐮�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -346,5 +379,7 @@
private DevExpress.XtraGrid.Columns.GridColumn fid;
private DevExpress.XtraGrid.Columns.GridColumn name;
private DevExpress.XtraGrid.Columns.GridColumn fNumber;
+ private DevExpress.XtraGrid.Columns.GridColumn aboutTbBAarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn itemBarcode;
}
}
\ No newline at end of file
--
Gitblit v1.9.3