From d335694aeb978a14cb102c941b69a4129814ca26 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 02 三月 2025 17:26:54 +0800
Subject: [PATCH] 排布

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs |  619 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 407 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 4ca2da8..735bfb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -29,6 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
+            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();
@@ -78,6 +83,25 @@
             this.gridColumn12 = 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();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
+            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
+            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
+            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
+            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
             this.lb_billStatus = new DevExpress.XtraEditors.LabelControl();
             this.txt_billStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_billStatus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -183,32 +207,26 @@
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.panel1 = new System.Windows.Forms.Panel();
             this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_customerOrderNo = new Gs.DevApp.UserControl.UcLookSales();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
-            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
-            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
-            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
-            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
@@ -218,6 +236,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
+            this.panelMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
@@ -253,19 +281,13 @@
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
+            this.tabMxPage2.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
-            this.panelMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1erpHeadId
@@ -821,13 +843,201 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, 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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // panelMx1
+            // 
+            this.panelMx1.Controls.Add(this.ucBtnPrint1);
+            this.panelMx1.Controls.Add(this.lbMxGuid);
+            this.panelMx1.Controls.Add(this.txt_iCount_1);
+            this.panelMx1.Controls.Add(this.labelControl14);
+            this.panelMx1.Controls.Add(this.txt_psnQty_1);
+            this.panelMx1.Controls.Add(this.labelControl12);
+            this.panelMx1.Controls.Add(this.txtKdy);
+            this.panelMx1.Controls.Add(this.labelControl13);
+            this.panelMx1.Controls.Add(this.txtYdy);
+            this.panelMx1.Controls.Add(this.labelControl1);
+            this.panelMx1.Controls.Add(this.txtQuantity);
+            this.panelMx1.Controls.Add(this.labelControl10);
+            this.panelMx1.Controls.Add(this.txtWlgg);
+            this.panelMx1.Controls.Add(this.labelControl9);
+            this.panelMx1.Controls.Add(this.txtWlmc);
+            this.panelMx1.Controls.Add(this.labelControl8);
+            this.panelMx1.Controls.Add(this.txtWlid);
+            this.panelMx1.Controls.Add(this.labelControl7);
+            this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panelMx1.Location = new System.Drawing.Point(0, 0);
+            this.panelMx1.Name = "panelMx1";
+            this.panelMx1.Size = new System.Drawing.Size(1124, 102);
+            this.panelMx1.TabIndex = 3;
+            // 
+            // ucBtnPrint1
+            // 
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+            this.ucBtnPrint1.TabIndex = 230;
+            // 
+            // lbMxGuid
+            // 
+            this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
+            this.lbMxGuid.Name = "lbMxGuid";
+            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+            this.lbMxGuid.TabIndex = 229;
+            this.lbMxGuid.Text = "lbMxGuid";
+            this.lbMxGuid.Visible = false;
+            // 
+            // txt_iCount_1
+            // 
+            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
+            this.txt_iCount_1.Name = "txt_iCount_1";
+            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
+            this.txt_iCount_1.TabIndex = 228;
+            // 
+            // labelControl14
+            // 
+            this.labelControl14.Location = new System.Drawing.Point(543, 39);
+            this.labelControl14.Name = "labelControl14";
+            this.labelControl14.Size = new System.Drawing.Size(105, 18);
+            this.labelControl14.TabIndex = 227;
+            this.labelControl14.Text = "鎵撳嵃鏉$爜寮犳暟锛�";
+            // 
+            // txt_psnQty_1
+            // 
+            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
+            this.txt_psnQty_1.Name = "txt_psnQty_1";
+            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
+            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
+            this.txt_psnQty_1.TabIndex = 226;
+            // 
+            // labelControl12
+            // 
+            this.labelControl12.Location = new System.Drawing.Point(543, 9);
+            this.labelControl12.Name = "labelControl12";
+            this.labelControl12.Size = new System.Drawing.Size(105, 18);
+            this.labelControl12.TabIndex = 225;
+            this.labelControl12.Text = "姣忓紶鏉$爜鏁伴噺锛�";
+            // 
+            // txtKdy
+            // 
+            this.txtKdy.Location = new System.Drawing.Point(430, 65);
+            this.txtKdy.Name = "txtKdy";
+            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+            this.txtKdy.Properties.Appearance.Options.UseFont = true;
+            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
+            this.txtKdy.Properties.ReadOnly = true;
+            this.txtKdy.Size = new System.Drawing.Size(96, 28);
+            this.txtKdy.TabIndex = 224;
+            // 
+            // labelControl13
+            // 
+            this.labelControl13.Location = new System.Drawing.Point(346, 70);
+            this.labelControl13.Name = "labelControl13";
+            this.labelControl13.Size = new System.Drawing.Size(80, 18);
+            this.labelControl13.TabIndex = 223;
+            this.labelControl13.Text = "鍙墦鍗版�绘暟:";
+            // 
+            // txtYdy
+            // 
+            this.txtYdy.Location = new System.Drawing.Point(430, 34);
+            this.txtYdy.Name = "txtYdy";
+            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtYdy.Properties.Appearance.Options.UseFont = true;
+            this.txtYdy.Properties.ReadOnly = true;
+            this.txtYdy.Size = new System.Drawing.Size(96, 28);
+            this.txtYdy.TabIndex = 222;
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(346, 39);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(80, 18);
+            this.labelControl1.TabIndex = 221;
+            this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
+            // 
+            // txtQuantity
+            // 
+            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
+            this.txtQuantity.Name = "txtQuantity";
+            this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
+            this.txtQuantity.Properties.ReadOnly = true;
+            this.txtQuantity.Size = new System.Drawing.Size(96, 28);
+            this.txtQuantity.TabIndex = 220;
+            // 
+            // labelControl10
+            // 
+            this.labelControl10.Location = new System.Drawing.Point(331, 9);
+            this.labelControl10.Name = "labelControl10";
+            this.labelControl10.Size = new System.Drawing.Size(95, 18);
+            this.labelControl10.TabIndex = 219;
+            this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
+            // 
+            // txtWlgg
+            // 
+            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
+            this.txtWlgg.Name = "txtWlgg";
+            this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
+            this.txtWlgg.Properties.ReadOnly = true;
+            this.txtWlgg.Size = new System.Drawing.Size(236, 28);
+            this.txtWlgg.TabIndex = 218;
+            // 
+            // labelControl9
+            // 
+            this.labelControl9.Location = new System.Drawing.Point(20, 70);
+            this.labelControl9.Name = "labelControl9";
+            this.labelControl9.Size = new System.Drawing.Size(65, 18);
+            this.labelControl9.TabIndex = 217;
+            this.labelControl9.Text = "鐗╂枡瑙勬牸:";
+            // 
+            // txtWlmc
+            // 
+            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
+            this.txtWlmc.Name = "txtWlmc";
+            this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
+            this.txtWlmc.Properties.ReadOnly = true;
+            this.txtWlmc.Size = new System.Drawing.Size(236, 28);
+            this.txtWlmc.TabIndex = 216;
+            // 
+            // labelControl8
+            // 
+            this.labelControl8.Location = new System.Drawing.Point(20, 39);
+            this.labelControl8.Name = "labelControl8";
+            this.labelControl8.Size = new System.Drawing.Size(65, 18);
+            this.labelControl8.TabIndex = 215;
+            this.labelControl8.Text = "鐗╂枡鍚嶇О:";
+            // 
+            // txtWlid
+            // 
+            this.txtWlid.Location = new System.Drawing.Point(90, 4);
+            this.txtWlid.Name = "txtWlid";
+            this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtWlid.Properties.Appearance.Options.UseFont = true;
+            this.txtWlid.Properties.ReadOnly = true;
+            this.txtWlid.Size = new System.Drawing.Size(236, 28);
+            this.txtWlid.TabIndex = 214;
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Location = new System.Drawing.Point(20, 9);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(65, 18);
+            this.labelControl7.TabIndex = 213;
+            this.labelControl7.Text = "鐗╂枡缂栫爜:";
             // 
             // lb_billStatus
             // 
@@ -2065,6 +2275,13 @@
             this.tabMxPage1,
             this.tabMxPage2});
             // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 236);
+            this.tabMxPage2.Text = "鎵爜鏄庣粏";
+            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
@@ -2184,199 +2401,160 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // tabMxPage2
+            // gcMx2
             // 
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 236);
-            this.tabMxPage2.Text = "鎵爜鏄庣粏";
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit2});
+            this.gcMx2.Size = new System.Drawing.Size(1124, 236);
+            this.gcMx2.TabIndex = 3;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
             // 
-            // panelMx1
+            // gvMx2
             // 
-            this.panelMx1.Controls.Add(this.ucBtnPrint1);
-            this.panelMx1.Controls.Add(this.lbMxGuid);
-            this.panelMx1.Controls.Add(this.txt_iCount_1);
-            this.panelMx1.Controls.Add(this.labelControl14);
-            this.panelMx1.Controls.Add(this.txt_psnQty_1);
-            this.panelMx1.Controls.Add(this.labelControl12);
-            this.panelMx1.Controls.Add(this.txtKdy);
-            this.panelMx1.Controls.Add(this.labelControl13);
-            this.panelMx1.Controls.Add(this.txtYdy);
-            this.panelMx1.Controls.Add(this.labelControl1);
-            this.panelMx1.Controls.Add(this.txtQuantity);
-            this.panelMx1.Controls.Add(this.labelControl10);
-            this.panelMx1.Controls.Add(this.txtWlgg);
-            this.panelMx1.Controls.Add(this.labelControl9);
-            this.panelMx1.Controls.Add(this.txtWlmc);
-            this.panelMx1.Controls.Add(this.labelControl8);
-            this.panelMx1.Controls.Add(this.txtWlid);
-            this.panelMx1.Controls.Add(this.labelControl7);
-            this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelMx1.Location = new System.Drawing.Point(0, 0);
-            this.panelMx1.Name = "panelMx1";
-            this.panelMx1.Size = new System.Drawing.Size(1124, 102);
-            this.panelMx1.TabIndex = 3;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn3,
+            this.gvMx1itemBarcode,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gvMx1quantity,
+            this.gridColumn17,
+            this.gvMx1createBy,
+            this.gvMx1lotDate,
+            this.gvBtnAlawys});
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
-            // ucBtnPrint1
+            // gridColumn3
             // 
-            this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
-            this.ucBtnPrint1.Name = "ucBtnPrint1";
-            this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
-            this.ucBtnPrint1.TabIndex = 230;
+            this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gridColumn3.AppearanceCell.Options.UseFont = true;
+            this.gridColumn3.Caption = "guid";
+            this.gridColumn3.FieldName = "guid";
+            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Tag = "query_a.guid";
+            this.gridColumn3.Width = 94;
             // 
-            // lbMxGuid
+            // gvMx1itemBarcode
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
-            this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
-            this.lbMxGuid.TabIndex = 229;
-            this.lbMxGuid.Text = "lbMxGuid";
-            this.lbMxGuid.Visible = false;
+            this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx1itemBarcode.FieldName = "itemBarcode";
+            this.gvMx1itemBarcode.MinWidth = 25;
+            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx1itemBarcode.Visible = true;
+            this.gvMx1itemBarcode.VisibleIndex = 0;
+            this.gvMx1itemBarcode.Width = 300;
             // 
-            // txt_iCount_1
+            // gridColumn14
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_iCount_1.TabIndex = 228;
+            this.gridColumn14.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn14.FieldName = "itemNo";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 1;
+            this.gridColumn14.Width = 94;
             // 
-            // labelControl14
+            // gridColumn15
             // 
-            this.labelControl14.Location = new System.Drawing.Point(543, 39);
-            this.labelControl14.Name = "labelControl14";
-            this.labelControl14.Size = new System.Drawing.Size(105, 18);
-            this.labelControl14.TabIndex = 227;
-            this.labelControl14.Text = "鎵撳嵃鏉$爜寮犳暟锛�";
+            this.gridColumn15.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn15.FieldName = "itemName";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 2;
+            this.gridColumn15.Width = 94;
             // 
-            // txt_psnQty_1
+            // gridColumn16
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_psnQty_1.TabIndex = 226;
+            this.gridColumn16.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn16.FieldName = "itemModel";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 3;
+            this.gridColumn16.Width = 94;
             // 
-            // labelControl12
+            // gvMx1quantity
             // 
-            this.labelControl12.Location = new System.Drawing.Point(543, 9);
-            this.labelControl12.Name = "labelControl12";
-            this.labelControl12.Size = new System.Drawing.Size(105, 18);
-            this.labelControl12.TabIndex = 225;
-            this.labelControl12.Text = "姣忓紶鏉$爜鏁伴噺锛�";
+            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx1quantity.Caption = "鏁伴噺";
+            this.gvMx1quantity.FieldName = "quantity";
+            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.Name = "gvMx1quantity";
+            this.gvMx1quantity.Tag = "query_a.QUANTITY";
+            this.gvMx1quantity.Visible = true;
+            this.gvMx1quantity.VisibleIndex = 4;
+            this.gvMx1quantity.Width = 94;
             // 
-            // txtKdy
+            // gridColumn17
             // 
-            this.txtKdy.Location = new System.Drawing.Point(430, 65);
-            this.txtKdy.Name = "txtKdy";
-            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txtKdy.Properties.Appearance.Options.UseFont = true;
-            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
-            this.txtKdy.Properties.ReadOnly = true;
-            this.txtKdy.Size = new System.Drawing.Size(96, 28);
-            this.txtKdy.TabIndex = 224;
+            this.gridColumn17.Caption = "鍗曚綅";
+            this.gridColumn17.FieldName = "dwName";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 5;
+            this.gridColumn17.Width = 94;
             // 
-            // labelControl13
+            // gvMx1createBy
             // 
-            this.labelControl13.Location = new System.Drawing.Point(346, 70);
-            this.labelControl13.Name = "labelControl13";
-            this.labelControl13.Size = new System.Drawing.Size(80, 18);
-            this.labelControl13.TabIndex = 223;
-            this.labelControl13.Text = "鍙墦鍗版�绘暟:";
+            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createBy.Caption = "鍒涘缓浜�";
+            this.gvMx1createBy.FieldName = "createBy";
+            this.gvMx1createBy.MinWidth = 25;
+            this.gvMx1createBy.Name = "gvMx1createBy";
+            this.gvMx1createBy.Tag = "query_a.CREATE_BY";
+            this.gvMx1createBy.Visible = true;
+            this.gvMx1createBy.VisibleIndex = 6;
+            this.gvMx1createBy.Width = 94;
             // 
-            // txtYdy
+            // gvMx1lotDate
             // 
-            this.txtYdy.Location = new System.Drawing.Point(430, 34);
-            this.txtYdy.Name = "txtYdy";
-            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtYdy.Properties.Appearance.Options.UseFont = true;
-            this.txtYdy.Properties.ReadOnly = true;
-            this.txtYdy.Size = new System.Drawing.Size(96, 28);
-            this.txtYdy.TabIndex = 222;
+            this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
+            this.gvMx1lotDate.FieldName = "createDate";
+            this.gvMx1lotDate.MinWidth = 25;
+            this.gvMx1lotDate.Name = "gvMx1lotDate";
+            this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
+            this.gvMx1lotDate.Visible = true;
+            this.gvMx1lotDate.VisibleIndex = 7;
+            this.gvMx1lotDate.Width = 94;
             // 
-            // labelControl1
+            // gvBtnAlawys
             // 
-            this.labelControl1.Location = new System.Drawing.Point(346, 39);
-            this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(80, 18);
-            this.labelControl1.TabIndex = 221;
-            this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
+            this.gvBtnAlawys.Caption = "绉诲嚭";
+            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+            this.gvBtnAlawys.MinWidth = 25;
+            this.gvBtnAlawys.Name = "gvBtnAlawys";
+            this.gvBtnAlawys.Visible = true;
+            this.gvBtnAlawys.VisibleIndex = 8;
+            this.gvBtnAlawys.Width = 94;
             // 
-            // txtQuantity
+            // repositoryItemButtonEdit2
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(430, 4);
-            this.txtQuantity.Name = "txtQuantity";
-            this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
-            this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(96, 28);
-            this.txtQuantity.TabIndex = 220;
-            // 
-            // labelControl10
-            // 
-            this.labelControl10.Location = new System.Drawing.Point(331, 9);
-            this.labelControl10.Name = "labelControl10";
-            this.labelControl10.Size = new System.Drawing.Size(95, 18);
-            this.labelControl10.TabIndex = 219;
-            this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
-            // 
-            // txtWlgg
-            // 
-            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
-            this.txtWlgg.Name = "txtWlgg";
-            this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
-            this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(236, 28);
-            this.txtWlgg.TabIndex = 218;
-            // 
-            // labelControl9
-            // 
-            this.labelControl9.Location = new System.Drawing.Point(20, 70);
-            this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(65, 18);
-            this.labelControl9.TabIndex = 217;
-            this.labelControl9.Text = "鐗╂枡瑙勬牸:";
-            // 
-            // txtWlmc
-            // 
-            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
-            this.txtWlmc.Name = "txtWlmc";
-            this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
-            this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(236, 28);
-            this.txtWlmc.TabIndex = 216;
-            // 
-            // labelControl8
-            // 
-            this.labelControl8.Location = new System.Drawing.Point(20, 39);
-            this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(65, 18);
-            this.labelControl8.TabIndex = 215;
-            this.labelControl8.Text = "鐗╂枡鍚嶇О:";
-            // 
-            // txtWlid
-            // 
-            this.txtWlid.Location = new System.Drawing.Point(90, 4);
-            this.txtWlid.Name = "txtWlid";
-            this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtWlid.Properties.Appearance.Options.UseFont = true;
-            this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(236, 28);
-            this.txtWlid.TabIndex = 214;
-            // 
-            // labelControl7
-            // 
-            this.labelControl7.Location = new System.Drawing.Point(20, 9);
-            this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(65, 18);
-            this.labelControl7.TabIndex = 213;
-            this.labelControl7.Text = "鐗╂枡缂栫爜:";
+            this.repositoryItemButtonEdit2.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.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)});
+            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             // 
             // Frm_SalesReturnNotice
             // 
@@ -2397,6 +2575,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
+            this.panelMx1.ResumeLayout(false);
+            this.panelMx1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
@@ -2432,21 +2621,14 @@
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
+            this.tabMxPage2.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
-            this.panelMx1.ResumeLayout(false);
-            this.panelMx1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2656,5 +2838,18 @@
         private DevExpress.XtraEditors.LabelControl labelControl8;
         private DevExpress.XtraEditors.TextEdit txtWlid;
         private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3