From cb054ad80cfe66befdba09f544916bed9b67d8a8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 三月 2025 16:40:41 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 417 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 265 insertions(+), 152 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 2917450..bd37c34 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -57,9 +57,9 @@
this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_salesDept = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_salesPerson = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -72,10 +72,15 @@
this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_approvedDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
@@ -84,13 +89,13 @@
this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_salesOrg = new DevExpress.XtraEditors.TextEdit();
+ this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit();
this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_salesPerson = new DevExpress.XtraEditors.TextEdit();
+ this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_salesDept = new DevExpress.XtraEditors.TextEdit();
+ this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
this.txt_custName = new DevExpress.XtraEditors.TextEdit();
this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
@@ -115,6 +120,7 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -130,6 +136,7 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -146,6 +153,8 @@
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
@@ -207,13 +216,13 @@
((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_salesOrg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_salesPerson.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
@@ -238,6 +247,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -270,6 +280,7 @@
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -340,9 +351,9 @@
this.gv_id,
this.gridColumn1,
this.gridColumn19,
+ this.gridColumn27,
this.gv_billType,
this.gv_billNo,
- this.gv_customerOrderNo,
this.gv_salesOrg,
this.gv_salesDept,
this.gv_salesPerson,
@@ -354,7 +365,11 @@
this.gv_modifiedDate,
this.gv_approvedBy,
this.gv_approvedDate,
- this.gridColumn18});
+ this.gridColumn18,
+ this.gv_customerOrderNo,
+ this.gridColumn24,
+ this.gridColumn25,
+ this.gridColumn26});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -372,8 +387,6 @@
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.ID";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 0;
this.gv_id.Width = 94;
//
// gridColumn1
@@ -383,7 +396,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 94;
//
// gridColumn19
@@ -393,8 +406,18 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 3;
+ this.gridColumn19.VisibleIndex = 1;
this.gridColumn19.Width = 94;
+ //
+ // gridColumn27
+ //
+ this.gridColumn27.Caption = "鏄惁鏈夋簮";
+ this.gridColumn27.FieldName = "isLink";
+ this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.Visible = true;
+ this.gridColumn27.VisibleIndex = 3;
+ this.gridColumn27.Width = 94;
//
// gv_billType
//
@@ -423,20 +446,6 @@
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 4;
this.gv_billNo.Width = 94;
- //
- // gv_customerOrderNo
- //
- this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
- this.gv_customerOrderNo.Caption = "閿�鍞鍗�";
- this.gv_customerOrderNo.FieldName = "xsNo";
- this.gv_customerOrderNo.MinWidth = 50;
- this.gv_customerOrderNo.Name = "gv_customerOrderNo";
- this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
- this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
- this.gv_customerOrderNo.Visible = true;
- this.gv_customerOrderNo.VisibleIndex = 7;
- this.gv_customerOrderNo.Width = 94;
//
// gv_salesOrg
//
@@ -477,7 +486,7 @@
this.gv_salesPerson.OptionsColumn.AllowEdit = false;
this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
this.gv_salesPerson.Visible = true;
- this.gv_salesPerson.VisibleIndex = 10;
+ this.gv_salesPerson.VisibleIndex = 8;
this.gv_salesPerson.Width = 94;
//
// gv_returnReason
@@ -491,7 +500,7 @@
this.gv_returnReason.OptionsColumn.AllowEdit = false;
this.gv_returnReason.Tag = "query_a.RETURN_REASON";
this.gv_returnReason.Visible = true;
- this.gv_returnReason.VisibleIndex = 8;
+ this.gv_returnReason.VisibleIndex = 9;
this.gv_returnReason.Width = 94;
//
// gv_inventoryOrg
@@ -505,7 +514,7 @@
this.gv_inventoryOrg.OptionsColumn.AllowEdit = false;
this.gv_inventoryOrg.Tag = "query_a.INVENTORY_ORG";
this.gv_inventoryOrg.Visible = true;
- this.gv_inventoryOrg.VisibleIndex = 9;
+ this.gv_inventoryOrg.VisibleIndex = 10;
this.gv_inventoryOrg.Width = 94;
//
// gv_createdBy
@@ -602,6 +611,48 @@
this.gridColumn18.VisibleIndex = 17;
this.gridColumn18.Width = 94;
//
+ // gv_customerOrderNo
+ //
+ this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
+ this.gv_customerOrderNo.Caption = "婧愰攢鍞鍗�";
+ this.gv_customerOrderNo.FieldName = "xsNo";
+ this.gv_customerOrderNo.MinWidth = 50;
+ this.gv_customerOrderNo.Name = "gv_customerOrderNo";
+ this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
+ this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
+ this.gv_customerOrderNo.Visible = true;
+ this.gv_customerOrderNo.VisibleIndex = 7;
+ this.gv_customerOrderNo.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "浠撳簱ID";
+ this.gridColumn24.FieldName = "ckId";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Width = 94;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn25.FieldName = "ckName";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 18;
+ this.gridColumn25.Width = 94;
+ //
+ // gridColumn26
+ //
+ this.gridColumn26.Caption = "浠撳簱缂栧彿";
+ this.gridColumn26.FieldName = "ckNo";
+ this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 19;
+ this.gridColumn26.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -638,11 +689,12 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 160;
+ this.splitMx1.SplitterPosition = 185;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_fstockid);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_wjStatus);
this.layoutMx1.Controls.Add(this.txt_chkStatus);
@@ -651,13 +703,13 @@
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_salesOrg);
+ this.layoutMx1.Controls.Add(this.txt_xsOrgName);
this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
this.layoutMx1.Controls.Add(this.txt_modifiedDate);
this.layoutMx1.Controls.Add(this.txt_billNo);
- this.layoutMx1.Controls.Add(this.txt_salesPerson);
+ this.layoutMx1.Controls.Add(this.txt_salerName);
this.layoutMx1.Controls.Add(this.txt_modifiedBy);
- this.layoutMx1.Controls.Add(this.txt_salesDept);
+ this.layoutMx1.Controls.Add(this.txt_saleDeptName);
this.layoutMx1.Controls.Add(this.txt_custName);
this.layoutMx1.Controls.Add(this.txt_createdDate);
this.layoutMx1.Controls.Add(this.txt_returnReason);
@@ -667,34 +719,43 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(834, 92, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 160);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 185);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_fstockid
+ //
+ this.txt_fstockid.IsReadly = false;
+ this.txt_fstockid.Location = new System.Drawing.Point(90, 144);
+ this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_fstockid.Name = "txt_fstockid";
+ this.txt_fstockid.Size = new System.Drawing.Size(194, 28);
+ this.txt_fstockid.TabIndex = 454;
+ //
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 140);
+ this.lbGuid.Location = new System.Drawing.Point(840, 144);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(274, 29);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(283, 140);
+ this.txt_wjStatus.Location = new System.Drawing.Point(288, 144);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(272, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 453;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(554, 140);
+ this.txt_chkStatus.Location = new System.Drawing.Point(564, 144);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_chkStatus.Size = new System.Drawing.Size(267, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(272, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -702,32 +763,32 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(361, 108);
+ this.txt_billType.Location = new System.Drawing.Point(366, 111);
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(189, 24);
+ this.txt_billType.Size = new System.Drawing.Size(194, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_salesOrderId
//
this.txt_salesOrderId.IsReadly = false;
- this.txt_salesOrderId.Location = new System.Drawing.Point(90, 76);
+ this.txt_salesOrderId.Location = new System.Drawing.Point(90, 78);
this.txt_salesOrderId.Name = "txt_salesOrderId";
- this.txt_salesOrderId.Size = new System.Drawing.Size(189, 28);
+ this.txt_salesOrderId.Size = new System.Drawing.Size(194, 28);
this.txt_salesOrderId.TabIndex = 0;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(903, 108);
+ this.txt_approvedDate.Location = new System.Drawing.Point(918, 111);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedDate.Size = new System.Drawing.Size(190, 28);
+ this.txt_approvedDate.Size = new System.Drawing.Size(196, 28);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -738,138 +799,138 @@
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(189, 28);
+ this.txt_id.Size = new System.Drawing.Size(194, 28);
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 210;
this.txt_id.Tag = "readonly";
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(903, 76);
+ this.txt_approvedBy.Location = new System.Drawing.Point(918, 78);
this.txt_approvedBy.Name = "txt_approvedBy";
this.txt_approvedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(190, 28);
+ this.txt_approvedBy.Size = new System.Drawing.Size(196, 28);
this.txt_approvedBy.StyleController = this.layoutMx1;
this.txt_approvedBy.TabIndex = 370;
this.txt_approvedBy.Tag = "readonly";
//
- // txt_salesOrg
+ // txt_xsOrgName
//
- this.txt_salesOrg.Location = new System.Drawing.Point(361, 12);
- this.txt_salesOrg.Name = "txt_salesOrg";
- this.txt_salesOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_salesOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_salesOrg.Size = new System.Drawing.Size(189, 28);
- this.txt_salesOrg.StyleController = this.layoutMx1;
- this.txt_salesOrg.TabIndex = 219;
- this.txt_salesOrg.Tag = "readonly";
+ this.txt_xsOrgName.Location = new System.Drawing.Point(366, 12);
+ this.txt_xsOrgName.Name = "txt_xsOrgName";
+ this.txt_xsOrgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
+ this.txt_xsOrgName.Size = new System.Drawing.Size(194, 28);
+ this.txt_xsOrgName.StyleController = this.layoutMx1;
+ this.txt_xsOrgName.TabIndex = 219;
+ this.txt_xsOrgName.Tag = "readonly";
//
// txt_inventoryOrg
//
- this.txt_inventoryOrg.Location = new System.Drawing.Point(632, 12);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(642, 12);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_inventoryOrg.Size = new System.Drawing.Size(189, 28);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(194, 28);
this.txt_inventoryOrg.StyleController = this.layoutMx1;
this.txt_inventoryOrg.TabIndex = 243;
this.txt_inventoryOrg.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(903, 44);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(918, 45);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedDate.Size = new System.Drawing.Size(190, 28);
+ this.txt_modifiedDate.Size = new System.Drawing.Size(196, 28);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(90, 44);
+ this.txt_billNo.Location = new System.Drawing.Point(90, 45);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(189, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(194, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
//
- // txt_salesPerson
+ // txt_salerName
//
- this.txt_salesPerson.Location = new System.Drawing.Point(361, 44);
- this.txt_salesPerson.Name = "txt_salesPerson";
- this.txt_salesPerson.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_salesPerson.Properties.Appearance.Options.UseFont = true;
- this.txt_salesPerson.Size = new System.Drawing.Size(189, 28);
- this.txt_salesPerson.StyleController = this.layoutMx1;
- this.txt_salesPerson.TabIndex = 267;
- this.txt_salesPerson.Tag = "readonly";
+ this.txt_salerName.Location = new System.Drawing.Point(366, 45);
+ this.txt_salerName.Name = "txt_salerName";
+ this.txt_salerName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_salerName.Properties.Appearance.Options.UseFont = true;
+ this.txt_salerName.Size = new System.Drawing.Size(194, 28);
+ this.txt_salerName.StyleController = this.layoutMx1;
+ this.txt_salerName.TabIndex = 267;
+ this.txt_salerName.Tag = "readonly";
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(903, 12);
+ this.txt_modifiedBy.Location = new System.Drawing.Point(918, 12);
this.txt_modifiedBy.Name = "txt_modifiedBy";
this.txt_modifiedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(190, 28);
+ this.txt_modifiedBy.Size = new System.Drawing.Size(196, 28);
this.txt_modifiedBy.StyleController = this.layoutMx1;
this.txt_modifiedBy.TabIndex = 327;
this.txt_modifiedBy.Tag = "readonly";
//
- // txt_salesDept
+ // txt_saleDeptName
//
- this.txt_salesDept.Location = new System.Drawing.Point(361, 76);
- this.txt_salesDept.Name = "txt_salesDept";
- this.txt_salesDept.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_salesDept.Properties.Appearance.Options.UseFont = true;
- this.txt_salesDept.Size = new System.Drawing.Size(189, 28);
- this.txt_salesDept.StyleController = this.layoutMx1;
- this.txt_salesDept.TabIndex = 222;
- this.txt_salesDept.Tag = "readonly";
+ this.txt_saleDeptName.Location = new System.Drawing.Point(366, 78);
+ this.txt_saleDeptName.Name = "txt_saleDeptName";
+ this.txt_saleDeptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_saleDeptName.Size = new System.Drawing.Size(194, 28);
+ this.txt_saleDeptName.StyleController = this.layoutMx1;
+ this.txt_saleDeptName.TabIndex = 222;
+ this.txt_saleDeptName.Tag = "readonly";
//
// txt_custName
//
- this.txt_custName.Location = new System.Drawing.Point(632, 44);
+ this.txt_custName.Location = new System.Drawing.Point(642, 45);
this.txt_custName.Name = "txt_custName";
this.txt_custName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_custName.Properties.Appearance.Options.UseFont = true;
- this.txt_custName.Size = new System.Drawing.Size(189, 28);
+ this.txt_custName.Size = new System.Drawing.Size(194, 28);
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 252;
this.txt_custName.Tag = "readonly";
//
// txt_createdDate
//
- this.txt_createdDate.Location = new System.Drawing.Point(632, 108);
+ this.txt_createdDate.Location = new System.Drawing.Point(642, 111);
this.txt_createdDate.Name = "txt_createdDate";
this.txt_createdDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createdDate.Size = new System.Drawing.Size(189, 28);
+ this.txt_createdDate.Size = new System.Drawing.Size(194, 28);
this.txt_createdDate.StyleController = this.layoutMx1;
this.txt_createdDate.TabIndex = 319;
this.txt_createdDate.Tag = "readonly";
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(90, 108);
+ this.txt_returnReason.Location = new System.Drawing.Point(90, 111);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(189, 28);
+ this.txt_returnReason.Size = new System.Drawing.Size(194, 28);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
// txt_createdBy
//
- this.txt_createdBy.Location = new System.Drawing.Point(632, 76);
+ this.txt_createdBy.Location = new System.Drawing.Point(642, 78);
this.txt_createdBy.Name = "txt_createdBy";
this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createdBy.Size = new System.Drawing.Size(189, 28);
+ this.txt_createdBy.Size = new System.Drawing.Size(194, 28);
this.txt_createdBy.StyleController = this.layoutMx1;
this.txt_createdBy.TabIndex = 312;
this.txt_createdBy.Tag = "readonly";
@@ -897,7 +958,8 @@
this.layoutControlItem16,
this.layoutControlItem17,
this.layoutControlItem18,
- this.layoutControlItem19});
+ this.layoutControlItem19,
+ this.layoutControlItem20});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -929,7 +991,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1105, 180);
+ this.Root.Size = new System.Drawing.Size(1126, 185);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -937,177 +999,177 @@
this.layoutControlItem1.Control = this.txt_id;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem1.Text = "涓婚敭GUID";
this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem2
//
- this.layoutControlItem2.Control = this.txt_salesOrg;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Control = this.txt_xsOrgName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem2.Text = "閿�鍞粍缁�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_inventoryOrg;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_billNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_salesOrderId;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem5.Text = "閿�鍞鍗�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_salesPerson;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem6.Control = this.txt_salerName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 33);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem6.Text = "閿�鍞憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_salesDept;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem7.Control = this.txt_saleDeptName;
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 66);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_custName;
- this.layoutControlItem8.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem8.Location = new System.Drawing.Point(552, 33);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem8.Text = "瀹㈡埛";
this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 99);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem9.Text = "閫�璐у師鍥�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 96);
+ this.layoutControlItem10.Location = new System.Drawing.Point(276, 99);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createdBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 66);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem11.Text = "鍒涘缓浜�";
this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createdDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem12.Location = new System.Drawing.Point(552, 99);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(278, 33);
this.layoutControlItem13.Text = "淇敼浜�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_modifiedDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(813, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(828, 33);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(278, 33);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 66);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 33);
this.layoutControlItem15.Text = "瀹℃牳浜�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem16.Location = new System.Drawing.Point(828, 99);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(278, 33);
this.layoutControlItem16.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem17.Location = new System.Drawing.Point(552, 132);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1115,11 +1177,11 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_wjStatus;
- this.layoutControlItem18.Location = new System.Drawing.Point(271, 128);
+ this.layoutControlItem18.Location = new System.Drawing.Point(276, 132);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 33);
this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
@@ -1127,14 +1189,24 @@
// layoutControlItem19
//
this.layoutControlItem19.Control = this.lbGuid;
- this.layoutControlItem19.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem19.Location = new System.Drawing.Point(828, 132);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(278, 33);
this.layoutControlItem19.Text = "lbGuid";
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem19.TextVisible = false;
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_fstockid;
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 132);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem20.Size = new System.Drawing.Size(276, 33);
+ this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(66, 18);
//
// tabMx
//
@@ -1142,7 +1214,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(1126, 398);
+ this.tabMx.Size = new System.Drawing.Size(1126, 373);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1153,7 +1225,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Controls.Add(this.panelMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 366);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 341);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -1167,7 +1239,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 264);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 239);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1190,6 +1262,8 @@
this.gvMx1returnType,
this.gvMx1inventoryUnit,
this.gridColumn12,
+ this.gridColumn21,
+ this.gridColumn22,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1233,7 +1307,8 @@
this.gridColumn8,
this.gridColumn9,
this.gridColumn10,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn23});
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1302,6 +1377,14 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 7;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "鐗╂枡ID";
+ this.gridColumn23.FieldName = "itemId";
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 8;
//
// gvMx1id
//
@@ -1485,10 +1568,9 @@
this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemComboBox1.Items.AddRange(new object[] {
- "杈呭姪璧勬枡(THLX01_SYS)",
- "閫�璐�(THLX02_SYS)",
- "閫�璐цˉ璐�(THLX03_SYS)",
- "浠呴��娆句笉閫�璐�()"});
+ "閫�璐�(THLX01_SYS)",
+ "閫�璐цˉ璐�(THLX02_SYS)",
+ "浠呴��娆句笉閫�璐�(THLX03_SYS)"});
this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
@@ -1514,6 +1596,26 @@
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Width = 94;
//
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鍙墦鍗版暟閲�";
+ this.gridColumn21.FieldName = "kdy";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 13;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn22.FieldName = "ydy";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.Width = 94;
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -1521,7 +1623,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 13;
+ this.gvMxDel.VisibleIndex = 15;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1565,6 +1667,7 @@
//
this.ucBtnPrint1.guidKey = null;
this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+ this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
@@ -1727,7 +1830,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 366);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 341);
this.tabMxPage2.Text = "鎵爜鏄庣粏";
//
// gcMx2
@@ -1738,7 +1841,7 @@
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit2});
- this.gcMx2.Size = new System.Drawing.Size(1124, 366);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 341);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1931,13 +2034,13 @@
((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_salesOrg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_salesPerson.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
@@ -1962,6 +2065,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2032,12 +2136,12 @@
private DevExpress.XtraEditors.TextEdit txt_modifiedBy;
private DevExpress.XtraEditors.TextEdit txt_createdDate;
private DevExpress.XtraEditors.TextEdit txt_createdBy;
- private DevExpress.XtraEditors.TextEdit txt_salesPerson;
+ private DevExpress.XtraEditors.TextEdit txt_salerName;
private DevExpress.XtraEditors.TextEdit txt_custName;
private DevExpress.XtraEditors.TextEdit txt_inventoryOrg;
private DevExpress.XtraEditors.TextEdit txt_returnReason;
- private DevExpress.XtraEditors.TextEdit txt_salesDept;
- private DevExpress.XtraEditors.TextEdit txt_salesOrg;
+ private DevExpress.XtraEditors.TextEdit txt_saleDeptName;
+ private DevExpress.XtraEditors.TextEdit txt_xsOrgName;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
@@ -2127,5 +2231,14 @@
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private UserControl.UcLookCk txt_fstockid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
}
}
\ No newline at end of file
--
Gitblit v1.9.3