From 0a2d755f7e39e1e1a8f8e104d527f07889b537ab Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 11 一月 2025 13:59:01 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs | 194 +++++++++++++++-----------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 6
DevApp/Gs.DevApp/UserControl/SelectWompba.cs | 12 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 93 ++++++++-------
4 files changed, 148 insertions(+), 157 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index bbdafef..c7ac9a1 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -151,7 +151,7 @@
this.gvMx1machineNo.Caption = "棰勮澶囨枡鏃堕棿";
this.gvMx1machineNo.ColumnEdit = this.repositoryItemDateEdit1;
this.gvMx1machineNo.FieldName = "prepareTime";
- this.gvMx1machineNo.MinWidth = 200;
+ this.gvMx1machineNo.MinWidth = 50;
this.gvMx1machineNo.Name = "gvMx1machineNo";
this.gvMx1machineNo.Tag = "query_a.machine_no";
this.gvMx1machineNo.Width = 200;
@@ -175,12 +175,12 @@
this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1reporttime.Caption = "澶囨敞";
this.gvMx1reporttime.FieldName = "daa009";
- this.gvMx1reporttime.MinWidth = 100;
+ this.gvMx1reporttime.MinWidth = 50;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
this.gvMx1reporttime.VisibleIndex = 15;
- this.gvMx1reporttime.Width = 100;
+ this.gvMx1reporttime.Width = 102;
//
// gvMx1isReportcheck
//
@@ -313,15 +313,15 @@
//
this.gvMx1fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
- this.gvMx1fstatus.Caption = "閿�鍞鍗曞彿";
+ this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
this.gvMx1fstatus.FieldName = "caa015";
- this.gvMx1fstatus.MinWidth = 120;
+ this.gvMx1fstatus.MinWidth = 50;
this.gvMx1fstatus.Name = "gvMx1fstatus";
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
this.gvMx1fstatus.VisibleIndex = 0;
- this.gvMx1fstatus.Width = 120;
+ this.gvMx1fstatus.Width = 76;
//
// gvMx1daa019
//
@@ -346,12 +346,12 @@
this.gvMx1daa018.Caption = "棰勮瀹屽伐鏃堕棿";
this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
this.gvMx1daa018.FieldName = "mesEndProd";
- this.gvMx1daa018.MinWidth = 180;
+ this.gvMx1daa018.MinWidth = 50;
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "edit";
this.gvMx1daa018.Visible = true;
this.gvMx1daa018.VisibleIndex = 2;
- this.gvMx1daa018.Width = 180;
+ this.gvMx1daa018.Width = 50;
//
// repositoryItemDateEdit3
//
@@ -388,12 +388,12 @@
this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1daa016.FieldName = "mesStartProd";
- this.gvMx1daa016.MinWidth = 180;
+ this.gvMx1daa016.MinWidth = 50;
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "edit";
this.gvMx1daa016.Visible = true;
this.gvMx1daa016.VisibleIndex = 1;
- this.gvMx1daa016.Width = 180;
+ this.gvMx1daa016.Width = 78;
//
// repositoryItemDateEdit2
//
@@ -416,7 +416,7 @@
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
this.gvMx1daa014.VisibleIndex = 14;
- this.gvMx1daa014.Width = 50;
+ this.gvMx1daa014.Width = 51;
//
// gvMx1daa012
//
@@ -434,7 +434,7 @@
this.gvMx1daa012.Tag = "edit";
this.gvMx1daa012.Visible = true;
this.gvMx1daa012.VisibleIndex = 13;
- this.gvMx1daa012.Width = 150;
+ this.gvMx1daa012.Width = 153;
//
// rptJYBZ
//
@@ -454,6 +454,7 @@
this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa011.Caption = "鏈鎺掓暟閲�";
this.gvMx1daa011.FieldName = "daa008";
+ this.gvMx1daa011.MaxWidth = 50;
this.gvMx1daa011.MinWidth = 60;
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "yz_quantity_0_edit";
@@ -465,15 +466,15 @@
//
this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
+ this.gvMx1daa010.Caption = "鎶曟枡鍗曞彿";
this.gvMx1daa010.FieldName = "daa021";
- this.gvMx1daa010.MinWidth = 110;
+ this.gvMx1daa010.MinWidth = 50;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 7;
- this.gvMx1daa010.Width = 110;
+ this.gvMx1daa010.Width = 50;
//
// gvMx1daa009
//
@@ -481,6 +482,7 @@
this.gvMx1daa009.AppearanceCell.Options.UseFont = true;
this.gvMx1daa009.Caption = "鏈帓";
this.gvMx1daa009.FieldName = "wp";
+ this.gvMx1daa009.MaxWidth = 50;
this.gvMx1daa009.MinWidth = 50;
this.gvMx1daa009.Name = "gvMx1daa009";
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
@@ -495,6 +497,7 @@
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟";
this.gvMx1daa008.FieldName = "caa012";
+ this.gvMx1daa008.MaxWidth = 50;
this.gvMx1daa008.MinWidth = 50;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
@@ -509,6 +512,7 @@
this.gvMx1daa007.AppearanceCell.Options.UseFont = true;
this.gvMx1daa007.Caption = "宸叉帓";
this.gvMx1daa007.FieldName = "yp";
+ this.gvMx1daa007.MaxWidth = 50;
this.gvMx1daa007.MinWidth = 50;
this.gvMx1daa007.Name = "gvMx1daa007";
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
@@ -523,6 +527,7 @@
this.gvMx1daa006.AppearanceCell.Options.UseFont = true;
this.gvMx1daa006.Caption = "鍗曚綅";
this.gvMx1daa006.FieldName = "fname";
+ this.gvMx1daa006.MaxWidth = 50;
this.gvMx1daa006.MinWidth = 50;
this.gvMx1daa006.Name = "gvMx1daa006";
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
@@ -537,13 +542,13 @@
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
this.gvMx1daa005.FieldName = "itemNo";
- this.gvMx1daa005.MinWidth = 80;
+ this.gvMx1daa005.MinWidth = 50;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 4;
- this.gvMx1daa005.Width = 80;
+ this.gvMx1daa005.Width = 50;
//
// gvMx1daa004
//
@@ -551,13 +556,13 @@
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
this.gvMx1daa004.FieldName = "daa004";
- this.gvMx1daa004.MinWidth = 150;
+ this.gvMx1daa004.MinWidth = 50;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 6;
- this.gvMx1daa004.Width = 150;
+ this.gvMx1daa004.Width = 50;
//
// gvMx1daa003
//
@@ -565,13 +570,13 @@
this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
this.gvMx1daa003.FieldName = "daa003";
- this.gvMx1daa003.MinWidth = 150;
+ this.gvMx1daa003.MinWidth = 50;
this.gvMx1daa003.Name = "gvMx1daa003";
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
this.gvMx1daa003.VisibleIndex = 5;
- this.gvMx1daa003.Width = 150;
+ this.gvMx1daa003.Width = 50;
//
// gvMx1daa002
//
@@ -579,13 +584,13 @@
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
this.gvMx1daa002.FieldName = "daa001";
- this.gvMx1daa002.MinWidth = 110;
+ this.gvMx1daa002.MinWidth = 50;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 3;
- this.gvMx1daa002.Width = 110;
+ this.gvMx1daa002.Width = 50;
//
// gvMx1guid
//
@@ -693,15 +698,15 @@
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 16;
- this.gvMxDel.Width = 80;
+ this.gvMxDel.Width = 84;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -718,7 +723,7 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(600, 46);
+ this.txt_checkUser.Location = new System.Drawing.Point(598, 46);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -752,7 +757,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(600, 14);
+ this.txt_checkDate.Location = new System.Drawing.Point(598, 14);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -788,7 +793,7 @@
//
this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fstatus.Caption = "瀹℃牳鐮�";
+ this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
this.gv_fstatus.MaxWidth = 50;
this.gv_fstatus.MinWidth = 50;
@@ -803,7 +808,7 @@
//
this.lb_pba013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pba013.Appearance.Options.UseFont = true;
- this.lb_pba013.Location = new System.Drawing.Point(20, 50);
+ this.lb_pba013.Location = new System.Drawing.Point(26, 50);
this.lb_pba013.Name = "lb_pba013";
this.lb_pba013.Size = new System.Drawing.Size(68, 21);
this.lb_pba013.TabIndex = 258;
@@ -813,11 +818,11 @@
//
this.lb_pba009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pba009.Appearance.Options.UseFont = true;
- this.lb_pba009.Location = new System.Drawing.Point(49, 82);
+ this.lb_pba009.Location = new System.Drawing.Point(21, 82);
this.lb_pba009.Name = "lb_pba009";
- this.lb_pba009.Size = new System.Drawing.Size(39, 21);
+ this.lb_pba009.Size = new System.Drawing.Size(73, 21);
this.lb_pba009.TabIndex = 240;
- this.lb_pba009.Text = "澶囨敞 ";
+ this.lb_pba009.Text = "鎺掍骇澶囨敞 ";
//
// txt_pba009
//
@@ -1035,7 +1040,7 @@
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(20, 18);
+ this.labelControl2.Location = new System.Drawing.Point(26, 18);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 461;
@@ -1071,7 +1076,7 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(286, 18);
+ this.labelControl1.Location = new System.Drawing.Point(287, 18);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 457;
@@ -1082,14 +1087,14 @@
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.btnSelect.Location = new System.Drawing.Point(49, 114);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(128, 29);
+ this.btnSelect.Size = new System.Drawing.Size(116, 29);
this.btnSelect.TabIndex = 456;
- this.btnSelect.Text = "閫夊彇鐢熸垚鎶曟枡鍗�";
+ this.btnSelect.Text = "閫夊彇鎶曟枡鍗�";
//
// txt_fstatus
//
this.txt_fstatus.Enabled = false;
- this.txt_fstatus.Location = new System.Drawing.Point(600, 80);
+ this.txt_fstatus.Location = new System.Drawing.Point(598, 80);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "";
this.txt_fstatus.Size = new System.Drawing.Size(94, 24);
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 5852be0..aa30846 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -83,6 +83,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
catch (Exception ex)
{
@@ -411,6 +412,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -432,7 +434,6 @@
}
private void getModel(string strGuid)
{
-
bool isEdit = false;
if (toolBarMenu1.currentAction == "add")
{
@@ -472,6 +473,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -486,7 +488,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
@@ -554,7 +555,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
{
ComboBoxEdit comboBox = sender as ComboBoxEdit;
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
index f9075bf..240eeaf 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
@@ -36,22 +36,21 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
@@ -124,22 +123,21 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_chk,
this.gv_guid,
- this.gridColumn2,
- this.gv_ebelnK3id,
+ this.gv_remarks,
+ this.gridColumn4,
+ this.gridColumn3,
this.gridColumn12,
this.gv_billNo,
- this.gridColumn3,
- this.gridColumn4,
this.gv_supplierItemCode,
this.gv_supplierItemName,
this.gridColumn5,
this.gridColumn6,
+ this.gridColumn9,
this.gridColumn8,
this.gridColumn7,
- this.gridColumn9,
this.gv_purchaseUnit,
this.gv_inventoryUnit,
- this.gv_remarks});
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -155,6 +153,7 @@
this.gv_chk.AppearanceHeader.Options.UseForeColor = true;
this.gv_chk.Caption = "閫夋嫨";
this.gv_chk.FieldName = "gvChk";
+ this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_chk.MinWidth = 60;
this.gv_chk.Name = "gv_chk";
this.gv_chk.Visible = true;
@@ -174,40 +173,53 @@
this.gv_guid.Tag = "query_a.guid";
this.gv_guid.Width = 94;
//
- // gridColumn2
+ // gv_remarks
//
- this.gridColumn2.Caption = "ErpId";
- this.gridColumn2.FieldName = "erpId";
- this.gridColumn2.MinWidth = 80;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remarks.AppearanceCell.Options.UseFont = true;
+ this.gv_remarks.Caption = "闇�姹傚崟鍙�";
+ this.gv_remarks.FieldName = "saleOrderNo";
+ this.gv_remarks.MinWidth = 50;
+ this.gv_remarks.Name = "gv_remarks";
+ this.gv_remarks.OptionsColumn.AllowEdit = false;
+ this.gv_remarks.OptionsColumn.ReadOnly = true;
+ this.gv_remarks.Tag = "query_a.REMARKS";
+ this.gv_remarks.Visible = true;
+ this.gv_remarks.VisibleIndex = 1;
+ this.gv_remarks.Width = 100;
//
- // gv_ebelnK3id
+ // gridColumn4
//
- this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gv_ebelnK3id.Caption = "浠诲姟鍗曞彿";
- this.gv_ebelnK3id.FieldName = "gdh";
- this.gv_ebelnK3id.MinWidth = 100;
- this.gv_ebelnK3id.Name = "gv_ebelnK3id";
- this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
- this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
- this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
- this.gv_ebelnK3id.Visible = true;
- this.gv_ebelnK3id.VisibleIndex = 2;
- this.gv_ebelnK3id.Width = 100;
+ this.gridColumn4.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn4.FieldName = "caa001";
+ this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 2;
+ this.gridColumn4.Width = 120;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn3.FieldName = "caa020";
+ this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 125;
//
// gridColumn12
//
this.gridColumn12.Caption = "宸ュ崟鎬绘暟";
this.gridColumn12.FieldName = "gdzs";
- this.gridColumn12.MinWidth = 80;
+ this.gridColumn12.MaxWidth = 50;
+ this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.Width = 50;
//
// gv_billNo
//
@@ -219,36 +231,15 @@
this.gv_billNo.AppearanceHeader.Options.UseForeColor = true;
this.gv_billNo.Caption = "鏈帓鏁伴噺";
this.gv_billNo.FieldName = "caa012";
- this.gv_billNo.MinWidth = 80;
+ this.gv_billNo.MaxWidth = 50;
+ this.gv_billNo.MinWidth = 50;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 4;
- this.gv_billNo.Width = 110;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "浠诲姟鍗曞彿";
- this.gridColumn3.FieldName = "caa020";
- this.gridColumn3.MinWidth = 125;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
- this.gridColumn3.Width = 125;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鎶曟枡鍗曞彿";
- this.gridColumn4.FieldName = "caa001";
- this.gridColumn4.MinWidth = 120;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 120;
+ this.gv_billNo.VisibleIndex = 5;
+ this.gv_billNo.Width = 50;
//
// gv_supplierItemCode
//
@@ -256,13 +247,13 @@
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "wlbm";
- this.gv_supplierItemCode.MinWidth = 100;
+ this.gv_supplierItemCode.MinWidth = 50;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 8;
+ this.gv_supplierItemCode.VisibleIndex = 6;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -271,69 +262,70 @@
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
this.gv_supplierItemName.FieldName = "wlmc";
- this.gv_supplierItemName.MinWidth = 120;
+ this.gv_supplierItemName.MinWidth = 50;
this.gv_supplierItemName.Name = "gv_supplierItemName";
this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 9;
+ this.gv_supplierItemName.VisibleIndex = 7;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "wlgg";
- this.gridColumn5.MinWidth = 250;
+ this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.VisibleIndex = 8;
this.gridColumn5.Width = 250;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍗曚綅";
this.gridColumn6.FieldName = "caa009";
- this.gridColumn6.MinWidth = 100;
+ this.gridColumn6.MaxWidth = 50;
+ this.gridColumn6.MinWidth = 50;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 11;
- this.gridColumn6.Width = 100;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 50;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "澶囨敞";
+ this.gridColumn9.FieldName = "caa016";
+ this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.Width = 100;
//
// gridColumn8
//
this.gridColumn8.Caption = "棰勮寮�鏃堕棿";
this.gridColumn8.FieldName = "caa010";
- this.gridColumn8.MinWidth = 100;
+ this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 12;
+ this.gridColumn8.VisibleIndex = 11;
this.gridColumn8.Width = 100;
//
// gridColumn7
//
this.gridColumn7.Caption = "棰勮瀹屽伐鏃堕棿";
this.gridColumn7.FieldName = "caa011";
- this.gridColumn7.MinWidth = 100;
+ this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.VisibleIndex = 12;
this.gridColumn7.Width = 100;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "澶囨敞";
- this.gridColumn9.FieldName = "caa016";
- this.gridColumn9.MinWidth = 100;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.OptionsColumn.ReadOnly = true;
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 14;
- this.gridColumn9.Width = 100;
//
// gv_purchaseUnit
//
@@ -341,13 +333,13 @@
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnit.Caption = "杞﹂棿";
this.gv_purchaseUnit.FieldName = "dptName";
- this.gv_purchaseUnit.MinWidth = 100;
+ this.gv_purchaseUnit.MinWidth = 50;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 14;
+ this.gv_purchaseUnit.VisibleIndex = 13;
this.gv_purchaseUnit.Width = 100;
//
// gv_inventoryUnit
@@ -356,29 +348,24 @@
this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
this.gv_inventoryUnit.Caption = "寮�宸ョ姸鎬�";
this.gv_inventoryUnit.FieldName = "gdzt";
- this.gv_inventoryUnit.MinWidth = 100;
+ this.gv_inventoryUnit.MinWidth = 50;
this.gv_inventoryUnit.Name = "gv_inventoryUnit";
this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gv_inventoryUnit.Visible = true;
- this.gv_inventoryUnit.VisibleIndex = 15;
+ this.gv_inventoryUnit.VisibleIndex = 14;
this.gv_inventoryUnit.Width = 100;
//
- // gv_remarks
+ // gridColumn1
//
- this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remarks.AppearanceCell.Options.UseFont = true;
- this.gv_remarks.Caption = "閿�鍞崟鍙�";
- this.gv_remarks.FieldName = "caa015";
- this.gv_remarks.MinWidth = 100;
- this.gv_remarks.Name = "gv_remarks";
- this.gv_remarks.OptionsColumn.AllowEdit = false;
- this.gv_remarks.OptionsColumn.ReadOnly = true;
- this.gv_remarks.Tag = "query_a.REMARKS";
- this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 17;
- this.gv_remarks.Width = 100;
+ this.gridColumn1.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 15;
+ this.gridColumn1.Width = 94;
//
// xtraTabControl1
//
@@ -425,7 +412,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
@@ -441,6 +427,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
index 057b23d..58684c1 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.ToolBox;
+锘縰sing DevExpress.RichEdit.Export;
+using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -18,12 +19,10 @@
this.workId = _workId;
pageBar1.PagerEvent += PageBar1_PagerEvent;
getPageList(1, UtilityHelper.GetPageSize());
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
+
+ });
btnIn.Click += (s, e) =>
{
var list = new List<string>();
@@ -82,6 +81,7 @@
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
var dddd = dd.rtnData.pages; //鎬婚〉
pageBar1.TotalPages = dddd;
pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
--
Gitblit v1.9.3