From 719a47b4aff725d4224b85e2b2079983cb31cf89 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期二, 23 十二月 2025 13:28:36 +0800
Subject: [PATCH] 增加临时查询方案
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 389 ++++++++++++++++++++++++++++---------------------------
1 files changed, 200 insertions(+), 189 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 01bae6a..1f86898 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -30,30 +30,30 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = 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 rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = 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.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition25 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition27 = 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -100,11 +100,11 @@
this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
- this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_shUserName2 = new DevExpress.XtraEditors.TextEdit();
this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
- this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_xgUserName1 = new DevExpress.XtraEditors.TextEdit();
this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
@@ -234,11 +234,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
@@ -330,6 +330,7 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80);
@@ -709,7 +710,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1437, 570);
- this.splitMx1.SplitterPosition = 182;
+ this.splitMx1.SplitterPosition = 174;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -728,11 +729,11 @@
this.layoutMx1.Controls.Add(this.txt_billType);
this.layoutMx1.Controls.Add(this.txt_approvedDate);
this.layoutMx1.Controls.Add(this.txt_id);
- this.layoutMx1.Controls.Add(this.txt_approvedBy);
+ this.layoutMx1.Controls.Add(this.txt_shUserName2);
this.layoutMx1.Controls.Add(this.txt_modifiedDate);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_salerName);
- this.layoutMx1.Controls.Add(this.txt_modifiedBy);
+ this.layoutMx1.Controls.Add(this.txt_xgUserName1);
this.layoutMx1.Controls.Add(this.txt_saleDeptName);
this.layoutMx1.Controls.Add(this.txt_createdDate);
this.layoutMx1.Controls.Add(this.txt_returnReason);
@@ -751,17 +752,18 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(575, 496, 812, 534);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1437, 182);
+ this.layoutMx1.Size = new System.Drawing.Size(1437, 174);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// ucBtnPrintAll1
//
- this.ucBtnPrintAll1.Location = new System.Drawing.Point(1074, 140);
+ this.ucBtnPrintAll1.Location = new System.Drawing.Point(1059, 140);
+ this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(2);
this.ucBtnPrintAll1.mxList = null;
this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
this.ucBtnPrintAll1.rptType = null;
- this.ucBtnPrintAll1.Size = new System.Drawing.Size(196, 27);
+ this.ucBtnPrintAll1.Size = new System.Drawing.Size(156, 21);
this.ucBtnPrintAll1.TabIndex = 546;
//
// btnSelect
@@ -777,46 +779,50 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(438, 44);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(433, 44);
+ this.txt_returnCustomer.Margin = new System.Windows.Forms.Padding(4);
this.txt_returnCustomer.Name = "txt_returnCustomer";
- this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24);
+ this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
this.txt_returnCustomer.TabIndex = 539;
//
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1146, 108);
+ this.txt_salesDept.Location = new System.Drawing.Point(1131, 108);
+ this.txt_salesDept.Margin = new System.Windows.Forms.Padding(4);
this.txt_salesDept.Name = "txt_salesDept";
- this.txt_salesDept.Size = new System.Drawing.Size(279, 24);
+ this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
this.txt_salesDept.TabIndex = 538;
//
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(792, 108);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 108);
+ this.txt_inventoryOrg.Margin = new System.Windows.Forms.Padding(4);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
- this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
this.txt_inventoryOrg.TabIndex = 537;
//
// txt_salesOrg
//
this.txt_salesOrg.IsReadly = false;
this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
+ this.txt_salesOrg.Margin = new System.Windows.Forms.Padding(4);
this.txt_salesOrg.Name = "txt_salesOrg";
- this.txt_salesOrg.Size = new System.Drawing.Size(278, 24);
+ this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
this.txt_salesOrg.TabIndex = 535;
//
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(438, 106);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 106);
this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(278, 32);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(273, 32);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 534;
//
@@ -826,7 +832,7 @@
this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
this.txt_fstockid.Name = "txt_fstockid";
- this.txt_fstockid.Size = new System.Drawing.Size(278, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(273, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -849,10 +855,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1074, 76);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1059, 76);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_chkStatus.Size = new System.Drawing.Size(351, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(345, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -860,23 +866,23 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(438, 12);
+ this.txt_billType.Location = new System.Drawing.Point(433, 12);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_billType.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(278, 24);
+ this.txt_billType.Size = new System.Drawing.Size(273, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1146, 44);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1131, 44);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedDate.Size = new System.Drawing.Size(279, 24);
+ this.txt_approvedDate.Size = new System.Drawing.Size(273, 24);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -891,22 +897,22 @@
this.txt_id.TabIndex = 210;
this.txt_id.Tag = "readonly";
//
- // txt_approvedBy
+ // txt_shUserName2
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12);
- this.txt_approvedBy.Name = "txt_approvedBy";
- this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(279, 24);
- this.txt_approvedBy.StyleController = this.layoutMx1;
- this.txt_approvedBy.TabIndex = 370;
- this.txt_approvedBy.Tag = "readonly";
+ this.txt_shUserName2.Location = new System.Drawing.Point(1131, 12);
+ this.txt_shUserName2.Name = "txt_shUserName2";
+ this.txt_shUserName2.Properties.Appearance.Options.UseFont = true;
+ this.txt_shUserName2.Size = new System.Drawing.Size(273, 24);
+ this.txt_shUserName2.StyleController = this.layoutMx1;
+ this.txt_shUserName2.TabIndex = 370;
+ this.txt_shUserName2.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(792, 44);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(782, 44);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedDate.Size = new System.Drawing.Size(278, 24);
+ this.txt_modifiedDate.Size = new System.Drawing.Size(273, 24);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
@@ -916,7 +922,7 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(278, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(273, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
@@ -931,22 +937,22 @@
this.txt_salerName.TabIndex = 267;
this.txt_salerName.Tag = "readonly";
//
- // txt_modifiedBy
+ // txt_xgUserName1
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(792, 12);
- this.txt_modifiedBy.Name = "txt_modifiedBy";
- this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(278, 24);
- this.txt_modifiedBy.StyleController = this.layoutMx1;
- this.txt_modifiedBy.TabIndex = 327;
- this.txt_modifiedBy.Tag = "readonly";
+ this.txt_xgUserName1.Location = new System.Drawing.Point(782, 12);
+ this.txt_xgUserName1.Name = "txt_xgUserName1";
+ this.txt_xgUserName1.Properties.Appearance.Options.UseFont = true;
+ this.txt_xgUserName1.Size = new System.Drawing.Size(273, 24);
+ this.txt_xgUserName1.StyleController = this.layoutMx1;
+ this.txt_xgUserName1.TabIndex = 327;
+ this.txt_xgUserName1.Tag = "readonly";
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(782, 76);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
- this.txt_saleDeptName.Size = new System.Drawing.Size(278, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(273, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
@@ -963,10 +969,10 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(438, 76);
+ this.txt_returnReason.Location = new System.Drawing.Point(433, 76);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(278, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(273, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
@@ -983,7 +989,7 @@
// txt_fHasLinkSource
//
this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(438, 140);
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 140);
this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";
this.txt_fHasLinkSource.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -991,14 +997,14 @@
"閿�鍞嚭搴撳崟(SAL_OUTSTOCK)",
"閿�鍞鍗�(SAL_SaleOrder)"});
this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fHasLinkSource.Size = new System.Drawing.Size(278, 24);
+ this.txt_fHasLinkSource.Size = new System.Drawing.Size(273, 24);
this.txt_fHasLinkSource.StyleController = this.layoutMx1;
this.txt_fHasLinkSource.TabIndex = 544;
//
// txt_xsms
//
this.txt_xsms.EditValue = "-璇烽�夋嫨-";
- this.txt_xsms.Location = new System.Drawing.Point(792, 140);
+ this.txt_xsms.Location = new System.Drawing.Point(782, 140);
this.txt_xsms.Name = "txt_xsms";
this.txt_xsms.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1009,7 +1015,7 @@
"3:OBM",
"4:渚涘簲鍟嗕拱鏂�"});
this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_xsms.Size = new System.Drawing.Size(278, 24);
+ this.txt_xsms.Size = new System.Drawing.Size(273, 24);
this.txt_xsms.StyleController = this.layoutMx1;
this.txt_xsms.TabIndex = 545;
//
@@ -1105,36 +1111,36 @@
this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition23.Width = 100D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition24.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24});
+ rowDefinition19.Height = 100D;
+ rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition20.Height = 100D;
+ rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition21.Height = 100D;
+ rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition22.Height = 100D;
+ rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition23.Height = 100D;
+ rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1437, 182);
+ rowDefinition19,
+ rowDefinition20,
+ rowDefinition21,
+ rowDefinition22,
+ rowDefinition23});
+ this.Root.Size = new System.Drawing.Size(1416, 180);
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1142,39 +1148,39 @@
this.layoutControlItem4.Control = this.txt_billNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
- this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0);
+ this.layoutControlItem15.Control = this.txt_shUserName2;
+ this.layoutControlItem15.Location = new System.Drawing.Point(1047, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(355, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1047, 32);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(355, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1047, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(355, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1185,7 +1191,7 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1195,7 +1201,7 @@
this.layItem1.Location = new System.Drawing.Point(0, 32);
this.layItem1.Name = "layItem1";
this.layItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem1.Size = new System.Drawing.Size(354, 32);
+ this.layItem1.Size = new System.Drawing.Size(349, 32);
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1204,44 +1210,44 @@
this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;
this.layoutControlItem21.Control = this.txt_fHasLinkRad;
- this.layoutControlItem21.Location = new System.Drawing.Point(354, 96);
+ this.layoutControlItem21.Location = new System.Drawing.Point(349, 96);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
- this.layoutControlItem21.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(708, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(698, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(349, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layItem2
//
this.layItem2.Control = this.txt_returnCustomer;
- this.layItem2.Location = new System.Drawing.Point(354, 32);
+ this.layItem2.Location = new System.Drawing.Point(349, 32);
this.layItem2.Name = "layItem2";
this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem2.Size = new System.Drawing.Size(354, 32);
+ this.layItem2.Size = new System.Drawing.Size(349, 32);
this.layItem2.Text = "閫�璐у鎴�";
this.layItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1250,11 +1256,11 @@
this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem3.Control = this.txt_inventoryOrg;
- this.layItem3.Location = new System.Drawing.Point(708, 96);
+ this.layItem3.Location = new System.Drawing.Point(698, 96);
this.layItem3.Name = "layItem3";
this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem3.Size = new System.Drawing.Size(354, 32);
+ this.layItem3.Size = new System.Drawing.Size(349, 32);
this.layItem3.Text = "搴撳瓨缁勭粐";
this.layItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1263,11 +1269,11 @@
this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem4.Control = this.txt_salesDept;
- this.layItem4.Location = new System.Drawing.Point(1062, 96);
+ this.layItem4.Location = new System.Drawing.Point(1047, 96);
this.layItem4.Name = "layItem4";
this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem4.Size = new System.Drawing.Size(355, 32);
+ this.layItem4.Size = new System.Drawing.Size(349, 32);
this.layItem4.Text = "閿�鍞儴闂�";
this.layItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1277,32 +1283,32 @@
this.layItem100.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem100.Control = this.txt_fHasLinkSource;
this.layItem100.CustomizationFormText = "鏁版嵁鏉ユ簮";
- this.layItem100.Location = new System.Drawing.Point(354, 128);
+ this.layItem100.Location = new System.Drawing.Point(349, 128);
this.layItem100.Name = "layItem100";
this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem100.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem100.Size = new System.Drawing.Size(354, 34);
+ this.layItem100.Size = new System.Drawing.Size(349, 32);
this.layItem100.Text = "鏁版嵁鏉ユ簮";
this.layItem100.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
- this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(708, 0);
+ this.layoutControlItem13.Control = this.txt_xgUserName1;
+ this.layoutControlItem13.Location = new System.Drawing.Point(698, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem13.Text = "淇敼浜哄憳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(708, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1310,11 +1316,11 @@
//
this.layoutControlItem9.Control = this.txt_returnReason;
this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(354, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(349, 64);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem9.Text = "鐢宠鍘熷洜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1326,7 +1332,7 @@
this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -1337,24 +1343,24 @@
this.layItem101.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem101.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem101.Control = this.txt_xsms;
- this.layItem101.Location = new System.Drawing.Point(708, 128);
+ this.layItem101.Location = new System.Drawing.Point(698, 128);
this.layItem101.Name = "layItem101";
this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem101.Size = new System.Drawing.Size(354, 34);
+ this.layItem101.Size = new System.Drawing.Size(349, 32);
this.layItem101.Text = "閿�鍞ā寮�";
this.layItem101.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.ucBtnPrintAll1;
- this.layoutControlItem2.Location = new System.Drawing.Point(1062, 128);
- this.layoutControlItem2.MaxSize = new System.Drawing.Size(200, 31);
- this.layoutControlItem2.MinSize = new System.Drawing.Size(101, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(1047, 128);
+ this.layoutControlItem2.MaxSize = new System.Drawing.Size(160, 25);
+ this.layoutControlItem2.MinSize = new System.Drawing.Size(81, 25);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem2.Size = new System.Drawing.Size(355, 34);
+ this.layoutControlItem2.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem2.Text = "鎵撳嵃鎵�鏈夋槑缁�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
@@ -1366,7 +1372,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1437, 376);
+ this.tabMx.Size = new System.Drawing.Size(1437, 384);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1376,7 +1382,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1435, 344);
+ this.tabMxPage1.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1396,7 +1402,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1435, 344);
+ this.split99.Size = new System.Drawing.Size(1435, 352);
this.split99.SplitterPosition = 132;
this.split99.TabIndex = 4;
//
@@ -1463,17 +1469,17 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition25.Width = 100D;
+ columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition26.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition25,
+ columnDefinition26});
+ rowDefinition24.Height = 100D;
+ rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6});
+ rowDefinition24});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);
this.layoutControlGroup2.TextVisible = false;
@@ -1633,29 +1639,29 @@
this.layoutControlItem32});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- 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;
+ columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition27.Width = 100D;
+ columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition28.Width = 100D;
+ columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition29.Width = 100D;
+ columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition30.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition27,
+ columnDefinition28,
+ columnDefinition29,
+ columnDefinition30});
+ rowDefinition25.Height = 100D;
+ rowDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition26.Height = 100D;
+ rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition27.Height = 100D;
+ rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
+ rowDefinition25,
+ rowDefinition26,
+ rowDefinition27});
this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1778,7 +1784,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1435, 200);
+ this.gcMx1.Size = new System.Drawing.Size(1435, 208);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1851,7 +1857,7 @@
this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
this.gvMx1materialSpecification.Visible = true;
- this.gvMx1materialSpecification.VisibleIndex = 8;
+ this.gvMx1materialSpecification.VisibleIndex = 9;
this.gvMx1materialSpecification.Width = 94;
//
// gridColumn20
@@ -1957,14 +1963,19 @@
//
// gvMx1isFree
//
+ this.gvMx1isFree.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
+ this.gvMx1isFree.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1isFree.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1isFree.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1isFree.Caption = "鏄惁璧犲搧 ";
this.gvMx1isFree.FieldName = "isFreeChk";
this.gvMx1isFree.MinWidth = 50;
this.gvMx1isFree.Name = "gvMx1isFree";
- this.gvMx1isFree.Tag = "query_a.IS_FREE";
+ this.gvMx1isFree.Tag = "edit";
+ this.gvMx1isFree.UnboundDataType = typeof(bool);
this.gvMx1isFree.Visible = true;
- this.gvMx1isFree.VisibleIndex = 9;
+ this.gvMx1isFree.VisibleIndex = 8;
this.gvMx1isFree.Width = 94;
//
// gvMx1returnType
@@ -2038,10 +2049,10 @@
// 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);
@@ -2050,7 +2061,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1435, 344);
+ this.tabMxPage2.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -2059,7 +2070,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1435, 344);
+ this.gcMx2.Size = new System.Drawing.Size(1435, 352);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2271,11 +2282,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
@@ -2392,9 +2403,9 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_approvedDate;
- private DevExpress.XtraEditors.TextEdit txt_approvedBy;
+ private DevExpress.XtraEditors.TextEdit txt_shUserName2;
private DevExpress.XtraEditors.TextEdit txt_modifiedDate;
- private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
+ private DevExpress.XtraEditors.TextEdit txt_xgUserName1;
private DevExpress.XtraEditors.TextEdit txt_createdDate;
private DevExpress.XtraEditors.TextEdit txt_createdBy;
private DevExpress.XtraEditors.TextEdit txt_salerName;
--
Gitblit v1.9.3