From 91e22ded7e97d54830b8cb78e73b10ed219d3ca8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 28 三月 2025 13:30:25 +0800
Subject: [PATCH] 工序管理
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 525 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 313 insertions(+), 212 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..49a5767 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -29,25 +29,25 @@
/// </summary>
private void InitializeComponent()
{
- 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ 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.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -57,14 +57,13 @@
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();
this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_inventoryOrg = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createdDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_modifiedBy = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -72,10 +71,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 +88,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();
@@ -112,9 +116,8 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- 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 +133,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 +150,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();
@@ -182,6 +188,8 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -207,13 +215,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();
@@ -235,9 +243,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((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();
@@ -264,12 +271,15 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
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,21 +350,24 @@
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,
this.gv_returnReason,
- this.gv_inventoryOrg,
this.gv_createdBy,
this.gv_createdDate,
this.gv_modifiedBy,
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 +385,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 +394,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 +404,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 +444,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 +484,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,22 +498,8 @@
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
- //
- this.gv_inventoryOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_inventoryOrg.AppearanceCell.Options.UseFont = true;
- this.gv_inventoryOrg.Caption = "搴撳瓨缁勭粐 ";
- this.gv_inventoryOrg.FieldName = "inventoryOrg";
- this.gv_inventoryOrg.MinWidth = 50;
- this.gv_inventoryOrg.Name = "gv_inventoryOrg";
- 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.Width = 94;
//
// gv_createdBy
//
@@ -519,7 +512,7 @@
this.gv_createdBy.OptionsColumn.AllowEdit = false;
this.gv_createdBy.Tag = "query_a.CREATED_BY";
this.gv_createdBy.Visible = true;
- this.gv_createdBy.VisibleIndex = 11;
+ this.gv_createdBy.VisibleIndex = 10;
this.gv_createdBy.Width = 94;
//
// gv_createdDate
@@ -533,7 +526,7 @@
this.gv_createdDate.OptionsColumn.AllowEdit = false;
this.gv_createdDate.Tag = "query_a.CREATED_DATE";
this.gv_createdDate.Visible = true;
- this.gv_createdDate.VisibleIndex = 12;
+ this.gv_createdDate.VisibleIndex = 11;
this.gv_createdDate.Width = 94;
//
// gv_modifiedBy
@@ -547,7 +540,7 @@
this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
this.gv_modifiedBy.Visible = true;
- this.gv_modifiedBy.VisibleIndex = 13;
+ this.gv_modifiedBy.VisibleIndex = 12;
this.gv_modifiedBy.Width = 94;
//
// gv_modifiedDate
@@ -561,7 +554,7 @@
this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
this.gv_modifiedDate.Visible = true;
- this.gv_modifiedDate.VisibleIndex = 14;
+ this.gv_modifiedDate.VisibleIndex = 13;
this.gv_modifiedDate.Width = 94;
//
// gv_approvedBy
@@ -575,7 +568,7 @@
this.gv_approvedBy.OptionsColumn.AllowEdit = false;
this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
this.gv_approvedBy.Visible = true;
- this.gv_approvedBy.VisibleIndex = 15;
+ this.gv_approvedBy.VisibleIndex = 14;
this.gv_approvedBy.Width = 94;
//
// gv_approvedDate
@@ -589,7 +582,7 @@
this.gv_approvedDate.OptionsColumn.AllowEdit = false;
this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
this.gv_approvedDate.Visible = true;
- this.gv_approvedDate.VisibleIndex = 16;
+ this.gv_approvedDate.VisibleIndex = 15;
this.gv_approvedDate.Width = 94;
//
// gridColumn18
@@ -599,8 +592,50 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 17;
+ this.gridColumn18.VisibleIndex = 16;
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 = 17;
+ 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 = 18;
+ this.gridColumn26.Width = 94;
//
// pageBar1
//
@@ -638,11 +673,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 = 171;
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,29 +687,40 @@
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);
this.layoutMx1.Controls.Add(this.txt_createdBy);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem19});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
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, 171);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_fstockid
+ //
+ this.txt_fstockid.IsReadly = false;
+ this.txt_fstockid.Location = new System.Drawing.Point(90, 131);
+ this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_fstockid.Name = "txt_fstockid";
+ this.txt_fstockid.Size = new System.Drawing.Size(189, 28);
+ this.txt_fstockid.TabIndex = 454;
+ //
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 140);
+ this.lbGuid.Location = new System.Drawing.Point(825, 131);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(268, 28);
this.lbGuid.TabIndex = 1;
@@ -681,7 +728,7 @@
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(283, 140);
+ this.txt_wjStatus.Location = new System.Drawing.Point(554, 131);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
@@ -691,10 +738,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(554, 140);
+ this.txt_chkStatus.Location = new System.Drawing.Point(825, 131);
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(268, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -702,7 +749,7 @@
// 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(361, 99);
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)});
@@ -716,14 +763,14 @@
// 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, 67);
this.txt_salesOrderId.Name = "txt_salesOrderId";
this.txt_salesOrderId.Size = new System.Drawing.Size(189, 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(903, 99);
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;
@@ -734,7 +781,7 @@
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(90, 12);
+ this.txt_id.Location = new System.Drawing.Point(90, 3);
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;
@@ -745,7 +792,7 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(903, 76);
+ this.txt_approvedBy.Location = new System.Drawing.Point(903, 67);
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;
@@ -754,20 +801,20 @@
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(361, 3);
+ 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(189, 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(632, 3);
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;
@@ -778,7 +825,7 @@
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(903, 44);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(903, 35);
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;
@@ -789,7 +836,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(90, 44);
+ this.txt_billNo.Location = new System.Drawing.Point(90, 35);
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;
@@ -798,20 +845,20 @@
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(361, 35);
+ 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(189, 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(903, 3);
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;
@@ -820,20 +867,20 @@
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(361, 67);
+ 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(189, 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(632, 35);
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;
@@ -844,7 +891,7 @@
//
// txt_createdDate
//
- this.txt_createdDate.Location = new System.Drawing.Point(632, 108);
+ this.txt_createdDate.Location = new System.Drawing.Point(632, 99);
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;
@@ -855,7 +902,7 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(90, 108);
+ this.txt_returnReason.Location = new System.Drawing.Point(90, 99);
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;
@@ -865,7 +912,7 @@
//
// txt_createdBy
//
- this.txt_createdBy.Location = new System.Drawing.Point(632, 76);
+ this.txt_createdBy.Location = new System.Drawing.Point(632, 67);
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;
@@ -895,40 +942,40 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16,
+ this.layoutControlItem20,
this.layoutControlItem17,
- this.layoutControlItem18,
- this.layoutControlItem19});
+ this.layoutControlItem18});
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;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.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;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
this.Root.Size = new System.Drawing.Size(1105, 180);
this.Root.TextVisible = false;
//
@@ -943,7 +990,7 @@
//
// layoutControlItem2
//
- this.layoutControlItem2.Control = this.txt_salesOrg;
+ this.layoutControlItem2.Control = this.txt_xsOrgName;
this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -983,7 +1030,7 @@
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_salesPerson;
+ this.layoutControlItem6.Control = this.txt_salerName;
this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -994,7 +1041,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_salesDept;
+ this.layoutControlItem7.Control = this.txt_saleDeptName;
this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1011,7 +1058,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem8.Text = "瀹㈡埛";
+ this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem9
@@ -1097,32 +1144,8 @@
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem16.Text = "瀹℃牳鏃ユ湡";
+ 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.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_wjStatus;
- this.layoutControlItem18.Location = new System.Drawing.Point(271, 128);
- 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.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem18.TextVisible = false;
//
// layoutControlItem19
//
@@ -1136,13 +1159,23 @@
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, 128);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(66, 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(1126, 398);
+ this.tabMx.Size = new System.Drawing.Size(1126, 387);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1153,7 +1186,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, 355);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -1167,13 +1200,15 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 264);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 253);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn2,
this.gvMx1id,
@@ -1190,6 +1225,8 @@
this.gvMx1returnType,
this.gvMx1inventoryUnit,
this.gridColumn12,
+ this.gridColumn21,
+ this.gridColumn22,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1233,7 +1270,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 +1340,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 +1531,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 +1559,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,16 +1586,16 @@
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
//
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);
@@ -1564,10 +1629,11 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65);
+ 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);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(207, 31);
this.ucBtnPrint1.TabIndex = 230;
//
// lbMxGuid
@@ -1727,7 +1793,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, 355);
this.tabMxPage2.Text = "鎵爜鏄庣粏";
//
// gcMx2
@@ -1738,13 +1804,15 @@
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, 355);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn3,
this.gvMx1itemBarcode,
@@ -1878,10 +1946,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -1895,6 +1963,30 @@
this.picCheckBox.TabIndex = 451;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_chkStatus;
+ this.layoutControlItem17.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_wjStatus;
+ this.layoutControlItem18.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem18.TextVisible = false;
//
// Frm_SalesReturnNotice
//
@@ -1931,13 +2023,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();
@@ -1959,9 +2051,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((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);
@@ -1989,6 +2080,8 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
this.ResumeLayout(false);
}
@@ -2011,7 +2104,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_salesDept;
private DevExpress.XtraGrid.Columns.GridColumn gv_salesPerson;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
- private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryOrg;
private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createdDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedBy;
@@ -2032,12 +2124,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;
@@ -2058,8 +2150,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2127,5 +2217,16 @@
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;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ No newline at end of file
--
Gitblit v1.9.3