From 1b799e1d64e6a2e151f52092542c6892ea858f0c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 09 五月 2025 13:13:56 +0800
Subject: [PATCH] 工序采集

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs |  598 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 322 insertions(+), 276 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 4338d41..a659d3a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -29,6 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -38,6 +39,7 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -66,7 +68,6 @@
             this.gv_caa016 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -81,12 +82,13 @@
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -111,6 +113,9 @@
             this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
             this.txt_caa005 = new DevExpress.XtraEditors.TextEdit();
             this.txt_srcBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_typebTxt = new DevExpress.XtraEditors.TextEdit();
+            this.txt_ypQty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kpQty = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -118,20 +123,23 @@
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_ypQty1111 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -161,6 +169,7 @@
             this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -199,6 +208,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_typebTxt.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ypQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kpQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -206,20 +218,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ypQty1111)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -238,7 +253,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1285, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -249,7 +264,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1285, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -259,12 +274,13 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1283, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -273,18 +289,22 @@
             // 
             this.split1.Panel1.Controls.Add(this.gcMain1);
             this.split1.Panel1.Controls.Add(this.pageBar1);
-            this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 545;
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1283, 570);
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 4;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 506);
+            this.gcMain1.Size = new System.Drawing.Size(1283, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -293,7 +313,6 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -319,7 +338,6 @@
             this.gv_caa016,
             this.gridColumn7,
             this.gridColumn4,
-            this.gv_createDate,
             this.gridColumn18,
             this.gridColumn19,
             this.gridColumn20,
@@ -334,12 +352,13 @@
             this.gridColumn31,
             this.gridColumn32,
             this.gridColumn33,
-            this.gridColumn34,
             this.gridColumn35,
             this.gridColumn36,
             this.gridColumn37,
             this.gridColumn38,
-            this.gridColumn39});
+            this.gridColumn39,
+            this.gridColumn30,
+            this.gridColumn34});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -372,7 +391,6 @@
             // 
             // gv_caa001
             // 
-            this.gv_caa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa001.AppearanceCell.Options.UseFont = true;
             this.gv_caa001.Caption = "鎶曟枡鍗曞彿";
             this.gv_caa001.FieldName = "caa001";
@@ -408,7 +426,6 @@
             // 
             // gv_caa020
             // 
-            this.gv_caa020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa020.AppearanceCell.Options.UseFont = true;
             this.gv_caa020.Caption = "浠诲姟鍗曞彿";
             this.gv_caa020.FieldName = "caa020";
@@ -422,7 +439,6 @@
             // 
             // gv_caa006
             // 
-            this.gv_caa006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa006.AppearanceCell.Options.UseFont = true;
             this.gv_caa006.Caption = "浜у搧缂栫爜";
             this.gv_caa006.FieldName = "itemNo";
@@ -447,7 +463,6 @@
             // 
             // gv_caa021
             // 
-            this.gv_caa021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa021.AppearanceCell.Options.UseFont = true;
             this.gv_caa021.Caption = "鐢熶骇杞﹂棿";
             this.gv_caa021.FieldName = "sccj";
@@ -461,7 +476,6 @@
             // 
             // gv_caa012
             // 
-            this.gv_caa012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa012.AppearanceCell.Options.UseFont = true;
             this.gv_caa012.Caption = "鎬绘暟";
             this.gv_caa012.FieldName = "caa012";
@@ -475,7 +489,6 @@
             // 
             // gv_caa009
             // 
-            this.gv_caa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa009.AppearanceCell.Options.UseFont = true;
             this.gv_caa009.Caption = "鍗曚綅";
             this.gv_caa009.FieldName = "fname";
@@ -489,7 +502,6 @@
             // 
             // gv_caa024
             // 
-            this.gv_caa024.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa024.AppearanceCell.Options.UseFont = true;
             this.gv_caa024.Caption = "宸插叆搴撴暟";
             this.gv_caa024.FieldName = "rkqty";
@@ -504,7 +516,6 @@
             // 
             // gv_caa010
             // 
-            this.gv_caa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa010.AppearanceCell.Options.UseFont = true;
             this.gv_caa010.Caption = "棰勮寮�宸ユ椂闂�";
             this.gv_caa010.FieldName = "caa010";
@@ -518,7 +529,6 @@
             // 
             // gv_caa011
             // 
-            this.gv_caa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa011.AppearanceCell.Options.UseFont = true;
             this.gv_caa011.Caption = "棰勮瀹屽伐鏃堕棿";
             this.gv_caa011.FieldName = "caa011";
@@ -532,7 +542,6 @@
             // 
             // gv_saleOrderNo
             // 
-            this.gv_saleOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_saleOrderNo.AppearanceCell.Options.UseFont = true;
             this.gv_saleOrderNo.Caption = "闇�姹傚崟鎹彿";
             this.gv_saleOrderNo.FieldName = "saleOrderNo";
@@ -546,7 +555,6 @@
             // 
             // gv_saleOrderEntryseq
             // 
-            this.gv_saleOrderEntryseq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_saleOrderEntryseq.AppearanceCell.Options.UseFont = true;
             this.gv_saleOrderEntryseq.Caption = "闇�姹傚崟鎹鍙�";
             this.gv_saleOrderEntryseq.FieldName = "saleOrderEntryseq";
@@ -572,7 +580,6 @@
             // 
             // gv_forceCloserid
             // 
-            this.gv_forceCloserid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_forceCloserid.AppearanceCell.Options.UseFont = true;
             this.gv_forceCloserid.Caption = "缁撴浜�";
             this.gv_forceCloserid.FieldName = "forceCloserid";
@@ -586,7 +593,6 @@
             // 
             // gv_closeType
             // 
-            this.gv_closeType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_closeType.AppearanceCell.Options.UseFont = true;
             this.gv_closeType.Caption = "缁撴绫诲瀷";
             this.gv_closeType.FieldName = "closeType";
@@ -600,7 +606,6 @@
             // 
             // gv_caa016
             // 
-            this.gv_caa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa016.AppearanceCell.Options.UseFont = true;
             this.gv_caa016.Caption = "澶囨敞";
             this.gv_caa016.FieldName = "caa016";
@@ -634,20 +639,6 @@
             this.gridColumn4.VisibleIndex = 21;
             this.gridColumn4.Width = 50;
             // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍚屾鏃堕棿";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.CAA005";
-            this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 22;
-            this.gv_createDate.Width = 180;
-            // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "宸ヨ壓璺嚎";
@@ -655,7 +646,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 23;
+            this.gridColumn18.VisibleIndex = 22;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -665,7 +656,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 24;
+            this.gridColumn19.VisibleIndex = 23;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn20
@@ -675,7 +666,7 @@
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 25;
+            this.gridColumn20.VisibleIndex = 24;
             this.gridColumn20.Width = 94;
             // 
             // gridColumn21
@@ -685,7 +676,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 26;
+            this.gridColumn21.VisibleIndex = 25;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -695,7 +686,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 27;
+            this.gridColumn22.VisibleIndex = 26;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -705,7 +696,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 28;
+            this.gridColumn23.VisibleIndex = 27;
             this.gridColumn23.Width = 94;
             // 
             // gridColumn24
@@ -715,7 +706,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 29;
+            this.gridColumn24.VisibleIndex = 28;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -725,7 +716,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 30;
+            this.gridColumn25.VisibleIndex = 29;
             this.gridColumn25.Width = 94;
             // 
             // gridColumn26
@@ -735,7 +726,7 @@
             this.gridColumn26.MinWidth = 25;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 31;
+            this.gridColumn26.VisibleIndex = 30;
             this.gridColumn26.Width = 94;
             // 
             // gridColumn27
@@ -745,7 +736,7 @@
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 32;
+            this.gridColumn27.VisibleIndex = 31;
             this.gridColumn27.Width = 94;
             // 
             // gridColumn28
@@ -755,7 +746,7 @@
             this.gridColumn28.MinWidth = 25;
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.Visible = true;
-            this.gridColumn28.VisibleIndex = 33;
+            this.gridColumn28.VisibleIndex = 32;
             this.gridColumn28.Width = 94;
             // 
             // gridColumn31
@@ -765,7 +756,7 @@
             this.gridColumn31.MinWidth = 25;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 34;
+            this.gridColumn31.VisibleIndex = 33;
             this.gridColumn31.Width = 94;
             // 
             // gridColumn32
@@ -775,7 +766,7 @@
             this.gridColumn32.MinWidth = 25;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 35;
+            this.gridColumn32.VisibleIndex = 34;
             this.gridColumn32.Width = 94;
             // 
             // gridColumn33
@@ -785,18 +776,8 @@
             this.gridColumn33.MinWidth = 25;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 36;
+            this.gridColumn33.VisibleIndex = 35;
             this.gridColumn33.Width = 94;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "ERP鐢熶骇璁㈠崟鍗曞彿";
-            this.gridColumn34.FieldName = "caa020";
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 37;
-            this.gridColumn34.Width = 94;
             // 
             // gridColumn35
             // 
@@ -805,7 +786,7 @@
             this.gridColumn35.MinWidth = 25;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 38;
+            this.gridColumn35.VisibleIndex = 36;
             this.gridColumn35.Width = 94;
             // 
             // gridColumn36
@@ -815,7 +796,7 @@
             this.gridColumn36.MinWidth = 25;
             this.gridColumn36.Name = "gridColumn36";
             this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 40;
+            this.gridColumn36.VisibleIndex = 38;
             this.gridColumn36.Width = 94;
             // 
             // gridColumn37
@@ -825,7 +806,7 @@
             this.gridColumn37.MinWidth = 25;
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.Visible = true;
-            this.gridColumn37.VisibleIndex = 39;
+            this.gridColumn37.VisibleIndex = 37;
             this.gridColumn37.Width = 94;
             // 
             // gridColumn38
@@ -835,7 +816,7 @@
             this.gridColumn38.MinWidth = 25;
             this.gridColumn38.Name = "gridColumn38";
             this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 41;
+            this.gridColumn38.VisibleIndex = 39;
             this.gridColumn38.Width = 94;
             // 
             // gridColumn39
@@ -845,18 +826,36 @@
             this.gridColumn39.MinWidth = 25;
             this.gridColumn39.Name = "gridColumn39";
             this.gridColumn39.Visible = true;
-            this.gridColumn39.VisibleIndex = 42;
+            this.gridColumn39.VisibleIndex = 40;
             this.gridColumn39.Width = 94;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "鍚屾鏃堕棿";
+            this.gridColumn30.FieldName = "tbDate";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 41;
+            this.gridColumn30.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "涓婚敭Guid";
+            this.gridColumn34.FieldName = "guid";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 506);
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1283, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -864,7 +863,7 @@
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1283, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -883,8 +882,9 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 178;
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1283, 570);
+            this.splitMx1.SplitterPosition = 201;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -909,6 +909,9 @@
             this.layoutMx1.Controls.Add(this.txt_dwName);
             this.layoutMx1.Controls.Add(this.txt_caa005);
             this.layoutMx1.Controls.Add(this.txt_srcBillNo);
+            this.layoutMx1.Controls.Add(this.txt_typebTxt);
+            this.layoutMx1.Controls.Add(this.txt_ypQty);
+            this.layoutMx1.Controls.Add(this.txt_kpQty);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem19});
@@ -916,7 +919,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 178);
+            this.layoutMx1.Size = new System.Drawing.Size(1283, 201);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -930,51 +933,46 @@
             // 
             // txt_wtOrg
             // 
-            this.txt_wtOrg.Location = new System.Drawing.Point(927, 140);
+            this.txt_wtOrg.Location = new System.Drawing.Point(1061, 132);
             this.txt_wtOrg.Name = "txt_wtOrg";
-            this.txt_wtOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_wtOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_wtOrg.Size = new System.Drawing.Size(166, 28);
+            this.txt_wtOrg.Size = new System.Drawing.Size(210, 24);
             this.txt_wtOrg.StyleController = this.layoutMx1;
             this.txt_wtOrg.TabIndex = 465;
             // 
             // txt_scOrg
             // 
-            this.txt_scOrg.Location = new System.Drawing.Point(927, 108);
+            this.txt_scOrg.Location = new System.Drawing.Point(1061, 102);
             this.txt_scOrg.Name = "txt_scOrg";
-            this.txt_scOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_scOrg.Size = new System.Drawing.Size(166, 28);
+            this.txt_scOrg.Size = new System.Drawing.Size(210, 24);
             this.txt_scOrg.StyleController = this.layoutMx1;
             this.txt_scOrg.TabIndex = 463;
             // 
             // txt_caa016
             // 
-            this.txt_caa016.Location = new System.Drawing.Point(114, 140);
+            this.txt_caa016.Location = new System.Drawing.Point(114, 162);
             this.txt_caa016.Name = "txt_caa016";
-            this.txt_caa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa016.Size = new System.Drawing.Size(436, 28);
+            this.txt_caa016.Size = new System.Drawing.Size(525, 24);
             this.txt_caa016.StyleController = this.layoutMx1;
             this.txt_caa016.TabIndex = 243;
             // 
             // txt_djlx
             // 
-            this.txt_djlx.Location = new System.Drawing.Point(656, 76);
+            this.txt_djlx.Location = new System.Drawing.Point(745, 102);
             this.txt_djlx.Name = "txt_djlx";
-            this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_djlx.Properties.Appearance.Options.UseFont = true;
-            this.txt_djlx.Size = new System.Drawing.Size(165, 28);
+            this.txt_djlx.Size = new System.Drawing.Size(210, 24);
             this.txt_djlx.StyleController = this.layoutMx1;
             this.txt_djlx.TabIndex = 461;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(656, 140);
+            this.txt_itemModel.Location = new System.Drawing.Point(114, 132);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(165, 28);
+            this.txt_itemModel.Size = new System.Drawing.Size(209, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 459;
             // 
@@ -982,139 +980,150 @@
             // 
             this.txt_caa001.Location = new System.Drawing.Point(114, 12);
             this.txt_caa001.Name = "txt_caa001";
-            this.txt_caa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa001.Size = new System.Drawing.Size(165, 28);
+            this.txt_caa001.Size = new System.Drawing.Size(209, 24);
             this.txt_caa001.StyleController = this.layoutMx1;
             this.txt_caa001.TabIndex = 213;
             // 
             // txt_caa012
             // 
-            this.txt_caa012.Location = new System.Drawing.Point(385, 12);
+            this.txt_caa012.Location = new System.Drawing.Point(429, 12);
             this.txt_caa012.Name = "txt_caa012";
-            this.txt_caa012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa012.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa012.Size = new System.Drawing.Size(165, 28);
+            this.txt_caa012.Size = new System.Drawing.Size(210, 24);
             this.txt_caa012.StyleController = this.layoutMx1;
             this.txt_caa012.TabIndex = 231;
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(385, 108);
+            this.txt_itemName.Location = new System.Drawing.Point(429, 132);
             this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(165, 28);
+            this.txt_itemName.Size = new System.Drawing.Size(210, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 457;
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(656, 12);
+            this.txt_dptName.Location = new System.Drawing.Point(745, 12);
             this.txt_dptName.Name = "txt_dptName";
-            this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(165, 28);
+            this.txt_dptName.Size = new System.Drawing.Size(210, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 451;
             // 
             // txt_caa010
             // 
-            this.txt_caa010.Location = new System.Drawing.Point(927, 12);
+            this.txt_caa010.Location = new System.Drawing.Point(1061, 12);
             this.txt_caa010.Name = "txt_caa010";
-            this.txt_caa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa010.Size = new System.Drawing.Size(166, 28);
+            this.txt_caa010.Size = new System.Drawing.Size(210, 24);
             this.txt_caa010.StyleController = this.layoutMx1;
             this.txt_caa010.TabIndex = 226;
             // 
             // txt_caa020
             // 
-            this.txt_caa020.Location = new System.Drawing.Point(114, 44);
+            this.txt_caa020.Location = new System.Drawing.Point(114, 42);
             this.txt_caa020.Name = "txt_caa020";
-            this.txt_caa020.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa020.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa020.Size = new System.Drawing.Size(165, 28);
+            this.txt_caa020.Size = new System.Drawing.Size(209, 24);
             this.txt_caa020.StyleController = this.layoutMx1;
             this.txt_caa020.TabIndex = 262;
             // 
             // txt_caa024
             // 
-            this.txt_caa024.Location = new System.Drawing.Point(385, 44);
+            this.txt_caa024.Location = new System.Drawing.Point(745, 162);
             this.txt_caa024.Name = "txt_caa024";
-            this.txt_caa024.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa024.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa024.Size = new System.Drawing.Size(165, 28);
+            this.txt_caa024.Size = new System.Drawing.Size(210, 24);
             this.txt_caa024.StyleController = this.layoutMx1;
             this.txt_caa024.TabIndex = 370;
             // 
             // txt_gdzt
             // 
-            this.txt_gdzt.Location = new System.Drawing.Point(656, 44);
+            this.txt_gdzt.Location = new System.Drawing.Point(745, 42);
             this.txt_gdzt.Name = "txt_gdzt";
-            this.txt_gdzt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
-            this.txt_gdzt.Size = new System.Drawing.Size(165, 28);
+            this.txt_gdzt.Size = new System.Drawing.Size(210, 24);
             this.txt_gdzt.StyleController = this.layoutMx1;
             this.txt_gdzt.TabIndex = 455;
             // 
             // txt_caa011
             // 
-            this.txt_caa011.Location = new System.Drawing.Point(927, 44);
+            this.txt_caa011.Location = new System.Drawing.Point(1061, 42);
             this.txt_caa011.Name = "txt_caa011";
-            this.txt_caa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa011.Size = new System.Drawing.Size(166, 28);
+            this.txt_caa011.Size = new System.Drawing.Size(210, 24);
             this.txt_caa011.StyleController = this.layoutMx1;
             this.txt_caa011.TabIndex = 228;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(114, 108);
+            this.txt_itemNo.Location = new System.Drawing.Point(114, 102);
             this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(209, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 219;
             // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 76);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 72);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
-            this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 28);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(209, 24);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 450;
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(385, 76);
+            this.txt_dwName.Location = new System.Drawing.Point(429, 102);
             this.txt_dwName.Name = "txt_dwName";
-            this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(165, 28);
+            this.txt_dwName.Size = new System.Drawing.Size(210, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 222;
             // 
             // txt_caa005
             // 
-            this.txt_caa005.Location = new System.Drawing.Point(927, 76);
+            this.txt_caa005.Location = new System.Drawing.Point(1061, 72);
             this.txt_caa005.Name = "txt_caa005";
-            this.txt_caa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_caa005.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa005.Size = new System.Drawing.Size(166, 28);
+            this.txt_caa005.Size = new System.Drawing.Size(210, 24);
             this.txt_caa005.StyleController = this.layoutMx1;
             this.txt_caa005.TabIndex = 217;
             // 
             // txt_srcBillNo
             // 
-            this.txt_srcBillNo.Location = new System.Drawing.Point(656, 108);
+            this.txt_srcBillNo.Location = new System.Drawing.Point(745, 132);
             this.txt_srcBillNo.Name = "txt_srcBillNo";
-            this.txt_srcBillNo.Size = new System.Drawing.Size(165, 24);
+            this.txt_srcBillNo.Size = new System.Drawing.Size(210, 24);
             this.txt_srcBillNo.StyleController = this.layoutMx1;
             this.txt_srcBillNo.TabIndex = 467;
+            // 
+            // txt_typebTxt
+            // 
+            this.txt_typebTxt.Location = new System.Drawing.Point(745, 72);
+            this.txt_typebTxt.Name = "txt_typebTxt";
+            this.txt_typebTxt.Size = new System.Drawing.Size(210, 24);
+            this.txt_typebTxt.StyleController = this.layoutMx1;
+            this.txt_typebTxt.TabIndex = 468;
+            // 
+            // txt_ypQty
+            // 
+            this.txt_ypQty.Location = new System.Drawing.Point(429, 42);
+            this.txt_ypQty.Name = "txt_ypQty";
+            this.txt_ypQty.Size = new System.Drawing.Size(210, 24);
+            this.txt_ypQty.StyleController = this.layoutMx1;
+            this.txt_ypQty.TabIndex = 469;
+            // 
+            // txt_kpQty
+            // 
+            this.txt_kpQty.Location = new System.Drawing.Point(429, 72);
+            this.txt_kpQty.Name = "txt_kpQty";
+            this.txt_kpQty.Size = new System.Drawing.Size(210, 24);
+            this.txt_kpQty.StyleController = this.layoutMx1;
+            this.txt_kpQty.TabIndex = 470;
             // 
             // layoutControlItem19
             // 
@@ -1138,20 +1147,23 @@
             this.layoutControlItem3,
             this.layoutControlItem4,
             this.layoutControlItem5,
-            this.layoutControlItem6,
             this.layoutControlItem7,
             this.layoutControlItem8,
             this.layoutControlItem9,
-            this.layoutControlItem10,
-            this.layoutControlItem11,
             this.layoutControlItem12,
             this.layoutControlItem13,
-            this.layoutControlItem14,
             this.layoutControlItem16,
-            this.layoutControlItem17,
             this.layoutControlItem18,
+            this.layoutControlItem17,
+            this.layoutControlItem15,
             this.layoutControlItem20,
-            this.layoutControlItem15});
+            this.layoutControlItem11,
+            this.layoutControlItem21,
+            this.layoutControlItem14,
+            this.layoutControlItem10,
+            this.layoutControlItem6,
+            this.txt_ypQty1111,
+            this.layoutControlItem22});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1177,13 +1189,16 @@
             rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition5.Height = 100D;
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
             rowDefinition3,
             rowDefinition4,
-            rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1105, 180);
+            rowDefinition5,
+            rowDefinition6});
+            this.Root.Size = new System.Drawing.Size(1283, 201);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1191,201 +1206,234 @@
             this.layoutControlItem1.Control = this.txt_caa001;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(315, 30);
             this.layoutControlItem1.Text = "鎶曟枡鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_caa012;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(315, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem2.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_dptName;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(631, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem3.Text = "鐢熶骇杞﹂棿";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_caa010;
-            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(947, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_caa020;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(315, 30);
             this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_caa024;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem6.Text = "鍏ュ簱鏁伴噺";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_gdzt;
-            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem7.CustomizationFormText = "涓氬姟鐘舵��";
+            this.layoutControlItem7.Location = new System.Drawing.Point(631, 30);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem7.Text = "宸ュ崟鐘舵��";
+            this.layoutControlItem7.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem7.Text = "涓氬姟鐘舵��";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_caa011;
-            this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(947, 30);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(315, 30);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_dwName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem10.Text = "鍗曚綅";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_djlx;
-            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_caa005;
-            this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem12.Location = new System.Drawing.Point(947, 60);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem12.Text = "璁″垝涓嬭揪鏃堕棿";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_itemNo;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 90);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(315, 30);
             this.layoutControlItem13.Text = "浜у搧缂栫爜";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_itemName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(271, 96);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem14.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_scOrg;
-            this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem16.Location = new System.Drawing.Point(947, 90);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem16.Text = "鐢熶骇缁勭粐";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_caa016;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(542, 32);
-            this.layoutControlItem17.Text = "澶囨敞";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_wtOrg;
-            this.layoutControlItem18.Location = new System.Drawing.Point(813, 128);
+            this.layoutControlItem18.Location = new System.Drawing.Point(947, 120);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem18.Size = new System.Drawing.Size(316, 30);
             this.layoutControlItem18.Text = "濮旀墭缁勭粐";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem20
+            // layoutControlItem17
             // 
-            this.layoutControlItem20.Control = this.txt_srcBillNo;
-            this.layoutControlItem20.Location = new System.Drawing.Point(542, 96);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem20.Text = "婧愬崟绫诲瀷";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem17.Control = this.txt_caa016;
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 150);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem17.Size = new System.Drawing.Size(631, 31);
+            this.layoutControlItem17.Text = "澶囨敞";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_itemModel;
-            this.layoutControlItem15.Location = new System.Drawing.Point(542, 128);
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 120);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(315, 30);
             this.layoutControlItem15.Text = "浜у搧瑙勬牸";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_srcBillNo;
+            this.layoutControlItem20.Location = new System.Drawing.Point(631, 120);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem20.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem20.Text = "婧愬崟绫诲瀷";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_djlx;
+            this.layoutControlItem11.Location = new System.Drawing.Point(631, 90);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem11.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_typebTxt;
+            this.layoutControlItem21.Location = new System.Drawing.Point(631, 60);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem21.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem21.Text = "鐢ㄦ枡娓呭崟";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_itemName;
+            this.layoutControlItem14.Location = new System.Drawing.Point(315, 120);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem14.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem14.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_dwName;
+            this.layoutControlItem10.Location = new System.Drawing.Point(315, 90);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem10.Text = "鍗曚綅";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_caa024;
+            this.layoutControlItem6.Location = new System.Drawing.Point(631, 150);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem6.Size = new System.Drawing.Size(316, 31);
+            this.layoutControlItem6.Text = "鍏ュ簱鏁伴噺";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // txt_ypQty1111
+            // 
+            this.txt_ypQty1111.Control = this.txt_ypQty;
+            this.txt_ypQty1111.Location = new System.Drawing.Point(315, 30);
+            this.txt_ypQty1111.Name = "txt_ypQty1111";
+            this.txt_ypQty1111.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.txt_ypQty1111.OptionsTableLayoutItem.RowIndex = 1;
+            this.txt_ypQty1111.Size = new System.Drawing.Size(316, 30);
+            this.txt_ypQty1111.Text = "宸叉帓鏁伴噺";
+            this.txt_ypQty1111.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_kpQty;
+            this.layoutControlItem22.Location = new System.Drawing.Point(315, 60);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem22.Size = new System.Drawing.Size(316, 30);
+            this.layoutControlItem22.Text = "鍙帓鏁伴噺";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1393,7 +1441,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 380);
+            this.tabMx.Size = new System.Drawing.Size(1283, 357);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1402,7 +1450,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 348);
+            this.tabMxPage1.Size = new System.Drawing.Size(1281, 325);
             this.tabMxPage1.Text = "鏄庣粏";
             // 
             // gcMx1
@@ -1411,7 +1459,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 348);
+            this.gcMx1.Size = new System.Drawing.Size(1281, 325);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1453,7 +1501,6 @@
             // 
             // gvMx1guid
             // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid";
             this.gvMx1guid.FieldName = "guid";
@@ -1464,7 +1511,6 @@
             // 
             // gvMx1cab002
             // 
-            this.gvMx1cab002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab002.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab002.Caption = "搴忓彿";
             this.gvMx1cab002.FieldName = "cab002";
@@ -1487,7 +1533,6 @@
             // 
             // gvMx1cab003
             // 
-            this.gvMx1cab003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab003.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab003.Caption = "鏉愭枡缂栫爜";
             this.gvMx1cab003.FieldName = "wlbm";
@@ -1520,7 +1565,6 @@
             // 
             // gvMx1cab012
             // 
-            this.gvMx1cab012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab012.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab012.Caption = "缁勬垚鐢ㄩ噺";
             this.gvMx1cab012.FieldName = "cab012";
@@ -1533,7 +1577,6 @@
             // 
             // gvMx1cab006
             // 
-            this.gvMx1cab006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab006.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab006.Caption = "闇�棰嗙敤閲�";
             this.gvMx1cab006.FieldName = "cab006";
@@ -1546,7 +1589,6 @@
             // 
             // gvMx1cab009
             // 
-            this.gvMx1cab009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab009.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab009.Caption = "鍗曚綅";
             this.gvMx1cab009.FieldName = "dwName";
@@ -1559,7 +1601,6 @@
             // 
             // gvMx1cab007
             // 
-            this.gvMx1cab007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab007.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab007.Caption = "宸查鐢ㄩ噺";
             this.gvMx1cab007.FieldName = "cab007";
@@ -1572,7 +1613,6 @@
             // 
             // gvMx1cab014
             // 
-            this.gvMx1cab014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab014.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab014.Caption = "鏇挎枡鏍囪瘑";
             this.gvMx1cab014.FieldName = "cab014Chk";
@@ -1615,7 +1655,6 @@
             // 
             // gvMx1mtono
             // 
-            this.gvMx1mtono.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1mtono.AppearanceCell.Options.UseFont = true;
             this.gvMx1mtono.Caption = "璁″垝璺熻釜鍙�";
             this.gvMx1mtono.FieldName = "mtono";
@@ -1628,7 +1667,6 @@
             // 
             // gvMx1numerator
             // 
-            this.gvMx1numerator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1numerator.AppearanceCell.Options.UseFont = true;
             this.gvMx1numerator.Caption = "鍒嗗瓙";
             this.gvMx1numerator.FieldName = "numerator";
@@ -1641,7 +1679,6 @@
             // 
             // gvMx1denominator
             // 
-            this.gvMx1denominator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1denominator.AppearanceCell.Options.UseFont = true;
             this.gvMx1denominator.Caption = "鍒嗘瘝";
             this.gvMx1denominator.FieldName = "denominator";
@@ -1654,7 +1691,6 @@
             // 
             // gvMx1depotCode
             // 
-            this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
             this.gvMx1depotCode.FieldName = "dptCode";
@@ -1677,7 +1713,6 @@
             // 
             // gvMx1issueType
             // 
-            this.gvMx1issueType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1issueType.AppearanceCell.Options.UseFont = true;
             this.gvMx1issueType.Caption = "鍙戞枡鏂瑰紡";
             this.gvMx1issueType.FieldName = "issueType";
@@ -1700,7 +1735,6 @@
             // 
             // gvMx1scraprate
             // 
-            this.gvMx1scraprate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1scraprate.AppearanceCell.Options.UseFont = true;
             this.gvMx1scraprate.Caption = "鍙樺姩鎹熻�楃巼";
             this.gvMx1scraprate.FieldName = "scraprate";
@@ -1713,7 +1747,6 @@
             // 
             // gvMx1scrapqty
             // 
-            this.gvMx1scrapqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1scrapqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1scrapqty.Caption = "鍥哄畾鎹熻��";
             this.gvMx1scrapqty.FieldName = "scrapqty";
@@ -1748,7 +1781,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1285, 682);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_Womcaa";
@@ -1791,6 +1824,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_typebTxt.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ypQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kpQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1798,20 +1834,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ypQty1111)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1849,7 +1888,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa016;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
@@ -1864,7 +1902,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
@@ -1898,18 +1935,13 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         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;
@@ -1941,8 +1973,22 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1scrapqty;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private DevExpress.XtraEditors.TextEdit txt_srcBillNo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraEditors.TextEdit txt_typebTxt;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraEditors.TextEdit txt_ypQty;
+        private DevExpress.XtraEditors.TextEdit txt_kpQty;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem txt_ypQty1111;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3