From 723980fb8737acec1df3609457e93f9dcd565d63 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 20 十二月 2025 16:54:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs | 205 ++++++++++++++++++++++++++++----------------------
1 files changed, 115 insertions(+), 90 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
index 4fe83e9..4a53dff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
@@ -28,8 +28,9 @@
/// </summary>
private void InitializeComponent()
{
- this.gcMain1 = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.components = new System.ComponentModel.Container();
+ this.gcMain1Report = new DevExpress.XtraGrid.GridControl();
+ this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,26 +50,31 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
this.SuspendLayout();
//
- // gcMain1
+ // gcMain1Report
//
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Location = new System.Drawing.Point(0, 0);
- this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1339, 644);
- this.gcMain1.TabIndex = 2;
- this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
+ this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1Report.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1Report.MainView = this.gridView1Report;
+ this.gcMain1Report.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gcMain1Report.Name = "gcMain1Report";
+ this.gcMain1Report.Size = new System.Drawing.Size(1674, 788);
+ this.gcMain1Report.TabIndex = 2;
+ this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1Report});
//
- // gridView1
+ // gridView1Report
//
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridView1Report.Appearance.Row.Options.UseFont = true;
+ this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_guid,
this.gv_itemId,
this.gridColumn3,
@@ -87,66 +93,69 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10});
- this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowFooter = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
+ this.gridColumn10,
+ this.gridColumn11,
+ this.gridColumn12});
+ this.gridView1Report.DetailHeight = 428;
+ this.gridView1Report.GridControl = this.gcMain1Report;
+ this.gridView1Report.IndicatorWidth = 62;
+ this.gridView1Report.Name = "gridView1Report";
+ this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1Report.OptionsView.ShowFooter = true;
+ this.gridView1Report.OptionsView.ShowGroupPanel = false;
//
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭GUID";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 62;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 117;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID ";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.MinWidth = 62;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.ITEM_ID";
- this.gv_itemId.Width = 73;
+ this.gv_itemId.Width = 91;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 31;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 7;
- this.gridColumn3.Width = 74;
+ this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.Width = 92;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "itemName";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 31;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
- this.gridColumn2.Width = 74;
+ this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.Width = 92;
//
// gridColumn4
//
this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn4.FieldName = "itemModel";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 31;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 9;
- this.gridColumn4.Width = 74;
+ this.gridColumn4.Width = 92;
//
// gv_quantity
//
@@ -157,131 +166,123 @@
this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
this.gv_quantity.Caption = "鏀舵枡鏁伴噺 ";
this.gv_quantity.FieldName = "quantity";
- this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.MinWidth = 62;
this.gv_quantity.Name = "gv_quantity";
this.gv_quantity.OptionsColumn.AllowEdit = false;
this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gv_quantity.Tag = "query_a.QUANTITY";
this.gv_quantity.Visible = true;
- this.gv_quantity.VisibleIndex = 3;
- this.gv_quantity.Width = 74;
+ this.gv_quantity.VisibleIndex = 2;
+ this.gv_quantity.Width = 92;
//
// gv_depotId
//
- this.gv_depotId.AppearanceCell.ForeColor = System.Drawing.Color.Red;
this.gv_depotId.AppearanceCell.Options.UseFont = true;
- this.gv_depotId.AppearanceCell.Options.UseForeColor = true;
- this.gv_depotId.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gv_depotId.AppearanceHeader.Options.UseForeColor = true;
this.gv_depotId.Caption = "妫�楠岀姸鎬�";
- this.gv_depotId.FieldName = "checkStates";
- this.gv_depotId.MinWidth = 50;
+ this.gv_depotId.FieldName = "txtColor";
+ this.gv_depotId.MinWidth = 62;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
- this.gv_depotId.VisibleIndex = 5;
- this.gv_depotId.Width = 73;
+ this.gv_depotId.VisibleIndex = 4;
+ this.gv_depotId.Width = 91;
//
// gridColumn6
//
- this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Red;
- this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn6.Caption = "妫�楠岀粨鏋�";
this.gridColumn6.FieldName = "checkRes";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 31;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 74;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 92;
//
// gridColumn1
//
this.gridColumn1.Caption = "閫�璐�";
this.gridColumn1.FieldName = "returnFlag";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 31;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 13;
- this.gridColumn1.Width = 74;
+ this.gridColumn1.Width = 92;
//
// gv_depotSectionsCode
//
this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
this.gv_depotSectionsCode.Caption = "鎬ユ枡";
this.gv_depotSectionsCode.FieldName = "urgentFlagTxt";
- this.gv_depotSectionsCode.MinWidth = 50;
+ this.gv_depotSectionsCode.MinWidth = 62;
this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
this.gv_depotSectionsCode.Visible = true;
this.gv_depotSectionsCode.VisibleIndex = 10;
- this.gv_depotSectionsCode.Width = 74;
+ this.gv_depotSectionsCode.Width = 92;
//
// gv_ownerType
//
this.gv_ownerType.AppearanceCell.Options.UseFont = true;
this.gv_ownerType.Caption = "鏀舵枡缁勭粐";
this.gv_ownerType.FieldName = "receivingOrg";
- this.gv_ownerType.MinWidth = 50;
+ this.gv_ownerType.MinWidth = 62;
this.gv_ownerType.Name = "gv_ownerType";
this.gv_ownerType.OptionsColumn.AllowEdit = false;
this.gv_ownerType.Tag = "query_a.Owner_Type";
this.gv_ownerType.Visible = true;
- this.gv_ownerType.VisibleIndex = 0;
- this.gv_ownerType.Width = 74;
+ this.gv_ownerType.VisibleIndex = 17;
+ this.gv_ownerType.Width = 92;
//
// gv_ownerId
//
this.gv_ownerId.AppearanceCell.Options.UseFont = true;
this.gv_ownerId.Caption = "閲囪喘鍗曞彿";
this.gv_ownerId.FieldName = "ebeln";
- this.gv_ownerId.MinWidth = 50;
+ this.gv_ownerId.MinWidth = 62;
this.gv_ownerId.Name = "gv_ownerId";
this.gv_ownerId.OptionsColumn.AllowEdit = false;
this.gv_ownerId.Tag = "query_a.Owner_Id";
this.gv_ownerId.Visible = true;
- this.gv_ownerId.VisibleIndex = 1;
- this.gv_ownerId.Width = 74;
+ this.gv_ownerId.VisibleIndex = 0;
+ this.gv_ownerId.Width = 92;
//
// gridColumn5
//
this.gridColumn5.Caption = "鍒拌揣鍗曞彿";
this.gridColumn5.FieldName = "dhdNo";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 31;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 74;
+ this.gridColumn5.VisibleIndex = 1;
+ this.gridColumn5.Width = 92;
//
// gv_indepUserCode
//
this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
this.gv_indepUserCode.Caption = "鏀惰揣浜�";
this.gv_indepUserCode.FieldName = "dhdUser";
- this.gv_indepUserCode.MinWidth = 50;
+ this.gv_indepUserCode.MinWidth = 62;
this.gv_indepUserCode.Name = "gv_indepUserCode";
this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
this.gv_indepUserCode.Visible = true;
this.gv_indepUserCode.VisibleIndex = 11;
- this.gv_indepUserCode.Width = 74;
+ this.gv_indepUserCode.Width = 92;
//
// gv_indepDate
//
this.gv_indepDate.AppearanceCell.Options.UseFont = true;
this.gv_indepDate.Caption = "鏀惰揣鏃ユ湡 ";
this.gv_indepDate.FieldName = "dhdDate";
- this.gv_indepDate.MinWidth = 10;
+ this.gv_indepDate.MinWidth = 12;
this.gv_indepDate.Name = "gv_indepDate";
this.gv_indepDate.OptionsColumn.AllowEdit = false;
this.gv_indepDate.Tag = "query_a.INDEP_DATE";
this.gv_indepDate.Visible = true;
this.gv_indepDate.VisibleIndex = 12;
- this.gv_indepDate.Width = 80;
+ this.gv_indepDate.Width = 100;
//
// gridColumn7
//
@@ -291,70 +292,91 @@
this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn7.Caption = "鏀舵枡澶囨敞";
this.gridColumn7.FieldName = "memo";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 31;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 4;
- this.gridColumn7.Width = 77;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 96;
//
// gridColumn8
//
this.gridColumn8.Caption = "OA澶勭悊鎰忚";
this.gridColumn8.FieldName = "clyj";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 31;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 14;
- this.gridColumn8.Width = 77;
+ this.gridColumn8.Width = 96;
//
// gridColumn9
//
this.gridColumn9.Caption = "OA鎸戦�夋暟閲�";
this.gridColumn9.FieldName = "txsl";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 15;
- this.gridColumn9.Width = 77;
+ this.gridColumn9.Width = 96;
//
// gridColumn10
//
this.gridColumn10.Caption = "OA閫夊埆绫诲埆";
this.gridColumn10.FieldName = "xblb";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 16;
- this.gridColumn10.Width = 88;
+ this.gridColumn10.Width = 110;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "渚涘簲鍟�";
+ this.gridColumn11.FieldName = "gysName";
+ this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 8;
+ this.gridColumn11.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 644);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 788);
+ 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(1339, 38);
+ this.pageBar1.Size = new System.Drawing.Size(1674, 46);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鍏ュ簱鐘舵��";
+ this.gridColumn12.FieldName = "mxStatue";
+ this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 18;
+ this.gridColumn12.Width = 94;
+ //
// UcRptCgdhd
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.gcMain1);
+ this.Controls.Add(this.gcMain1Report);
this.Controls.Add(this.pageBar1);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "UcRptCgdhd";
- this.Size = new System.Drawing.Size(1339, 682);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.Size = new System.Drawing.Size(1674, 834);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private DevExpress.XtraGrid.GridControl gcMain1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.GridControl gcMain1Report;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -375,5 +397,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
}
}
\ No newline at end of file
--
Gitblit v1.9.3