From 4fc28e0f94344c452210e4f6dc9c1f01fcc51d65 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 29 八月 2025 08:04:09 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 1
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 166 +++++++++++++++++++++++++++---------------------------
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 9 ++-
3 files changed, 90 insertions(+), 86 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 4386cc3..031ead2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -122,15 +122,15 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem100 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -203,8 +203,8 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -253,15 +253,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem100)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -310,8 +310,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -708,7 +708,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 = 169;
+ this.splitMx1.SplitterPosition = 174;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -748,14 +748,14 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1437, 169);
+ this.layoutMx1.Size = new System.Drawing.Size(1437, 174);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 108);
+ this.btnSelect.Location = new System.Drawing.Point(12, 102);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(126, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -765,7 +765,7 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(433, 44);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(433, 38);
this.txt_returnCustomer.Name = "txt_returnCustomer";
this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
this.txt_returnCustomer.TabIndex = 539;
@@ -773,7 +773,7 @@
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1131, 108);
+ this.txt_salesDept.Location = new System.Drawing.Point(1131, 102);
this.txt_salesDept.Name = "txt_salesDept";
this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
this.txt_salesDept.TabIndex = 538;
@@ -781,7 +781,7 @@
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 108);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 102);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
this.txt_inventoryOrg.TabIndex = 537;
@@ -789,7 +789,7 @@
// txt_salesOrg
//
this.txt_salesOrg.IsReadly = false;
- this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
+ this.txt_salesOrg.Location = new System.Drawing.Point(84, 38);
this.txt_salesOrg.Name = "txt_salesOrg";
this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
this.txt_salesOrg.TabIndex = 535;
@@ -797,7 +797,7 @@
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 106);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 100);
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[] {
@@ -811,7 +811,7 @@
// txt_fstockid
//
this.txt_fstockid.IsReadly = false;
- this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
+ this.txt_fstockid.Location = new System.Drawing.Point(84, 70);
this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
this.txt_fstockid.Name = "txt_fstockid";
this.txt_fstockid.Size = new System.Drawing.Size(273, 24);
@@ -837,7 +837,7 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1059, 76);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1059, 70);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_chkStatus.Size = new System.Drawing.Size(345, 24);
@@ -848,7 +848,7 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(433, 12);
+ this.txt_billType.Location = new System.Drawing.Point(433, 6);
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)});
@@ -861,7 +861,7 @@
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1131, 44);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1131, 38);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
this.txt_approvedDate.Size = new System.Drawing.Size(273, 24);
@@ -881,7 +881,7 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1131, 12);
+ this.txt_approvedBy.Location = new System.Drawing.Point(1131, 6);
this.txt_approvedBy.Name = "txt_approvedBy";
this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
this.txt_approvedBy.Size = new System.Drawing.Size(273, 24);
@@ -891,7 +891,7 @@
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(782, 44);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(782, 38);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
this.txt_modifiedDate.Size = new System.Drawing.Size(273, 24);
@@ -901,7 +901,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 6);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Size = new System.Drawing.Size(273, 24);
@@ -921,7 +921,7 @@
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(782, 12);
+ this.txt_modifiedBy.Location = new System.Drawing.Point(782, 6);
this.txt_modifiedBy.Name = "txt_modifiedBy";
this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
this.txt_modifiedBy.Size = new System.Drawing.Size(273, 24);
@@ -931,7 +931,7 @@
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(782, 76);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(782, 70);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
this.txt_saleDeptName.Size = new System.Drawing.Size(273, 24);
@@ -951,7 +951,7 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(433, 76);
+ this.txt_returnReason.Location = new System.Drawing.Point(433, 70);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
this.txt_returnReason.Size = new System.Drawing.Size(273, 24);
@@ -971,7 +971,7 @@
// txt_fHasLinkSource
//
this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 140);
+ this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 134);
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)});
@@ -1060,9 +1060,7 @@
this.layoutControlItem17,
this.layoutControlItem20,
this.layItem1,
- this.layoutControlItem3,
this.layoutControlItem21,
- this.layoutControlItem9,
this.layoutControlItem7,
this.layoutControlItem10,
this.layItem2,
@@ -1070,7 +1068,9 @@
this.layItem4,
this.layItem100,
this.layoutControlItem13,
- this.layoutControlItem14});
+ this.layoutControlItem14,
+ this.layoutControlItem9,
+ this.layoutControlItem3});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1167,20 +1167,6 @@
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.btnSelect;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);
- 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(349, 32);
- this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem3.TextVisible = false;
- //
// layoutControlItem21
//
this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
@@ -1194,18 +1180,6 @@
this.layoutControlItem21.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- 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(349, 32);
- this.layoutControlItem9.Text = "鐢宠鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -1279,13 +1253,34 @@
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(698, 0);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ 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(698, 32);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
+ this.layoutControlItem14.Text = "淇敼鏃堕棿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
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, 389);
+ this.tabMx.Size = new System.Drawing.Size(1437, 384);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1295,7 +1290,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1435, 357);
+ this.tabMxPage1.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1315,7 +1310,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, 357);
+ this.split99.Size = new System.Drawing.Size(1435, 352);
this.split99.SplitterPosition = 132;
this.split99.TabIndex = 4;
//
@@ -1702,7 +1697,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1435, 213);
+ 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});
@@ -2160,26 +2155,31 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem13
+ // layoutControlItem9
//
- this.layoutControlItem13.Control = this.txt_modifiedBy;
- 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(349, 32);
- this.layoutControlItem13.Text = "淇敼浜哄憳";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.Control = this.txt_returnReason;
+ this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+ 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(349, 32);
+ this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem14
+ // layoutControlItem3
//
- this.layoutControlItem14.Control = this.txt_modifiedDate;
- 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(349, 32);
- this.layoutControlItem14.Text = "淇敼鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.Control = this.btnSelect;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);
+ 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(349, 32);
+ this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
//
// Frm_SalesReturnNotice
//
@@ -2239,15 +2239,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem100)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2296,8 +2296,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
@@ -2440,9 +2440,7 @@
private DevExpress.XtraEditors.SimpleButton btnSelect;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layItem2;
@@ -2453,5 +2451,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 88cf1c5..2ce2ed3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -457,6 +457,7 @@
txt_inventoryOrg.IsReadly = true;
txt_fHasLinkRad.ReadOnly = true;
txt_fHasLinkSource.ReadOnly = true;
+ txt_returnCustomer.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index ea4bccf..557c3d7 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -33,10 +33,13 @@
public void getSuppler(string orgId, string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
- string _keyWhere = "";
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
if (!string.IsNullOrEmpty(orgId))
- _keyWhere = " and a.FSubsidiary ='" + orgId + "'";
- var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _keyWhere);
+ _sbSqlWhere.Append(" and a.FSubsidiary ='" + orgId + "'");
+ _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+
+ var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
--
Gitblit v1.9.3