From 9b9fbafa1b5a26c88cfb4eff340705ab9f9ff138 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 27 九月 2025 17:41:09 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 272 +++++++++++++++---------------
DevApp/Gs.DevApp/DevFrm/Rpt/RptQT.Designer.cs | 123 +++++-------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 28 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 52 ++--
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 32 +++
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/UserControl/SelectDaa.cs | 1
8 files changed, 264 insertions(+), 252 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 8cf35bf..432ab84 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index f593a29..4a9249e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -70,7 +70,7 @@
this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.txt_dhgRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
- this.txt_fcheckUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
@@ -78,7 +78,7 @@
this.txt_cbillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
this.txt_receivingOrg = new DevExpress.XtraEditors.TextEdit();
@@ -160,14 +160,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dhgRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).BeginInit();
@@ -555,7 +555,7 @@
this.layoutMx1.Controls.Add(this.txt_dptName);
this.layoutMx1.Controls.Add(this.txt_dhgRemark);
this.layoutMx1.Controls.Add(this.txt_suppName);
- this.layoutMx1.Controls.Add(this.txt_fcheckUser);
+ this.layoutMx1.Controls.Add(this.txt_checkUser);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_paperBillNo);
this.layoutMx1.Controls.Add(this.txt_checkDate);
@@ -563,7 +563,7 @@
this.layoutMx1.Controls.Add(this.txt_cbillNo);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_fstatus);
+ this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_depotCode);
this.layoutMx1.Controls.Add(this.txt_receivingOrg);
@@ -608,14 +608,14 @@
this.txt_suppName.TabIndex = 592;
this.txt_suppName.Tag = "readonly";
//
- // txt_fcheckUser
+ // txt_checkUser
//
- this.txt_fcheckUser.Location = new System.Drawing.Point(1092, 12);
- this.txt_fcheckUser.Name = "txt_fcheckUser";
- this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckUser.Size = new System.Drawing.Size(242, 24);
- this.txt_fcheckUser.StyleController = this.layoutMx1;
- this.txt_fcheckUser.TabIndex = 595;
+ this.txt_checkUser.Location = new System.Drawing.Point(1092, 12);
+ this.txt_checkUser.Name = "txt_checkUser";
+ this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUser.Size = new System.Drawing.Size(242, 24);
+ this.txt_checkUser.StyleController = this.layoutMx1;
+ this.txt_checkUser.TabIndex = 595;
//
// lbGuid
//
@@ -680,14 +680,14 @@
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
- // txt_fstatus
+ // txt_status
//
- this.txt_fstatus.Location = new System.Drawing.Point(1005, 74);
- this.txt_fstatus.Name = "txt_fstatus";
- this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(329, 24);
- this.txt_fstatus.StyleController = this.layoutMx1;
- this.txt_fstatus.TabIndex = 596;
+ this.txt_status.Location = new System.Drawing.Point(1005, 74);
+ this.txt_status.Name = "txt_status";
+ this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
+ this.txt_status.Size = new System.Drawing.Size(329, 24);
+ this.txt_status.StyleController = this.layoutMx1;
+ this.txt_status.TabIndex = 596;
//
// txt_guid
//
@@ -827,7 +827,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_fcheckUser;
+ this.layoutControlItem5.Control = this.txt_checkUser;
this.layoutControlItem5.Location = new System.Drawing.Point(993, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -879,7 +879,7 @@
//
// layoutControlItem12
//
- this.layoutControlItem12.Control = this.txt_fstatus;
+ this.layoutControlItem12.Control = this.txt_status;
this.layoutControlItem12.Location = new System.Drawing.Point(993, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1380,14 +1380,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dhgRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cbillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).EndInit();
@@ -1456,7 +1456,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.TextEdit txt_fcheckUser;
+ private DevExpress.XtraEditors.TextEdit txt_checkUser;
private DevExpress.XtraEditors.TextEdit txt_dptName;
private DevExpress.XtraEditors.TextEdit txt_suppName;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
@@ -1467,7 +1467,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraEditors.CheckEdit txt_fstatus;
+ private DevExpress.XtraEditors.CheckEdit txt_status;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txt_guid;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 5b3e7ef..185b09f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -31,36 +31,36 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
- 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();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ 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 editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -1070,38 +1070,38 @@
this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition11,
- columnDefinition12,
- columnDefinition13,
- columnDefinition14});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1332, 207);
this.Root.TextVisible = false;
//
@@ -1414,11 +1414,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
@@ -1432,7 +1432,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 33);
+ this.radOut.Size = new System.Drawing.Size(336, 32);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1440,10 +1440,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 86);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 84);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 33);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 32);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1475,19 +1475,19 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition15,
- columnDefinition16});
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition17});
+ rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1495,7 +1495,7 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1505,7 +1505,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1523,7 +1523,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1542,7 +1542,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 49);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 48);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1562,7 +1562,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 49);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 48);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1572,7 +1572,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 86);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 84);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1609,30 +1609,30 @@
this.layoutControlItem31});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition17,
- columnDefinition18,
- columnDefinition19,
- columnDefinition20});
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition18,
- rowDefinition19,
- rowDefinition20});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -1641,7 +1641,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1649,11 +1649,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
+ this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1666,7 +1666,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1675,11 +1675,11 @@
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1691,7 +1691,7 @@
this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1700,11 +1700,11 @@
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1715,7 +1715,7 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1724,10 +1724,10 @@
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1736,22 +1736,22 @@
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
+ this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1873,41 +1873,41 @@
//
this.gridColumn9.Caption = "鐗╂枡缂栫爜";
this.gridColumn9.FieldName = "itemNo";
- this.gridColumn9.MinWidth = 100;
+ this.gridColumn9.MinWidth = 50;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 1;
- this.gridColumn9.Width = 100;
+ this.gridColumn9.VisibleIndex = 0;
+ this.gridColumn9.Width = 68;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
this.gridColumn10.FieldName = "itemName";
- this.gridColumn10.MinWidth = 120;
+ this.gridColumn10.MinWidth = 50;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 2;
- this.gridColumn10.Width = 120;
+ this.gridColumn10.VisibleIndex = 1;
+ this.gridColumn10.Width = 82;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 120;
+ this.gridColumn11.MinWidth = 50;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 3;
- this.gridColumn11.Width = 120;
+ this.gridColumn11.VisibleIndex = 2;
+ this.gridColumn11.Width = 82;
//
// gridColumn7
//
this.gridColumn7.Caption = "浣跨敤缁勭粐";
this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 200;
+ this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 0;
- this.gridColumn7.Width = 200;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 100;
//
// gvMx1qd002
//
@@ -2044,10 +2044,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2071,9 +2071,9 @@
// rptBl
//
this.rptBl.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptBl.Name = "rptBl";
this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 1ed4291..6f818ce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -80,6 +80,9 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ gridView2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
+
}
catch (Exception ex)
{
@@ -97,6 +100,35 @@
lst = ee.DynamicList;
strSrmNo = lst[0].guid;
txt_qt035.Text = strSrmNo;
+ #region 閫夋嫨宸ュ崟鍚庡甫鍑轰笅闈㈢殑鐗╂枡 2025-09-27
+ try
+ {
+ var _obj = new
+ {
+ strDaaNo = strSrmNo,//涓诲缓
+ };
+ var strReturn = UtilityHelper.HttpPost("",
+ "WomdaaManager/SelectDaaMx",
+ JsonConvert.SerializeObject(_obj));
+ var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _oldTable;
+ gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ #endregion
};
frm.ShowDialog();
};
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 3f1fca2..ccaa4c1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -112,7 +112,7 @@
this.txt_tbl026 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl025 = new DevExpress.XtraEditors.TextEdit();
this.txt_chkOut = new DevExpress.XtraEditors.CheckEdit();
- this.checkEdit1 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_tbl024 = new DevExpress.XtraEditors.CheckEdit();
this.txt_tbl028 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl029 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl027 = new DevExpress.XtraEditors.CheckEdit();
@@ -256,7 +256,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl026.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl025.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkOut.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl024.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl028.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl029.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl027.Properties)).BeginInit();
@@ -742,7 +742,7 @@
this.layoutMx1.Controls.Add(this.txt_tbl026);
this.layoutMx1.Controls.Add(this.txt_tbl025);
this.layoutMx1.Controls.Add(this.txt_chkOut);
- this.layoutMx1.Controls.Add(this.checkEdit1);
+ this.layoutMx1.Controls.Add(this.txt_tbl024);
this.layoutMx1.Controls.Add(this.txt_tbl028);
this.layoutMx1.Controls.Add(this.txt_tbl029);
this.layoutMx1.Controls.Add(this.txt_tbl027);
@@ -977,15 +977,15 @@
this.txt_chkOut.StyleController = this.layoutMx1;
this.txt_chkOut.TabIndex = 472;
//
- // checkEdit1
+ // txt_tbl024
//
- this.checkEdit1.Location = new System.Drawing.Point(1049, 167);
- this.checkEdit1.Name = "checkEdit1";
- this.checkEdit1.Properties.Caption = "鎵瑰噯鐘舵��";
- this.checkEdit1.Size = new System.Drawing.Size(342, 24);
- this.checkEdit1.StyleController = this.layoutMx1;
- this.checkEdit1.TabIndex = 473;
- this.checkEdit1.Tag = "readonly";
+ this.txt_tbl024.Location = new System.Drawing.Point(1049, 167);
+ this.txt_tbl024.Name = "txt_tbl024";
+ this.txt_tbl024.Properties.Caption = "鎵瑰噯鐘舵��";
+ this.txt_tbl024.Size = new System.Drawing.Size(342, 24);
+ this.txt_tbl024.StyleController = this.layoutMx1;
+ this.txt_tbl024.TabIndex = 473;
+ this.txt_tbl024.Tag = "readonly";
//
// txt_tbl028
//
@@ -1299,7 +1299,7 @@
//
// layoutControlItem35
//
- this.layoutControlItem35.Control = this.checkEdit1;
+ this.layoutControlItem35.Control = this.txt_tbl024;
this.layoutControlItem35.Location = new System.Drawing.Point(1037, 155);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -2346,7 +2346,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl026.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl025.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkOut.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.checkEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl024.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl028.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl029.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl027.Properties)).EndInit();
@@ -2565,7 +2565,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
- private DevExpress.XtraEditors.CheckEdit checkEdit1;
+ private DevExpress.XtraEditors.CheckEdit txt_tbl024;
private DevExpress.XtraEditors.TextEdit txt_tbl028;
private DevExpress.XtraEditors.TextEdit txt_tbl029;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptQT.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptQT.Designer.cs
index f327f74..d438ccd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptQT.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptQT.Designer.cs
@@ -86,10 +86,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(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -97,11 +97,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -109,9 +108,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -120,7 +118,6 @@
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);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -134,19 +131,17 @@
this.split1.Panel2.Controls.Add(this.gridControl1);
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
- this.split1.SplitterPosition = 268;
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 219;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 367);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 300);
this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -165,9 +160,8 @@
this.gridColumn5,
this.gridColumn7,
this.gridColumn18});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -177,127 +171,124 @@
//
this.gridColumn8.Caption = "宸ュ崟鍗曞彿";
this.gridColumn8.FieldName = "daa001";
- this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.MinWidth = 24;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "daa001";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 0;
- this.gridColumn8.Width = 112;
+ this.gridColumn8.Width = 90;
//
// itemNo1
//
this.itemNo1.Caption = "鐗╂枡缂栫爜";
this.itemNo1.FieldName = "itemNo";
- this.itemNo1.MinWidth = 30;
+ this.itemNo1.MinWidth = 24;
this.itemNo1.Name = "itemNo1";
this.itemNo1.Tag = "itemNo";
this.itemNo1.Visible = true;
this.itemNo1.VisibleIndex = 1;
- this.itemNo1.Width = 112;
+ this.itemNo1.Width = 90;
//
// itemName
//
this.itemName.Caption = "鐗╂枡鍚嶇О";
this.itemName.FieldName = "itemName";
- this.itemName.MinWidth = 30;
+ this.itemName.MinWidth = 24;
this.itemName.Name = "itemName";
this.itemName.Tag = "itemName";
this.itemName.Visible = true;
this.itemName.VisibleIndex = 2;
- this.itemName.Width = 112;
+ this.itemName.Width = 90;
//
// itemModel
//
this.itemModel.Caption = "瑙勬牸鍨嬪彿";
this.itemModel.FieldName = "itemModel";
- this.itemModel.MinWidth = 30;
+ this.itemModel.MinWidth = 24;
this.itemModel.Name = "itemModel";
this.itemModel.Tag = "itemModel";
this.itemModel.Visible = true;
this.itemModel.VisibleIndex = 3;
- this.itemModel.Width = 112;
+ this.itemModel.Width = 90;
//
// gridColumn19
//
this.gridColumn19.Caption = "鍗曚綅";
this.gridColumn19.FieldName = "fname";
- this.gridColumn19.MinWidth = 30;
+ this.gridColumn19.MinWidth = 24;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 4;
- this.gridColumn19.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "棰勮寮�宸ユ棩鏈�";
this.gridColumn2.FieldName = "daa006";
- this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.MinWidth = 24;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 112;
+ this.gridColumn2.Width = 90;
//
// gridColumn3
//
this.gridColumn3.Caption = "宸ュ崟鏁伴噺";
this.gridColumn3.FieldName = "daa008";
- this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.MinWidth = 24;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 112;
+ this.gridColumn3.Width = 90;
//
// gridColumn5
//
this.gridColumn5.Caption = "绾垮埆";
this.gridColumn5.FieldName = "lineName";
- this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.MinWidth = 24;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 7;
- this.gridColumn5.Width = 112;
+ this.gridColumn5.Width = 90;
//
// gridColumn7
//
this.gridColumn7.Caption = "榻愬鐜�";
this.gridColumn7.FieldName = "minQT";
- this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.MinWidth = 24;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 8;
- this.gridColumn7.Width = 112;
+ this.gridColumn7.Width = 90;
//
// gridColumn18
//
this.gridColumn18.Caption = "缁勭粐鏈烘瀯";
this.gridColumn18.FieldName = "orgName";
- this.gridColumn18.MinWidth = 30;
+ this.gridColumn18.MinWidth = 24;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 9;
- this.gridColumn18.Width = 112;
+ this.gridColumn18.Width = 90;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 367);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 300);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// gridControl1
//
this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Location = new System.Drawing.Point(0, 0);
this.gridControl1.MainView = this.gridView2;
- this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Name = "gridControl1";
- this.gridControl1.Size = new System.Drawing.Size(1408, 268);
+ this.gridControl1.Size = new System.Drawing.Size(1126, 219);
this.gridControl1.TabIndex = 5;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
@@ -318,9 +309,8 @@
this.gridColumn15,
this.gridColumn16,
this.gridColumn17});
- this.gridView2.DetailHeight = 428;
this.gridView2.GridControl = this.gridControl1;
- this.gridView2.IndicatorWidth = 62;
+ this.gridView2.IndicatorWidth = 50;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsFind.ShowSearchNavButtons = false;
this.gridView2.OptionsView.ShowAutoFilterRow = true;
@@ -330,137 +320,128 @@
//
this.gridColumn9.Caption = "搴忓彿";
this.gridColumn9.FieldName = "dab002";
- this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.MinWidth = 24;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "daa001";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 112;
+ this.gridColumn9.Width = 90;
//
// gridColumn4
//
this.gridColumn4.Caption = "宸ュ崟鍙�";
this.gridColumn4.FieldName = "daa0001";
- this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.MinWidth = 24;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 94;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
- this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.MinWidth = 24;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "itemNo";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 2;
- this.gridColumn10.Width = 112;
+ this.gridColumn10.Width = 90;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
this.gridColumn11.FieldName = "itemName";
- this.gridColumn11.MinWidth = 30;
+ this.gridColumn11.MinWidth = 24;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "itemName";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 3;
- this.gridColumn11.Width = 112;
+ this.gridColumn11.Width = 90;
//
// gridColumn12
//
this.gridColumn12.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn12.FieldName = "itemModel";
- this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.MinWidth = 24;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "itemModel";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 5;
- this.gridColumn12.Width = 112;
+ this.gridColumn12.Width = 90;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍗曚綅";
this.gridColumn1.FieldName = "fname";
- this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.MinWidth = 24;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "闇�姹傛暟閲�";
this.gridColumn6.FieldName = "xqNum";
- this.gridColumn6.MinWidth = 30;
+ this.gridColumn6.MinWidth = 24;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
//
// gridColumn13
//
this.gridColumn13.Caption = "宸查鏁伴噺";
this.gridColumn13.FieldName = "ylNum";
- this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.MinWidth = 24;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 7;
- this.gridColumn13.Width = 94;
//
// gridColumn14
//
this.gridColumn14.Caption = "搴撳瓨鏁伴噺";
this.gridColumn14.FieldName = "kcNum";
- this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.MinWidth = 24;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 94;
//
// gridColumn15
//
this.gridColumn15.Caption = "寰呴鏁伴噺";
this.gridColumn15.FieldName = "dlNum";
- this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.MinWidth = 24;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 94;
//
// gridColumn16
//
this.gridColumn16.Caption = "閰嶅彂鏁伴噺";
this.gridColumn16.FieldName = "pfNum";
- this.gridColumn16.MinWidth = 30;
+ this.gridColumn16.MinWidth = 24;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "榻愬鐜�";
this.gridColumn17.FieldName = "qtNum";
- this.gridColumn17.MinWidth = 30;
+ this.gridColumn17.MinWidth = 24;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 11;
- this.gridColumn17.Width = 94;
//
// RptQT
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
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);
this.Name = "RptQT";
- this.Text = "鎴愬搧鍏ュ簱璁板綍琛�";
+ this.Text = "宸ュ崟榻愬鎶ヨ〃";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index e0e4483..18e3872 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -53,8 +53,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- //Application.Run(new DevFrm.User.SysMenu());
- //return;
+ Application.Run(new DevFrm.User.SysMenu());
+ return;
Application.Run(new FrmMain());
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
index 12f0706..c2ba76c 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
@@ -46,7 +46,6 @@
gcMain.ForceInitialize();
gridView1.BestFitColumns();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
--
Gitblit v1.9.3