From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 1269 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 779 insertions(+), 490 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 6a8b555..a06237b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -29,15 +29,14 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womcaa));
             this.gvMx1scraprate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1denominator = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1numerator = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1issueType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lot = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1mtono = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1positionNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1cab014 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1cab012 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1cab009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,7 +48,12 @@
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,33 +63,18 @@
             this.lb_saleOrderNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_saleOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_srcBillentryseq = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_srcBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_srcBillType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_stockInlimitl = new DevExpress.XtraEditors.LabelControl();
-            this.txt_stockInlimitl = new DevExpress.XtraEditors.TextEdit();
-            this.gv_stockInlimitl = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_stockInlimith = new DevExpress.XtraEditors.LabelControl();
-            this.txt_stockInlimith = new DevExpress.XtraEditors.TextEdit();
-            this.gv_stockInlimith = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_depotCode = new DevExpress.XtraEditors.LabelControl();
-            this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
-            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.txt_caa024 = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa024 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_caa021 = new DevExpress.XtraEditors.LabelControl();
             this.gv_caa021 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_caa020 = new DevExpress.XtraEditors.LabelControl();
             this.txt_caa020 = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa020 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_caa019 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_caa018 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_caa016 = new DevExpress.XtraEditors.LabelControl();
             this.txt_caa016 = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa016 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_caa015 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_caa012 = new DevExpress.XtraEditors.LabelControl();
             this.txt_caa012 = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa012 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -96,10 +85,10 @@
             this.txt_caa010 = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa010 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_caa009 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_caa009 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_caa006 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_caa006 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa006 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_caa005 = new DevExpress.XtraEditors.LabelControl();
             this.txt_caa005 = new DevExpress.XtraEditors.TextEdit();
@@ -107,43 +96,76 @@
             this.lb_caa001 = new DevExpress.XtraEditors.LabelControl();
             this.txt_caa001 = new DevExpress.XtraEditors.TextEdit();
             this.gv_caa001 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_erpid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_erpid = new DevExpress.XtraEditors.TextEdit();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = 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();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            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.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
+            this.txt_caa004 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_gdzt = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_erpid = new DevExpress.XtraEditors.LabelControl();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_scOrg = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_wtOrg = new DevExpress.XtraEditors.TextEdit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_caa009.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_caa006.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -153,6 +175,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_caa004.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wtOrg.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1scraprate
@@ -165,7 +195,7 @@
             this.gvMx1scraprate.Name = "gvMx1scraprate";
             this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
             this.gvMx1scraprate.Visible = true;
-            this.gvMx1scraprate.VisibleIndex = 5;
+            this.gvMx1scraprate.VisibleIndex = 20;
             this.gvMx1scraprate.Width = 94;
             // 
             // gvMx1scrapqty
@@ -178,7 +208,7 @@
             this.gvMx1scrapqty.Name = "gvMx1scrapqty";
             this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
             this.gvMx1scrapqty.Visible = true;
-            this.gvMx1scrapqty.VisibleIndex = 6;
+            this.gvMx1scrapqty.VisibleIndex = 21;
             this.gvMx1scrapqty.Width = 94;
             // 
             // gvMx1denominator
@@ -191,7 +221,7 @@
             this.gvMx1denominator.Name = "gvMx1denominator";
             this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
             this.gvMx1denominator.Visible = true;
-            this.gvMx1denominator.VisibleIndex = 13;
+            this.gvMx1denominator.VisibleIndex = 15;
             this.gvMx1denominator.Width = 94;
             // 
             // gvMx1numerator
@@ -204,7 +234,7 @@
             this.gvMx1numerator.Name = "gvMx1numerator";
             this.gvMx1numerator.Tag = "query_a.NUMERATOR";
             this.gvMx1numerator.Visible = true;
-            this.gvMx1numerator.VisibleIndex = 12;
+            this.gvMx1numerator.VisibleIndex = 14;
             this.gvMx1numerator.Width = 94;
             // 
             // gvMx1issueType
@@ -217,7 +247,7 @@
             this.gvMx1issueType.Name = "gvMx1issueType";
             this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
             this.gvMx1issueType.Visible = true;
-            this.gvMx1issueType.VisibleIndex = 10;
+            this.gvMx1issueType.VisibleIndex = 18;
             this.gvMx1issueType.Width = 94;
             // 
             // gvMx1depotCode
@@ -225,26 +255,13 @@
             this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
-            this.gvMx1depotCode.FieldName = "depotCode";
+            this.gvMx1depotCode.FieldName = "dptCode";
             this.gvMx1depotCode.MinWidth = 50;
             this.gvMx1depotCode.Name = "gvMx1depotCode";
             this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx1depotCode.Visible = true;
-            this.gvMx1depotCode.VisibleIndex = 3;
+            this.gvMx1depotCode.VisibleIndex = 16;
             this.gvMx1depotCode.Width = 94;
-            // 
-            // gvMx1lot
-            // 
-            this.gvMx1lot.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1lot.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lot.Caption = "鎵瑰彿";
-            this.gvMx1lot.FieldName = "lot";
-            this.gvMx1lot.MinWidth = 50;
-            this.gvMx1lot.Name = "gvMx1lot";
-            this.gvMx1lot.Tag = "query_a.LOT";
-            this.gvMx1lot.Visible = true;
-            this.gvMx1lot.VisibleIndex = 18;
-            this.gvMx1lot.Width = 94;
             // 
             // gvMx1mtono
             // 
@@ -256,33 +273,20 @@
             this.gvMx1mtono.Name = "gvMx1mtono";
             this.gvMx1mtono.Tag = "query_a.MTONO";
             this.gvMx1mtono.Visible = true;
-            this.gvMx1mtono.VisibleIndex = 17;
+            this.gvMx1mtono.VisibleIndex = 13;
             this.gvMx1mtono.Width = 94;
-            // 
-            // gvMx1positionNo
-            // 
-            this.gvMx1positionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1positionNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1positionNo.Caption = "浣嶇疆鍙�";
-            this.gvMx1positionNo.FieldName = "positionNo";
-            this.gvMx1positionNo.MinWidth = 50;
-            this.gvMx1positionNo.Name = "gvMx1positionNo";
-            this.gvMx1positionNo.Tag = "query_a.POSITION_NO";
-            this.gvMx1positionNo.Visible = true;
-            this.gvMx1positionNo.VisibleIndex = 16;
-            this.gvMx1positionNo.Width = 94;
             // 
             // gvMx1cab014
             // 
             this.gvMx1cab014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab014.AppearanceCell.Options.UseFont = true;
-            this.gvMx1cab014.Caption = "鏄惁鏇挎枡";
-            this.gvMx1cab014.FieldName = "cab014";
+            this.gvMx1cab014.Caption = "鏇挎枡鏍囪瘑";
+            this.gvMx1cab014.FieldName = "cab014Chk";
             this.gvMx1cab014.MinWidth = 50;
             this.gvMx1cab014.Name = "gvMx1cab014";
             this.gvMx1cab014.Tag = "query_a.CAB014";
             this.gvMx1cab014.Visible = true;
-            this.gvMx1cab014.VisibleIndex = 15;
+            this.gvMx1cab014.VisibleIndex = 9;
             this.gvMx1cab014.Width = 94;
             // 
             // gvMx1cab012
@@ -295,7 +299,7 @@
             this.gvMx1cab012.Name = "gvMx1cab012";
             this.gvMx1cab012.Tag = "query_a.CAB012";
             this.gvMx1cab012.Visible = true;
-            this.gvMx1cab012.VisibleIndex = 14;
+            this.gvMx1cab012.VisibleIndex = 5;
             this.gvMx1cab012.Width = 94;
             // 
             // gvMx1cab009
@@ -303,12 +307,12 @@
             this.gvMx1cab009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab009.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab009.Caption = "鍗曚綅";
-            this.gvMx1cab009.FieldName = "cab009";
+            this.gvMx1cab009.FieldName = "dwName";
             this.gvMx1cab009.MinWidth = 50;
             this.gvMx1cab009.Name = "gvMx1cab009";
             this.gvMx1cab009.Tag = "query_a.CAB009";
             this.gvMx1cab009.Visible = true;
-            this.gvMx1cab009.VisibleIndex = 9;
+            this.gvMx1cab009.VisibleIndex = 7;
             this.gvMx1cab009.Width = 94;
             // 
             // gvMx1cab007
@@ -334,7 +338,7 @@
             this.gvMx1cab006.Name = "gvMx1cab006";
             this.gvMx1cab006.Tag = "query_a.CAB006";
             this.gvMx1cab006.Visible = true;
-            this.gvMx1cab006.VisibleIndex = 7;
+            this.gvMx1cab006.VisibleIndex = 6;
             this.gvMx1cab006.Width = 94;
             // 
             // gvMx1cab003
@@ -342,12 +346,12 @@
             this.gvMx1cab003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cab003.AppearanceCell.Options.UseFont = true;
             this.gvMx1cab003.Caption = "鏉愭枡缂栫爜";
-            this.gvMx1cab003.FieldName = "cab003";
+            this.gvMx1cab003.FieldName = "wlbm";
             this.gvMx1cab003.MinWidth = 50;
             this.gvMx1cab003.Name = "gvMx1cab003";
             this.gvMx1cab003.Tag = "query_a.CAB003";
             this.gvMx1cab003.Visible = true;
-            this.gvMx1cab003.VisibleIndex = 1;
+            this.gvMx1cab003.VisibleIndex = 2;
             this.gvMx1cab003.Width = 94;
             // 
             // gvMx1cab002
@@ -378,7 +382,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 357);
             this.tabMxPage1.Text = "鏄庣粏";
             // 
             // gcMx1
@@ -387,7 +391,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, 338);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 357);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -397,66 +401,123 @@
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1guid,
             this.gvMx1cab002,
+            this.gridColumn6,
             this.gvMx1cab003,
             this.gridColumn14,
-            this.gvMx1depotCode,
-            this.gridColumn15,
-            this.gvMx1scraprate,
-            this.gvMx1scrapqty,
+            this.gridColumn10,
+            this.gvMx1cab012,
             this.gvMx1cab006,
-            this.gvMx1cab007,
             this.gvMx1cab009,
-            this.gvMx1issueType,
-            this.gridColumn16,
+            this.gvMx1cab007,
+            this.gvMx1cab014,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gvMx1mtono,
             this.gvMx1numerator,
             this.gvMx1denominator,
-            this.gvMx1cab012,
-            this.gvMx1cab014,
-            this.gvMx1positionNo,
-            this.gvMx1mtono,
-            this.gvMx1lot,
+            this.gvMx1depotCode,
+            this.gridColumn15,
+            this.gvMx1issueType,
+            this.gridColumn16,
+            this.gvMx1scraprate,
+            this.gvMx1scrapqty,
             this.gridColumn17});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.gvMx1.OptionsLayout.Columns.AddNewColumns = false;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "ppbom鍗曞彿";
+            this.gridColumn6.FieldName = "cab001";
+            this.gridColumn6.MinWidth = 80;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 1;
+            this.gridColumn6.Width = 94;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn14.FieldName = "itemName";
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 2;
+            this.gridColumn14.VisibleIndex = 3;
             this.gridColumn14.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn10.FieldName = "itemModel";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 4;
+            this.gridColumn10.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鍙戞枡缁勭粐";
+            this.gridColumn11.FieldName = "issuingOrganizationTxt";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 10;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "渚涘簲缁勭粐";
+            this.gridColumn12.FieldName = "supplyOrganizationTxt";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 11;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "璐т富";
+            this.gridColumn13.FieldName = "ownerId";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 12;
+            this.gridColumn13.Width = 94;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "浠撳簱鍚嶇О";
+            this.gridColumn15.FieldName = "dptName";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 4;
+            this.gridColumn15.VisibleIndex = 17;
             this.gridColumn15.Width = 94;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "渚涘簲绫诲瀷";
+            this.gridColumn16.FieldName = "gylx";
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 11;
+            this.gridColumn16.VisibleIndex = 19;
             this.gridColumn16.Width = 94;
             // 
             // gridColumn17
             // 
-            this.gridColumn17.Caption = "BOM鍗曞彿";
+            this.gridColumn17.Caption = "鐢ㄦ枡娓呭崟";
+            this.gridColumn17.FieldName = "typebTxt";
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 19;
+            this.gridColumn17.VisibleIndex = 22;
             this.gridColumn17.Width = 94;
             // 
             // gv_closeType
@@ -465,12 +526,12 @@
             this.gv_closeType.AppearanceCell.Options.UseFont = true;
             this.gv_closeType.Caption = "缁撴绫诲瀷";
             this.gv_closeType.FieldName = "closeType";
-            this.gv_closeType.MinWidth = 80;
+            this.gv_closeType.MinWidth = 50;
             this.gv_closeType.Name = "gv_closeType";
             this.gv_closeType.OptionsColumn.AllowEdit = false;
             this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
             this.gv_closeType.Visible = true;
-            this.gv_closeType.VisibleIndex = 29;
+            this.gv_closeType.VisibleIndex = 20;
             this.gv_closeType.Width = 80;
             // 
             // gv_forceCloserid
@@ -479,12 +540,12 @@
             this.gv_forceCloserid.AppearanceCell.Options.UseFont = true;
             this.gv_forceCloserid.Caption = "缁撴浜�";
             this.gv_forceCloserid.FieldName = "forceCloserid";
-            this.gv_forceCloserid.MinWidth = 80;
+            this.gv_forceCloserid.MinWidth = 50;
             this.gv_forceCloserid.Name = "gv_forceCloserid";
             this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
             this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
             this.gv_forceCloserid.Visible = true;
-            this.gv_forceCloserid.VisibleIndex = 28;
+            this.gv_forceCloserid.VisibleIndex = 19;
             this.gv_forceCloserid.Width = 80;
             // 
             // gv_saleOrderEntryseq
@@ -493,27 +554,28 @@
             this.gv_saleOrderEntryseq.AppearanceCell.Options.UseFont = true;
             this.gv_saleOrderEntryseq.Caption = "闇�姹傚崟鎹鍙�";
             this.gv_saleOrderEntryseq.FieldName = "saleOrderEntryseq";
+            this.gv_saleOrderEntryseq.MaxWidth = 60;
             this.gv_saleOrderEntryseq.MinWidth = 50;
             this.gv_saleOrderEntryseq.Name = "gv_saleOrderEntryseq";
             this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
             this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
             this.gv_saleOrderEntryseq.Visible = true;
-            this.gv_saleOrderEntryseq.VisibleIndex = 27;
+            this.gv_saleOrderEntryseq.VisibleIndex = 17;
             this.gv_saleOrderEntryseq.Width = 50;
             // 
             // lb_saleOrderNo
             // 
             this.lb_saleOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_saleOrderNo.Appearance.Options.UseFont = true;
-            this.lb_saleOrderNo.Location = new System.Drawing.Point(525, 55);
+            this.lb_saleOrderNo.Location = new System.Drawing.Point(20, 85);
             this.lb_saleOrderNo.Name = "lb_saleOrderNo";
-            this.lb_saleOrderNo.Size = new System.Drawing.Size(90, 21);
+            this.lb_saleOrderNo.Size = new System.Drawing.Size(68, 21);
             this.lb_saleOrderNo.TabIndex = 450;
-            this.lb_saleOrderNo.Text = "閿�鍞鍗曞彿 ";
+            this.lb_saleOrderNo.Text = "闇�姹傚崟鍙�";
             // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(623, 51);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(95, 81);
             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;
@@ -526,182 +588,47 @@
             this.gv_saleOrderNo.AppearanceCell.Options.UseFont = true;
             this.gv_saleOrderNo.Caption = "闇�姹傚崟鎹彿";
             this.gv_saleOrderNo.FieldName = "saleOrderNo";
-            this.gv_saleOrderNo.MinWidth = 100;
+            this.gv_saleOrderNo.MinWidth = 50;
             this.gv_saleOrderNo.Name = "gv_saleOrderNo";
             this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
             this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
             this.gv_saleOrderNo.Visible = true;
-            this.gv_saleOrderNo.VisibleIndex = 26;
+            this.gv_saleOrderNo.VisibleIndex = 16;
             this.gv_saleOrderNo.Width = 100;
-            // 
-            // gv_srcBillentryseq
-            // 
-            this.gv_srcBillentryseq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_srcBillentryseq.AppearanceCell.Options.UseFont = true;
-            this.gv_srcBillentryseq.Caption = "婧愬崟鍒嗗綍琛屽彿";
-            this.gv_srcBillentryseq.FieldName = "srcBillentryseq";
-            this.gv_srcBillentryseq.MinWidth = 50;
-            this.gv_srcBillentryseq.Name = "gv_srcBillentryseq";
-            this.gv_srcBillentryseq.OptionsColumn.AllowEdit = false;
-            this.gv_srcBillentryseq.Tag = "query_a.SRC_BILLENTRYSEQ";
-            this.gv_srcBillentryseq.Visible = true;
-            this.gv_srcBillentryseq.VisibleIndex = 25;
-            this.gv_srcBillentryseq.Width = 50;
-            // 
-            // gv_srcBillNo
-            // 
-            this.gv_srcBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_srcBillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_srcBillNo.Caption = "婧愬崟缂栧彿";
-            this.gv_srcBillNo.FieldName = "srcBillNo";
-            this.gv_srcBillNo.MinWidth = 100;
-            this.gv_srcBillNo.Name = "gv_srcBillNo";
-            this.gv_srcBillNo.OptionsColumn.AllowEdit = false;
-            this.gv_srcBillNo.Tag = "query_a.SRC_BILL_NO";
-            this.gv_srcBillNo.Visible = true;
-            this.gv_srcBillNo.VisibleIndex = 24;
-            this.gv_srcBillNo.Width = 100;
-            // 
-            // gv_srcBillType
-            // 
-            this.gv_srcBillType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_srcBillType.AppearanceCell.Options.UseFont = true;
-            this.gv_srcBillType.Caption = "婧愬崟绫诲瀷";
-            this.gv_srcBillType.FieldName = "srcBillType";
-            this.gv_srcBillType.MinWidth = 60;
-            this.gv_srcBillType.Name = "gv_srcBillType";
-            this.gv_srcBillType.OptionsColumn.AllowEdit = false;
-            this.gv_srcBillType.Tag = "query_a.SRC_BILL_TYPE";
-            this.gv_srcBillType.Visible = true;
-            this.gv_srcBillType.VisibleIndex = 23;
-            this.gv_srcBillType.Width = 60;
-            // 
-            // gv_createType
-            // 
-            this.gv_createType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createType.AppearanceCell.Options.UseFont = true;
-            this.gv_createType.Caption = "鐢熸垚鏂瑰紡";
-            this.gv_createType.FieldName = "createType";
-            this.gv_createType.MinWidth = 100;
-            this.gv_createType.Name = "gv_createType";
-            this.gv_createType.OptionsColumn.AllowEdit = false;
-            this.gv_createType.Tag = "query_a.CREATE_TYPE";
-            this.gv_createType.Visible = true;
-            this.gv_createType.VisibleIndex = 22;
-            this.gv_createType.Width = 100;
             // 
             // lb_stockInlimitl
             // 
             this.lb_stockInlimitl.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_stockInlimitl.Appearance.Options.UseFont = true;
-            this.lb_stockInlimitl.Location = new System.Drawing.Point(260, 89);
+            this.lb_stockInlimitl.Location = new System.Drawing.Point(260, 52);
             this.lb_stockInlimitl.Name = "lb_stockInlimitl";
-            this.lb_stockInlimitl.Size = new System.Drawing.Size(73, 21);
+            this.lb_stockInlimitl.Size = new System.Drawing.Size(68, 21);
             this.lb_stockInlimitl.TabIndex = 370;
-            this.lb_stockInlimitl.Text = "鍏ュ簱涓嬮檺 ";
+            this.lb_stockInlimitl.Text = "鍏ュ簱鏁伴噺";
             // 
-            // txt_stockInlimitl
+            // txt_caa024
             // 
-            this.txt_stockInlimitl.Location = new System.Drawing.Point(336, 85);
-            this.txt_stockInlimitl.Name = "txt_stockInlimitl";
-            this.txt_stockInlimitl.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_stockInlimitl.Properties.Appearance.Options.UseFont = true;
-            this.txt_stockInlimitl.Size = new System.Drawing.Size(150, 28);
-            this.txt_stockInlimitl.TabIndex = 370;
-            // 
-            // gv_stockInlimitl
-            // 
-            this.gv_stockInlimitl.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_stockInlimitl.AppearanceCell.Options.UseFont = true;
-            this.gv_stockInlimitl.Caption = "鍏ュ簱涓嬮檺";
-            this.gv_stockInlimitl.FieldName = "stockInlimitl";
-            this.gv_stockInlimitl.MinWidth = 100;
-            this.gv_stockInlimitl.Name = "gv_stockInlimitl";
-            this.gv_stockInlimitl.OptionsColumn.AllowEdit = false;
-            this.gv_stockInlimitl.Tag = "query_a.STOCK_INLIMITL";
-            this.gv_stockInlimitl.Visible = true;
-            this.gv_stockInlimitl.VisibleIndex = 31;
-            this.gv_stockInlimitl.Width = 100;
-            // 
-            // lb_stockInlimith
-            // 
-            this.lb_stockInlimith.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_stockInlimith.Appearance.Options.UseFont = true;
-            this.lb_stockInlimith.Location = new System.Drawing.Point(260, 125);
-            this.lb_stockInlimith.Name = "lb_stockInlimith";
-            this.lb_stockInlimith.Size = new System.Drawing.Size(73, 21);
-            this.lb_stockInlimith.TabIndex = 360;
-            this.lb_stockInlimith.Text = "鍏ュ簱涓婇檺 ";
-            // 
-            // txt_stockInlimith
-            // 
-            this.txt_stockInlimith.Location = new System.Drawing.Point(336, 121);
-            this.txt_stockInlimith.Name = "txt_stockInlimith";
-            this.txt_stockInlimith.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_stockInlimith.Properties.Appearance.Options.UseFont = true;
-            this.txt_stockInlimith.Size = new System.Drawing.Size(150, 28);
-            this.txt_stockInlimith.TabIndex = 360;
-            // 
-            // gv_stockInlimith
-            // 
-            this.gv_stockInlimith.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_stockInlimith.AppearanceCell.Options.UseFont = true;
-            this.gv_stockInlimith.Caption = "鍏ュ簱涓婇檺";
-            this.gv_stockInlimith.FieldName = "stockInlimith";
-            this.gv_stockInlimith.MinWidth = 100;
-            this.gv_stockInlimith.Name = "gv_stockInlimith";
-            this.gv_stockInlimith.OptionsColumn.AllowEdit = false;
-            this.gv_stockInlimith.Tag = "query_a.STOCK_INLIMITH";
-            this.gv_stockInlimith.Visible = true;
-            this.gv_stockInlimith.VisibleIndex = 30;
-            this.gv_stockInlimith.Width = 100;
-            // 
-            // lb_depotCode
-            // 
-            this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_depotCode.Appearance.Options.UseFont = true;
-            this.lb_depotCode.Location = new System.Drawing.Point(49, 125);
-            this.lb_depotCode.Name = "lb_depotCode";
-            this.lb_depotCode.Size = new System.Drawing.Size(39, 21);
-            this.lb_depotCode.TabIndex = 327;
-            this.lb_depotCode.Text = "浠撳簱 ";
-            // 
-            // txt_depotCode
-            // 
-            this.txt_depotCode.Location = new System.Drawing.Point(95, 121);
-            this.txt_depotCode.Name = "txt_depotCode";
-            this.txt_depotCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotCode.Size = new System.Drawing.Size(150, 28);
-            this.txt_depotCode.TabIndex = 327;
-            // 
-            // gv_depotCode
-            // 
-            this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotCode.Caption = "浠撳簱";
-            this.gv_depotCode.FieldName = "depotCode";
-            this.gv_depotCode.MinWidth = 120;
-            this.gv_depotCode.Name = "gv_depotCode";
-            this.gv_depotCode.OptionsColumn.AllowEdit = false;
-            this.gv_depotCode.Tag = "query_a.DEPOT_CODE";
-            this.gv_depotCode.Visible = true;
-            this.gv_depotCode.VisibleIndex = 8;
-            this.gv_depotCode.Width = 120;
+            this.txt_caa024.Location = new System.Drawing.Point(336, 48);
+            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(150, 28);
+            this.txt_caa024.TabIndex = 370;
             // 
             // 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.Caption = "宸插叆搴撴暟";
             this.gv_caa024.FieldName = "caa024";
-            this.gv_caa024.MinWidth = 60;
+            this.gv_caa024.MaxWidth = 50;
+            this.gv_caa024.MinWidth = 50;
             this.gv_caa024.Name = "gv_caa024";
             this.gv_caa024.OptionsColumn.AllowEdit = false;
             this.gv_caa024.Tag = "query_a.CAA024";
             this.gv_caa024.Visible = true;
-            this.gv_caa024.VisibleIndex = 18;
-            this.gv_caa024.Width = 60;
+            this.gv_caa024.VisibleIndex = 12;
+            this.gv_caa024.Width = 50;
             // 
             // gv_checkUser
             // 
@@ -714,15 +641,16 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 13;
+            this.gv_checkUser.VisibleIndex = 15;
             this.gv_checkUser.Width = 50;
             // 
             // gv_fstatus
             // 
             this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fstatus.Caption = "宸插鏍�";
-            this.gv_fstatus.FieldName = "fstatus";
+            this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_fstatus.FieldName = "fstatusChk";
+            this.gv_fstatus.MaxWidth = 50;
             this.gv_fstatus.MinWidth = 50;
             this.gv_fstatus.Name = "gv_fstatus";
             this.gv_fstatus.OptionsColumn.AllowEdit = false;
@@ -735,39 +663,29 @@
             // 
             this.lb_caa021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa021.Appearance.Options.UseFont = true;
-            this.lb_caa021.Location = new System.Drawing.Point(15, 89);
+            this.lb_caa021.Location = new System.Drawing.Point(507, 20);
             this.lb_caa021.Name = "lb_caa021";
-            this.lb_caa021.Size = new System.Drawing.Size(73, 21);
+            this.lb_caa021.Size = new System.Drawing.Size(68, 21);
             this.lb_caa021.TabIndex = 267;
-            this.lb_caa021.Text = "鐢熶骇杞﹂棿 ";
+            this.lb_caa021.Text = "鐢熶骇杞﹂棿";
             // 
             // 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 = "caa021";
-            this.gv_caa021.MinWidth = 120;
+            this.gv_caa021.FieldName = "sccj";
+            this.gv_caa021.MinWidth = 50;
             this.gv_caa021.Name = "gv_caa021";
             this.gv_caa021.OptionsColumn.AllowEdit = false;
             this.gv_caa021.Tag = "query_a.CAA021";
             this.gv_caa021.Visible = true;
-            this.gv_caa021.VisibleIndex = 7;
+            this.gv_caa021.VisibleIndex = 9;
             this.gv_caa021.Width = 120;
-            // 
-            // lb_caa020
-            // 
-            this.lb_caa020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_caa020.Appearance.Options.UseFont = true;
-            this.lb_caa020.Location = new System.Drawing.Point(495, 89);
-            this.lb_caa020.Name = "lb_caa020";
-            this.lb_caa020.Size = new System.Drawing.Size(120, 21);
-            this.lb_caa020.TabIndex = 262;
-            this.lb_caa020.Text = "ERP鐢熶骇璁㈠崟鍙� ";
             // 
             // txt_caa020
             // 
-            this.txt_caa020.Location = new System.Drawing.Point(623, 85);
+            this.txt_caa020.Location = new System.Drawing.Point(95, 48);
             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;
@@ -780,59 +698,31 @@
             this.gv_caa020.AppearanceCell.Options.UseFont = true;
             this.gv_caa020.Caption = "浠诲姟鍗曞彿";
             this.gv_caa020.FieldName = "caa020";
-            this.gv_caa020.MinWidth = 100;
+            this.gv_caa020.MinWidth = 50;
             this.gv_caa020.Name = "gv_caa020";
             this.gv_caa020.OptionsColumn.AllowEdit = false;
             this.gv_caa020.Tag = "query_a.CAA020";
             this.gv_caa020.Visible = true;
-            this.gv_caa020.VisibleIndex = 4;
+            this.gv_caa020.VisibleIndex = 6;
             this.gv_caa020.Width = 100;
-            // 
-            // gv_caa019
-            // 
-            this.gv_caa019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_caa019.AppearanceCell.Options.UseFont = true;
-            this.gv_caa019.Caption = "erp婧愬崟琛屽彿";
-            this.gv_caa019.FieldName = "caa019";
-            this.gv_caa019.MinWidth = 50;
-            this.gv_caa019.Name = "gv_caa019";
-            this.gv_caa019.OptionsColumn.AllowEdit = false;
-            this.gv_caa019.Tag = "query_a.CAA019";
-            this.gv_caa019.Visible = true;
-            this.gv_caa019.VisibleIndex = 14;
-            this.gv_caa019.Width = 50;
-            // 
-            // gv_caa018
-            // 
-            this.gv_caa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_caa018.AppearanceCell.Options.UseFont = true;
-            this.gv_caa018.Caption = "ERP婧愬崟ID";
-            this.gv_caa018.FieldName = "caa018";
-            this.gv_caa018.MinWidth = 80;
-            this.gv_caa018.Name = "gv_caa018";
-            this.gv_caa018.OptionsColumn.AllowEdit = false;
-            this.gv_caa018.Tag = "query_a.CAA018";
-            this.gv_caa018.Visible = true;
-            this.gv_caa018.VisibleIndex = 32;
-            this.gv_caa018.Width = 80;
             // 
             // lb_caa016
             // 
             this.lb_caa016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa016.Appearance.Options.UseFont = true;
-            this.lb_caa016.Location = new System.Drawing.Point(49, 164);
+            this.lb_caa016.Location = new System.Drawing.Point(54, 153);
             this.lb_caa016.Name = "lb_caa016";
-            this.lb_caa016.Size = new System.Drawing.Size(39, 21);
+            this.lb_caa016.Size = new System.Drawing.Size(34, 21);
             this.lb_caa016.TabIndex = 243;
-            this.lb_caa016.Text = "澶囨敞 ";
+            this.lb_caa016.Text = "澶囨敞";
             // 
             // txt_caa016
             // 
-            this.txt_caa016.Location = new System.Drawing.Point(95, 160);
+            this.txt_caa016.Location = new System.Drawing.Point(95, 149);
             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(690, 28);
+            this.txt_caa016.Size = new System.Drawing.Size(642, 28);
             this.txt_caa016.TabIndex = 243;
             // 
             // gv_caa016
@@ -841,7 +731,7 @@
             this.gv_caa016.AppearanceCell.Options.UseFont = true;
             this.gv_caa016.Caption = "澶囨敞";
             this.gv_caa016.FieldName = "caa016";
-            this.gv_caa016.MinWidth = 100;
+            this.gv_caa016.MinWidth = 50;
             this.gv_caa016.Name = "gv_caa016";
             this.gv_caa016.OptionsColumn.AllowEdit = false;
             this.gv_caa016.Tag = "query_a.CAA016";
@@ -849,29 +739,15 @@
             this.gv_caa016.VisibleIndex = 21;
             this.gv_caa016.Width = 100;
             // 
-            // gv_caa015
-            // 
-            this.gv_caa015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_caa015.AppearanceCell.Options.UseFont = true;
-            this.gv_caa015.Caption = "閿�鍞鍗曞彿";
-            this.gv_caa015.FieldName = "caa015";
-            this.gv_caa015.MinWidth = 100;
-            this.gv_caa015.Name = "gv_caa015";
-            this.gv_caa015.OptionsColumn.AllowEdit = false;
-            this.gv_caa015.Tag = "query_a.CAA015";
-            this.gv_caa015.Visible = true;
-            this.gv_caa015.VisibleIndex = 20;
-            this.gv_caa015.Width = 100;
-            // 
             // lb_caa012
             // 
             this.lb_caa012.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa012.Appearance.Options.UseFont = true;
             this.lb_caa012.Location = new System.Drawing.Point(260, 20);
             this.lb_caa012.Name = "lb_caa012";
-            this.lb_caa012.Size = new System.Drawing.Size(73, 21);
+            this.lb_caa012.Size = new System.Drawing.Size(68, 21);
             this.lb_caa012.TabIndex = 231;
-            this.lb_caa012.Text = "宸ュ崟鏁伴噺 ";
+            this.lb_caa012.Text = "宸ュ崟鏁伴噺";
             // 
             // txt_caa012
             // 
@@ -886,29 +762,29 @@
             // 
             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.Caption = "鎬绘暟";
             this.gv_caa012.FieldName = "caa012";
             this.gv_caa012.MinWidth = 50;
             this.gv_caa012.Name = "gv_caa012";
             this.gv_caa012.OptionsColumn.AllowEdit = false;
             this.gv_caa012.Tag = "query_a.CAA012";
             this.gv_caa012.Visible = true;
-            this.gv_caa012.VisibleIndex = 9;
+            this.gv_caa012.VisibleIndex = 10;
             this.gv_caa012.Width = 50;
             // 
             // lb_caa011
             // 
             this.lb_caa011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa011.Appearance.Options.UseFont = true;
-            this.lb_caa011.Location = new System.Drawing.Point(780, 55);
+            this.lb_caa011.Location = new System.Drawing.Point(780, 52);
             this.lb_caa011.Name = "lb_caa011";
-            this.lb_caa011.Size = new System.Drawing.Size(107, 21);
+            this.lb_caa011.Size = new System.Drawing.Size(102, 21);
             this.lb_caa011.TabIndex = 228;
-            this.lb_caa011.Text = "棰勮瀹屽伐鏃堕棿 ";
+            this.lb_caa011.Text = "棰勮瀹屽伐鏃堕棿";
             // 
             // txt_caa011
             // 
-            this.txt_caa011.Location = new System.Drawing.Point(893, 51);
+            this.txt_caa011.Location = new System.Drawing.Point(893, 48);
             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;
@@ -921,12 +797,12 @@
             this.gv_caa011.AppearanceCell.Options.UseFont = true;
             this.gv_caa011.Caption = "棰勮瀹屽伐鏃堕棿";
             this.gv_caa011.FieldName = "caa011";
-            this.gv_caa011.MinWidth = 180;
+            this.gv_caa011.MinWidth = 50;
             this.gv_caa011.Name = "gv_caa011";
             this.gv_caa011.OptionsColumn.AllowEdit = false;
             this.gv_caa011.Tag = "query_a.CAA011";
             this.gv_caa011.Visible = true;
-            this.gv_caa011.VisibleIndex = 12;
+            this.gv_caa011.VisibleIndex = 14;
             this.gv_caa011.Width = 180;
             // 
             // lb_caa010
@@ -935,9 +811,9 @@
             this.lb_caa010.Appearance.Options.UseFont = true;
             this.lb_caa010.Location = new System.Drawing.Point(780, 20);
             this.lb_caa010.Name = "lb_caa010";
-            this.lb_caa010.Size = new System.Drawing.Size(107, 21);
+            this.lb_caa010.Size = new System.Drawing.Size(102, 21);
             this.lb_caa010.TabIndex = 226;
-            this.lb_caa010.Text = "棰勮寮�宸ユ椂闂� ";
+            this.lb_caa010.Text = "棰勮寮�宸ユ椂闂�";
             // 
             // txt_caa010
             // 
@@ -954,93 +830,93 @@
             this.gv_caa010.AppearanceCell.Options.UseFont = true;
             this.gv_caa010.Caption = "棰勮寮�宸ユ椂闂�";
             this.gv_caa010.FieldName = "caa010";
-            this.gv_caa010.MinWidth = 180;
+            this.gv_caa010.MinWidth = 50;
             this.gv_caa010.Name = "gv_caa010";
             this.gv_caa010.OptionsColumn.AllowEdit = false;
             this.gv_caa010.Tag = "query_a.CAA010";
             this.gv_caa010.Visible = true;
-            this.gv_caa010.VisibleIndex = 11;
+            this.gv_caa010.VisibleIndex = 13;
             this.gv_caa010.Width = 180;
             // 
             // lb_caa009
             // 
             this.lb_caa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa009.Appearance.Options.UseFont = true;
-            this.lb_caa009.Location = new System.Drawing.Point(294, 55);
+            this.lb_caa009.Location = new System.Drawing.Point(294, 85);
             this.lb_caa009.Name = "lb_caa009";
-            this.lb_caa009.Size = new System.Drawing.Size(39, 21);
+            this.lb_caa009.Size = new System.Drawing.Size(34, 21);
             this.lb_caa009.TabIndex = 222;
-            this.lb_caa009.Text = "鍗曚綅 ";
+            this.lb_caa009.Text = "鍗曚綅";
             // 
-            // txt_caa009
+            // txt_dwName
             // 
-            this.txt_caa009.Location = new System.Drawing.Point(336, 51);
-            this.txt_caa009.Name = "txt_caa009";
-            this.txt_caa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_caa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa009.Size = new System.Drawing.Size(150, 28);
-            this.txt_caa009.TabIndex = 222;
+            this.txt_dwName.Location = new System.Drawing.Point(336, 81);
+            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(150, 28);
+            this.txt_dwName.TabIndex = 222;
             // 
             // 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 = "caa009";
+            this.gv_caa009.FieldName = "fname";
             this.gv_caa009.MinWidth = 50;
             this.gv_caa009.Name = "gv_caa009";
             this.gv_caa009.OptionsColumn.AllowEdit = false;
             this.gv_caa009.Tag = "query_a.CAA009";
             this.gv_caa009.Visible = true;
-            this.gv_caa009.VisibleIndex = 10;
+            this.gv_caa009.VisibleIndex = 11;
             this.gv_caa009.Width = 50;
             // 
             // lb_caa006
             // 
             this.lb_caa006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa006.Appearance.Options.UseFont = true;
-            this.lb_caa006.Location = new System.Drawing.Point(15, 55);
+            this.lb_caa006.Location = new System.Drawing.Point(20, 119);
             this.lb_caa006.Name = "lb_caa006";
-            this.lb_caa006.Size = new System.Drawing.Size(73, 21);
+            this.lb_caa006.Size = new System.Drawing.Size(68, 21);
             this.lb_caa006.TabIndex = 219;
-            this.lb_caa006.Text = "浜у搧缂栫爜 ";
+            this.lb_caa006.Text = "浜у搧缂栫爜";
             // 
-            // txt_caa006
+            // txt_itemNo
             // 
-            this.txt_caa006.Location = new System.Drawing.Point(95, 51);
-            this.txt_caa006.Name = "txt_caa006";
-            this.txt_caa006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_caa006.Properties.Appearance.Options.UseFont = true;
-            this.txt_caa006.Size = new System.Drawing.Size(150, 28);
-            this.txt_caa006.TabIndex = 219;
+            this.txt_itemNo.Location = new System.Drawing.Point(95, 115);
+            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(150, 28);
+            this.txt_itemNo.TabIndex = 219;
             // 
             // 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 = "caa006";
-            this.gv_caa006.MinWidth = 80;
+            this.gv_caa006.FieldName = "itemNo";
+            this.gv_caa006.MinWidth = 50;
             this.gv_caa006.Name = "gv_caa006";
             this.gv_caa006.OptionsColumn.AllowEdit = false;
             this.gv_caa006.Tag = "query_a.CAA006";
             this.gv_caa006.Visible = true;
-            this.gv_caa006.VisibleIndex = 5;
+            this.gv_caa006.VisibleIndex = 7;
             this.gv_caa006.Width = 80;
             // 
             // lb_caa005
             // 
             this.lb_caa005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_caa005.Appearance.Options.UseFont = true;
-            this.lb_caa005.Location = new System.Drawing.Point(780, 89);
+            this.lb_caa005.Location = new System.Drawing.Point(780, 85);
             this.lb_caa005.Name = "lb_caa005";
-            this.lb_caa005.Size = new System.Drawing.Size(107, 21);
+            this.lb_caa005.Size = new System.Drawing.Size(102, 21);
             this.lb_caa005.TabIndex = 217;
-            this.lb_caa005.Text = "璁″垝涓嬭揪鏃ユ湡 ";
+            this.lb_caa005.Text = "璁″垝涓嬭揪鏃堕棿";
             // 
             // txt_caa005
             // 
-            this.txt_caa005.Location = new System.Drawing.Point(893, 85);
+            this.txt_caa005.Location = new System.Drawing.Point(893, 81);
             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;
@@ -1051,14 +927,14 @@
             // 
             this.gv_caa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_caa005.AppearanceCell.Options.UseFont = true;
-            this.gv_caa005.Caption = "璁″垝涓嬭揪鏃ユ湡";
-            this.gv_caa005.FieldName = "caa005";
-            this.gv_caa005.MinWidth = 180;
+            this.gv_caa005.Caption = "鍚屾鏃堕棿";
+            this.gv_caa005.FieldName = "createDate";
+            this.gv_caa005.MinWidth = 50;
             this.gv_caa005.Name = "gv_caa005";
             this.gv_caa005.OptionsColumn.AllowEdit = false;
             this.gv_caa005.Tag = "query_a.CAA005";
             this.gv_caa005.Visible = true;
-            this.gv_caa005.VisibleIndex = 19;
+            this.gv_caa005.VisibleIndex = 24;
             this.gv_caa005.Width = 180;
             // 
             // lb_caa001
@@ -1086,36 +962,18 @@
             this.gv_caa001.AppearanceCell.Options.UseFont = true;
             this.gv_caa001.Caption = "鎶曟枡鍗曞彿";
             this.gv_caa001.FieldName = "caa001";
-            this.gv_caa001.MinWidth = 100;
+            this.gv_caa001.MinWidth = 50;
             this.gv_caa001.Name = "gv_caa001";
             this.gv_caa001.OptionsColumn.AllowEdit = false;
             this.gv_caa001.Tag = "query_a.CAA001";
             this.gv_caa001.Visible = true;
-            this.gv_caa001.VisibleIndex = 2;
+            this.gv_caa001.VisibleIndex = 3;
             this.gv_caa001.Width = 100;
-            // 
-            // lb_erpid
-            // 
-            this.lb_erpid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_erpid.Appearance.Options.UseFont = true;
-            this.lb_erpid.Location = new System.Drawing.Point(562, 20);
-            this.lb_erpid.Name = "lb_erpid";
-            this.lb_erpid.Size = new System.Drawing.Size(53, 21);
-            this.lb_erpid.TabIndex = 211;
-            this.lb_erpid.Text = "ERPID ";
-            // 
-            // txt_erpid
-            // 
-            this.txt_erpid.Location = new System.Drawing.Point(623, 16);
-            this.txt_erpid.Name = "txt_erpid";
-            this.txt_erpid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_erpid.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpid.Size = new System.Drawing.Size(150, 28);
-            this.txt_erpid.TabIndex = 211;
             // 
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -1149,37 +1007,51 @@
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_fstatus,
             this.gridColumn5,
+            this.gridColumn8,
             this.gv_caa001,
             this.gridColumn1,
+            this.gridColumn9,
             this.gv_caa020,
             this.gv_caa006,
             this.gridColumn3,
             this.gv_caa021,
             this.gv_caa012,
             this.gv_caa009,
+            this.gv_caa024,
             this.gv_caa010,
             this.gv_caa011,
             this.gv_checkUser,
-            this.gv_depotCode,
-            this.gv_caa019,
-            this.gridColumn2,
-            this.gridColumn7,
-            this.gridColumn4,
-            this.gv_caa024,
-            this.gv_caa005,
-            this.gv_caa015,
-            this.gv_caa016,
-            this.gv_createType,
-            this.gv_srcBillType,
-            this.gv_srcBillNo,
-            this.gv_srcBillentryseq,
             this.gv_saleOrderNo,
             this.gv_saleOrderEntryseq,
+            this.gridColumn2,
             this.gv_forceCloserid,
             this.gv_closeType,
-            this.gv_stockInlimith,
-            this.gv_stockInlimitl,
-            this.gv_caa018});
+            this.gv_caa016,
+            this.gridColumn7,
+            this.gridColumn4,
+            this.gv_caa005,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31,
+            this.gridColumn32,
+            this.gridColumn33,
+            this.gridColumn34,
+            this.gridColumn35,
+            this.gridColumn36,
+            this.gridColumn37,
+            this.gridColumn38,
+            this.gridColumn39});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -1187,58 +1059,314 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "缁撴鏍囪瘑";
+            this.gridColumn5.FieldName = "jabzChk";
+            this.gridColumn5.MaxWidth = 50;
+            this.gridColumn5.MinWidth = 50;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Tag = "query_a.jabzChk";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 1;
+            this.gridColumn5.Width = 50;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鐢熶骇缁勭粐";
+            this.gridColumn8.FieldName = "fSubsidiary";
+            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Tag = "org.fnamber";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 2;
+            this.gridColumn8.Width = 200;
+            // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "宸ュ崟鐘舵��";
-            this.gridColumn1.FieldName = "gdzt";
-            this.gridColumn1.MinWidth = 80;
+            this.gridColumn1.Caption = "涓氬姟鐘舵��";
+            this.gridColumn1.FieldName = "ywzt";
+            this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 3;
+            this.gridColumn1.VisibleIndex = 4;
             this.gridColumn1.Width = 80;
             // 
-            // gridColumn2
+            // gridColumn9
             // 
-            this.gridColumn2.Caption = "鍗曟嵁绫诲瀷";
-            this.gridColumn2.FieldName = "djlx";
-            this.gridColumn2.MinWidth = 110;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.AllowEdit = false;
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 15;
-            this.gridColumn2.Width = 110;
+            this.gridColumn9.Caption = "鐢ㄦ枡娓呭崟鐘舵��";
+            this.gridColumn9.FieldName = "typebTxt";
+            this.gridColumn9.MaxWidth = 60;
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 5;
+            this.gridColumn9.Width = 60;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "浜у搧鍚嶇О";
             this.gridColumn3.FieldName = "itemName";
-            this.gridColumn3.MinWidth = 120;
+            this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 6;
+            this.gridColumn3.VisibleIndex = 8;
             this.gridColumn3.Width = 120;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn2.FieldName = "djlx";
+            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 18;
+            this.gridColumn2.Width = 110;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "宸叉帓鎬绘暟";
             this.gridColumn7.FieldName = "caa012yp";
+            this.gridColumn7.MaxWidth = 50;
             this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 16;
+            this.gridColumn7.VisibleIndex = 22;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鏈帓鎬绘暟";
             this.gridColumn4.FieldName = "caa012wp";
+            this.gridColumn4.MaxWidth = 50;
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 17;
+            this.gridColumn4.VisibleIndex = 23;
             this.gridColumn4.Width = 50;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "宸ヨ壓璺嚎";
+            this.gridColumn18.FieldName = "routingId";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 25;
+            this.gridColumn18.Width = 94;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "浜х嚎";
+            this.gridColumn19.FieldName = "wShopId";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 26;
+            this.gridColumn19.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "浠撳簱";
+            this.gridColumn20.FieldName = "depotCode";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 27;
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "璁″垝缁�";
+            this.gridColumn21.FieldName = "workGroupId";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 28;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "璁″垝鍛�";
+            this.gridColumn22.FieldName = "planID";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 29;
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "涓嬭揪鏃ユ湡";
+            this.gridColumn23.FieldName = "caa005";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 30;
+            this.gridColumn23.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鍏ュ簱涓婇檺";
+            this.gridColumn24.FieldName = "stockInLimitH";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 31;
+            this.gridColumn24.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "鍏ュ簱涓嬮檺";
+            this.gridColumn25.FieldName = "stockInLimitL";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 32;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "璁″垝璺熻釜鍙�";
+            this.gridColumn26.FieldName = "mtono";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 33;
+            this.gridColumn26.Width = 94;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "鎵瑰彿";
+            this.gridColumn27.FieldName = "lot";
+            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 34;
+            this.gridColumn27.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "BOM";
+            this.gridColumn28.FieldName = "caa013";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 35;
+            this.gridColumn28.Width = 94;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "閿�鍞鍗曞彿";
+            this.gridColumn29.FieldName = "caa015";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 36;
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "閿�鍞鍗曡鍙�";
+            this.gridColumn30.FieldName = "caa015Head";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 37;
+            this.gridColumn30.Width = 94;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "鐢熸垚鏂瑰紡";
+            this.gridColumn31.FieldName = "createTypeTxt";
+            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 38;
+            this.gridColumn31.Width = 94;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "ERP鐢熶骇璁㈠崟ID";
+            this.gridColumn32.FieldName = "caa018";
+            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 39;
+            this.gridColumn32.Width = 94;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "ERP鐢熶骇璁㈠崟搴忓彿";
+            this.gridColumn33.FieldName = "caa019";
+            this.gridColumn33.MinWidth = 25;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Visible = true;
+            this.gridColumn33.VisibleIndex = 40;
+            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 = 41;
+            this.gridColumn34.Width = 94;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "婧愬崟绫诲瀷";
+            this.gridColumn35.FieldName = "srcBillType";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 42;
+            this.gridColumn35.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "婧愬崟缂栫爜";
+            this.gridColumn36.FieldName = "srcBillNo";
+            this.gridColumn36.MinWidth = 25;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 43;
+            this.gridColumn36.Width = 94;
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.Caption = "婧愬崟鍒嗗綍琛屽彿";
+            this.gridColumn37.FieldName = "srcBillEntrySeq";
+            this.gridColumn37.MinWidth = 25;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Visible = true;
+            this.gridColumn37.VisibleIndex = 44;
+            this.gridColumn37.Width = 94;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.Caption = "鍗曟嵁鐘舵��";
+            this.gridColumn38.FieldName = "typeATxt";
+            this.gridColumn38.MinWidth = 25;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 45;
+            this.gridColumn38.Width = 94;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.Caption = "濮旀墭缁勭粐";
+            this.gridColumn39.FieldName = "wtOrg";
+            this.gridColumn39.MinWidth = 25;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Visible = true;
+            this.gridColumn39.VisibleIndex = 46;
+            this.gridColumn39.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -1277,17 +1405,16 @@
             this.xtraTabPage2.Controls.Add(this.tabMx);
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.PageEnabled = false;
             this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 200);
+            this.tabMx.Location = new System.Drawing.Point(0, 181);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 370);
+            this.tabMx.Size = new System.Drawing.Size(1126, 389);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1295,19 +1422,26 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_caa021);
+            this.panel1.Controls.Add(this.labelControl6);
+            this.panel1.Controls.Add(this.txt_wtOrg);
+            this.panel1.Controls.Add(this.labelControl5);
+            this.panel1.Controls.Add(this.txt_scOrg);
+            this.panel1.Controls.Add(this.txt_caa004);
+            this.panel1.Controls.Add(this.labelControl4);
+            this.panel1.Controls.Add(this.labelControl3);
+            this.panel1.Controls.Add(this.txt_itemModel);
+            this.panel1.Controls.Add(this.labelControl1);
+            this.panel1.Controls.Add(this.txt_itemName);
+            this.panel1.Controls.Add(this.txt_gdzt);
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.txt_dptName);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_saleOrderNo);
             this.panel1.Controls.Add(this.txt_saleOrderNo);
             this.panel1.Controls.Add(this.lb_stockInlimitl);
-            this.panel1.Controls.Add(this.txt_stockInlimitl);
-            this.panel1.Controls.Add(this.lb_stockInlimith);
-            this.panel1.Controls.Add(this.txt_stockInlimith);
-            this.panel1.Controls.Add(this.lb_depotCode);
-            this.panel1.Controls.Add(this.txt_depotCode);
+            this.panel1.Controls.Add(this.txt_caa024);
             this.panel1.Controls.Add(this.lb_caa021);
-            this.panel1.Controls.Add(this.lb_caa020);
             this.panel1.Controls.Add(this.txt_caa020);
             this.panel1.Controls.Add(this.lb_caa016);
             this.panel1.Controls.Add(this.txt_caa016);
@@ -1318,81 +1452,208 @@
             this.panel1.Controls.Add(this.lb_caa010);
             this.panel1.Controls.Add(this.txt_caa010);
             this.panel1.Controls.Add(this.lb_caa009);
-            this.panel1.Controls.Add(this.txt_caa009);
+            this.panel1.Controls.Add(this.txt_dwName);
             this.panel1.Controls.Add(this.lb_caa006);
-            this.panel1.Controls.Add(this.txt_caa006);
+            this.panel1.Controls.Add(this.txt_itemNo);
             this.panel1.Controls.Add(this.lb_caa005);
             this.panel1.Controls.Add(this.txt_caa005);
             this.panel1.Controls.Add(this.lb_caa001);
             this.panel1.Controls.Add(this.txt_caa001);
             this.panel1.Controls.Add(this.lb_erpid);
-            this.panel1.Controls.Add(this.txt_erpid);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 200);
+            this.panel1.Size = new System.Drawing.Size(1126, 181);
             this.panel1.TabIndex = 1;
             // 
-            // txt_caa021
+            // txt_caa004
             // 
-            this.txt_caa021.IsReadly = false;
-            this.txt_caa021.Location = new System.Drawing.Point(95, 85);
-            this.txt_caa021.Name = "txt_caa021";
-            this.txt_caa021.Size = new System.Drawing.Size(150, 28);
-            this.txt_caa021.TabIndex = 451;
+            this.txt_caa004.Location = new System.Drawing.Point(587, 81);
+            this.txt_caa004.Name = "txt_caa004";
+            this.txt_caa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_caa004.Properties.Appearance.Options.UseFont = true;
+            this.txt_caa004.Size = new System.Drawing.Size(150, 28);
+            this.txt_caa004.TabIndex = 461;
+            // 
+            // labelControl4
+            // 
+            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl4.Appearance.Options.UseFont = true;
+            this.labelControl4.Location = new System.Drawing.Point(507, 85);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(68, 21);
+            this.labelControl4.TabIndex = 460;
+            this.labelControl4.Text = "鍗曟嵁绫诲瀷";
+            // 
+            // labelControl3
+            // 
+            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl3.Appearance.Options.UseFont = true;
+            this.labelControl3.Location = new System.Drawing.Point(507, 119);
+            this.labelControl3.Name = "labelControl3";
+            this.labelControl3.Size = new System.Drawing.Size(68, 21);
+            this.labelControl3.TabIndex = 458;
+            this.labelControl3.Text = "浜у搧瑙勬牸";
+            // 
+            // txt_itemModel
+            // 
+            this.txt_itemModel.Location = new System.Drawing.Point(587, 115);
+            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(150, 28);
+            this.txt_itemModel.TabIndex = 459;
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl1.Appearance.Options.UseFont = true;
+            this.labelControl1.Location = new System.Drawing.Point(260, 119);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(68, 21);
+            this.labelControl1.TabIndex = 456;
+            this.labelControl1.Text = "浜у搧鍚嶇О";
+            // 
+            // txt_itemName
+            // 
+            this.txt_itemName.Location = new System.Drawing.Point(336, 115);
+            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(150, 28);
+            this.txt_itemName.TabIndex = 457;
+            // 
+            // txt_gdzt
+            // 
+            this.txt_gdzt.Location = new System.Drawing.Point(587, 48);
+            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(150, 28);
+            this.txt_gdzt.TabIndex = 455;
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(507, 52);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(68, 21);
+            this.labelControl2.TabIndex = 454;
+            this.labelControl2.Text = "宸ュ崟鐘舵��";
+            // 
+            // txt_dptName
+            // 
+            this.txt_dptName.Location = new System.Drawing.Point(587, 16);
+            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(150, 28);
+            this.txt_dptName.TabIndex = 451;
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(905, 150);
+            this.labelControl11.Location = new System.Drawing.Point(1070, 35);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
             this.labelControl11.TabIndex = 130;
             this.labelControl11.Text = "涓婚敭锛�";
+            this.labelControl11.Visible = false;
             // 
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(956, 150);
+            this.lbGuid.Location = new System.Drawing.Point(1121, 35);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
+            this.lbGuid.Visible = false;
             // 
-            // gridColumn5
+            // lb_erpid
             // 
-            this.gridColumn5.Caption = "缁撴鏍囪瘑";
-            this.gridColumn5.MinWidth = 50;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 1;
-            this.gridColumn5.Width = 50;
+            this.lb_erpid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_erpid.Appearance.Options.UseFont = true;
+            this.lb_erpid.Location = new System.Drawing.Point(20, 52);
+            this.lb_erpid.Name = "lb_erpid";
+            this.lb_erpid.Size = new System.Drawing.Size(68, 21);
+            this.lb_erpid.TabIndex = 211;
+            this.lb_erpid.Text = "浠诲姟鍗曞彿";
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
+            this.picCheckBox.Location = new System.Drawing.Point(1001, 55);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 6;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // labelControl5
+            // 
+            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl5.Appearance.Options.UseFont = true;
+            this.labelControl5.Location = new System.Drawing.Point(780, 116);
+            this.labelControl5.Name = "labelControl5";
+            this.labelControl5.Size = new System.Drawing.Size(68, 21);
+            this.labelControl5.TabIndex = 462;
+            this.labelControl5.Text = "鐢熶骇缁勭粐";
+            // 
+            // txt_scOrg
+            // 
+            this.txt_scOrg.Location = new System.Drawing.Point(854, 112);
+            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(218, 28);
+            this.txt_scOrg.TabIndex = 463;
+            // 
+            // labelControl6
+            // 
+            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl6.Appearance.Options.UseFont = true;
+            this.labelControl6.Location = new System.Drawing.Point(780, 153);
+            this.labelControl6.Name = "labelControl6";
+            this.labelControl6.Size = new System.Drawing.Size(68, 21);
+            this.labelControl6.TabIndex = 464;
+            this.labelControl6.Text = "濮旀墭缁勭粐";
+            // 
+            // txt_wtOrg
+            // 
+            this.txt_wtOrg.Location = new System.Drawing.Point(854, 149);
+            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(218, 28);
+            this.txt_wtOrg.TabIndex = 465;
             // 
             // Frm_Womcaa
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_Womcaa";
+            this.Text = "鐢熶骇浠诲姟璁㈠崟";
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_caa009.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_caa006.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1403,6 +1664,14 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_caa004.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wtOrg.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1424,9 +1693,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1numerator;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1issueType;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtono;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1positionNo;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1cab014;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1cab012;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1cab009;
@@ -1445,39 +1712,21 @@
         private DevExpress.XtraEditors.LabelControl lb_saleOrderNo;
         private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrderNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_srcBillentryseq;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_srcBillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_srcBillType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createType;
 
         private DevExpress.XtraEditors.LabelControl lb_stockInlimitl;
-        private DevExpress.XtraEditors.TextEdit txt_stockInlimitl;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_stockInlimitl;
-
-        private DevExpress.XtraEditors.LabelControl lb_stockInlimith;
-        private DevExpress.XtraEditors.TextEdit txt_stockInlimith;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_stockInlimith;
-
-        private DevExpress.XtraEditors.LabelControl lb_depotCode;
-        private DevExpress.XtraEditors.TextEdit txt_depotCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+        private DevExpress.XtraEditors.TextEdit txt_caa024;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa024;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
 
         private DevExpress.XtraEditors.LabelControl lb_caa021;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa021;
-
-        private DevExpress.XtraEditors.LabelControl lb_caa020;
         private DevExpress.XtraEditors.TextEdit txt_caa020;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa020;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_caa019;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_caa018;
 
         private DevExpress.XtraEditors.LabelControl lb_caa016;
         private DevExpress.XtraEditors.TextEdit txt_caa016;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa016;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_caa015;
 
         private DevExpress.XtraEditors.LabelControl lb_caa012;
         private DevExpress.XtraEditors.TextEdit txt_caa012;
@@ -1492,11 +1741,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa010;
 
         private DevExpress.XtraEditors.LabelControl lb_caa009;
-        private DevExpress.XtraEditors.TextEdit txt_caa009;
+        private DevExpress.XtraEditors.TextEdit txt_dwName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa009;
 
         private DevExpress.XtraEditors.LabelControl lb_caa006;
-        private DevExpress.XtraEditors.TextEdit txt_caa006;
+        private DevExpress.XtraEditors.TextEdit txt_itemNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa006;
 
         private DevExpress.XtraEditors.LabelControl lb_caa005;
@@ -1506,19 +1755,59 @@
         private DevExpress.XtraEditors.LabelControl lb_caa001;
         private DevExpress.XtraEditors.TextEdit txt_caa001;
         private DevExpress.XtraGrid.Columns.GridColumn gv_caa001;
-
-        private DevExpress.XtraEditors.LabelControl lb_erpid;
-        private DevExpress.XtraEditors.TextEdit txt_erpid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private UserControl.UcLookWorkshop txt_caa021;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraEditors.TextEdit txt_dptName;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraEditors.LabelControl lb_erpid;
+        private DevExpress.XtraEditors.TextEdit txt_caa004;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private DevExpress.XtraEditors.LabelControl labelControl3;
+        private DevExpress.XtraEditors.TextEdit txt_itemModel;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
+        private DevExpress.XtraEditors.TextEdit txt_gdzt;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        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;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+        private DevExpress.XtraEditors.LabelControl labelControl6;
+        private DevExpress.XtraEditors.TextEdit txt_wtOrg;
+        private DevExpress.XtraEditors.LabelControl labelControl5;
+        private DevExpress.XtraEditors.TextEdit txt_scOrg;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3