From 5a59d052a17b52bb4dcd932ac6ecbde75da450e4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 04 三月 2025 17:37:35 +0800
Subject: [PATCH] erp

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs          |   14 
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs | 1809 +++++++++++++++++++++++--------------------
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs   |  556 +++++++------
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs           |    8 
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs  |   39 
 5 files changed, 1,298 insertions(+), 1,128 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index c19707b..c3b2c61 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -29,7 +29,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WwGd));
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -38,9 +37,9 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WwGd));
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
@@ -65,26 +64,28 @@
             this.gv_pcTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.txt_wgUser = new DevExpress.XtraEditors.TextEdit();
-            this.txt_wgTime = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
             this.txt_blUser = new DevExpress.XtraEditors.TextEdit();
             this.txt_blTime = new DevExpress.XtraEditors.TextEdit();
-            this.txt_blState = new DevExpress.XtraEditors.TextEdit();
-            this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
-            this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_wgTime = new DevExpress.XtraEditors.TextEdit();
+            this.txt_wgUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
+            this.txt_blState = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -128,9 +129,9 @@
             this.gvMx1dab001 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.xtraTabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
@@ -146,23 +147,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
             this.splitMx1.Panel2.SuspendLayout();
             this.splitMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_blUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_blTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_blState.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_blUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_blTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_blState.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -185,6 +186,7 @@
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -214,17 +216,6 @@
             this.xtraTabPage1,
             this.xtraTabPage2});
             // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
-            this.picCheckBox.Location = new System.Drawing.Point(892, 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 = 9;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
@@ -239,13 +230,13 @@
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
             // 
-            // split1.split1_Panel1
+            // split1.Panel1
             // 
             this.split1.Panel1.Controls.Add(this.gcMain1);
             this.split1.Panel1.Controls.Add(this.pageBar1);
             this.split1.Panel1.Text = "Panel1";
             // 
-            // split1.split1_Panel2
+            // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.Size = new System.Drawing.Size(1126, 570);
@@ -291,7 +282,9 @@
             this.gv_wgUser,
             this.gv_pcTime,
             this.gv_remark,
-            this.gridColumn7});
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -566,6 +559,26 @@
             this.gridColumn7.VisibleIndex = 19;
             this.gridColumn7.Width = 94;
             // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "閲囪喘璁㈠崟";
+            this.gridColumn8.FieldName = "cgd";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 20;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "閲囪喘璁㈠崟琛屽彿";
+            this.gridColumn9.FieldName = "cgdxh";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 21;
+            this.gridColumn9.Width = 94;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -592,192 +605,18 @@
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
             this.splitMx1.Name = "splitMx1";
             // 
-            // splitMx1.splitMx1_Panel1
+            // splitMx1.Panel1
             // 
             this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
             this.splitMx1.Panel1.Text = "Panel1";
             // 
-            // splitMx1.splitMx1_Panel2
+            // splitMx1.Panel2
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
             this.splitMx1.SplitterPosition = 147;
             this.splitMx1.TabIndex = 0;
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 108);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 28);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Text = "lbGuid";
-            this.lbGuid.Visible = false;
-            // 
-            // txt_remark
-            // 
-            this.txt_remark.Location = new System.Drawing.Point(119, 108);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Properties.ReadOnly = true;
-            this.txt_remark.Size = new System.Drawing.Size(160, 28);
-            this.txt_remark.StyleController = this.layoutMx1;
-            this.txt_remark.TabIndex = 312;
-            // 
-            // txt_wgUser
-            // 
-            this.txt_wgUser.Location = new System.Drawing.Point(661, 44);
-            this.txt_wgUser.Name = "txt_wgUser";
-            this.txt_wgUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_wgUser.Properties.ReadOnly = true;
-            this.txt_wgUser.Size = new System.Drawing.Size(160, 28);
-            this.txt_wgUser.StyleController = this.layoutMx1;
-            this.txt_wgUser.TabIndex = 262;
-            // 
-            // txt_wgTime
-            // 
-            this.txt_wgTime.Location = new System.Drawing.Point(661, 76);
-            this.txt_wgTime.Name = "txt_wgTime";
-            this.txt_wgTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
-            this.txt_wgTime.Properties.ReadOnly = true;
-            this.txt_wgTime.Size = new System.Drawing.Size(160, 28);
-            this.txt_wgTime.StyleController = this.layoutMx1;
-            this.txt_wgTime.TabIndex = 258;
-            // 
-            // txt_daa018
-            // 
-            this.txt_daa018.Location = new System.Drawing.Point(661, 12);
-            this.txt_daa018.Name = "txt_daa018";
-            this.txt_daa018.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa018.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa018.Properties.ReadOnly = true;
-            this.txt_daa018.Size = new System.Drawing.Size(160, 28);
-            this.txt_daa018.StyleController = this.layoutMx1;
-            this.txt_daa018.TabIndex = 252;
-            // 
-            // txt_blUser
-            // 
-            this.txt_blUser.Location = new System.Drawing.Point(390, 108);
-            this.txt_blUser.Name = "txt_blUser";
-            this.txt_blUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_blUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_blUser.Properties.ReadOnly = true;
-            this.txt_blUser.Size = new System.Drawing.Size(160, 28);
-            this.txt_blUser.StyleController = this.layoutMx1;
-            this.txt_blUser.TabIndex = 247;
-            // 
-            // txt_blTime
-            // 
-            this.txt_blTime.Location = new System.Drawing.Point(661, 108);
-            this.txt_blTime.Name = "txt_blTime";
-            this.txt_blTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_blTime.Properties.Appearance.Options.UseFont = true;
-            this.txt_blTime.Properties.ReadOnly = true;
-            this.txt_blTime.Size = new System.Drawing.Size(160, 28);
-            this.txt_blTime.StyleController = this.layoutMx1;
-            this.txt_blTime.TabIndex = 243;
-            // 
-            // txt_blState
-            // 
-            this.txt_blState.Location = new System.Drawing.Point(932, 76);
-            this.txt_blState.Name = "txt_blState";
-            this.txt_blState.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_blState.Properties.Appearance.Options.UseFont = true;
-            this.txt_blState.Properties.ReadOnly = true;
-            this.txt_blState.Size = new System.Drawing.Size(161, 28);
-            this.txt_blState.StyleController = this.layoutMx1;
-            this.txt_blState.TabIndex = 240;
-            // 
-            // txt_mesEndProd
-            // 
-            this.txt_mesEndProd.Location = new System.Drawing.Point(932, 44);
-            this.txt_mesEndProd.Name = "txt_mesEndProd";
-            this.txt_mesEndProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Properties.ReadOnly = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(161, 28);
-            this.txt_mesEndProd.StyleController = this.layoutMx1;
-            this.txt_mesEndProd.TabIndex = 235;
-            // 
-            // txt_mesStartProd
-            // 
-            this.txt_mesStartProd.Location = new System.Drawing.Point(932, 12);
-            this.txt_mesStartProd.Name = "txt_mesStartProd";
-            this.txt_mesStartProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Properties.ReadOnly = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(161, 28);
-            this.txt_mesStartProd.StyleController = this.layoutMx1;
-            this.txt_mesStartProd.TabIndex = 231;
-            // 
-            // txt_daa011
-            // 
-            this.txt_daa011.Location = new System.Drawing.Point(119, 76);
-            this.txt_daa011.Name = "txt_daa011";
-            this.txt_daa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Properties.ReadOnly = true;
-            this.txt_daa011.Size = new System.Drawing.Size(160, 28);
-            this.txt_daa011.StyleController = this.layoutMx1;
-            this.txt_daa011.TabIndex = 228;
-            // 
-            // txt_daa014
-            // 
-            this.txt_daa014.Location = new System.Drawing.Point(390, 12);
-            this.txt_daa014.Name = "txt_daa014";
-            this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Properties.ReadOnly = true;
-            this.txt_daa014.Size = new System.Drawing.Size(160, 28);
-            this.txt_daa014.StyleController = this.layoutMx1;
-            this.txt_daa014.TabIndex = 226;
-            // 
-            // txt_dwName
-            // 
-            this.txt_dwName.Location = new System.Drawing.Point(390, 76);
-            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.Properties.ReadOnly = true;
-            this.txt_dwName.Size = new System.Drawing.Size(160, 28);
-            this.txt_dwName.StyleController = this.layoutMx1;
-            this.txt_dwName.TabIndex = 222;
-            // 
-            // txt_daa008
-            // 
-            this.txt_daa008.Location = new System.Drawing.Point(390, 44);
-            this.txt_daa008.Name = "txt_daa008";
-            this.txt_daa008.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Properties.ReadOnly = true;
-            this.txt_daa008.Size = new System.Drawing.Size(160, 28);
-            this.txt_daa008.StyleController = this.layoutMx1;
-            this.txt_daa008.TabIndex = 219;
-            // 
-            // txt_itemNo
-            // 
-            this.txt_itemNo.Location = new System.Drawing.Point(119, 44);
-            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.Properties.ReadOnly = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(160, 28);
-            this.txt_itemNo.StyleController = this.layoutMx1;
-            this.txt_itemNo.TabIndex = 217;
-            // 
-            // txt_daa001
-            // 
-            this.txt_daa001.Location = new System.Drawing.Point(119, 12);
-            this.txt_daa001.Name = "txt_daa001";
-            this.txt_daa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Properties.ReadOnly = true;
-            this.txt_daa001.Size = new System.Drawing.Size(160, 28);
-            this.txt_daa001.StyleController = this.layoutMx1;
-            this.txt_daa001.TabIndex = 216;
             // 
             // layoutMx1
             // 
@@ -805,6 +644,180 @@
             this.layoutMx1.Size = new System.Drawing.Size(1126, 147);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(840, 108);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(274, 28);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_remark
+            // 
+            this.txt_remark.Location = new System.Drawing.Point(119, 108);
+            this.txt_remark.Name = "txt_remark";
+            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_remark.Properties.ReadOnly = true;
+            this.txt_remark.Size = new System.Drawing.Size(165, 28);
+            this.txt_remark.StyleController = this.layoutMx1;
+            this.txt_remark.TabIndex = 312;
+            // 
+            // txt_blUser
+            // 
+            this.txt_blUser.Location = new System.Drawing.Point(395, 108);
+            this.txt_blUser.Name = "txt_blUser";
+            this.txt_blUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_blUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_blUser.Properties.ReadOnly = true;
+            this.txt_blUser.Size = new System.Drawing.Size(165, 28);
+            this.txt_blUser.StyleController = this.layoutMx1;
+            this.txt_blUser.TabIndex = 247;
+            // 
+            // txt_blTime
+            // 
+            this.txt_blTime.Location = new System.Drawing.Point(671, 108);
+            this.txt_blTime.Name = "txt_blTime";
+            this.txt_blTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_blTime.Properties.Appearance.Options.UseFont = true;
+            this.txt_blTime.Properties.ReadOnly = true;
+            this.txt_blTime.Size = new System.Drawing.Size(165, 28);
+            this.txt_blTime.StyleController = this.layoutMx1;
+            this.txt_blTime.TabIndex = 243;
+            // 
+            // txt_daa001
+            // 
+            this.txt_daa001.Location = new System.Drawing.Point(119, 12);
+            this.txt_daa001.Name = "txt_daa001";
+            this.txt_daa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_daa001.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa001.Properties.ReadOnly = true;
+            this.txt_daa001.Size = new System.Drawing.Size(165, 28);
+            this.txt_daa001.StyleController = this.layoutMx1;
+            this.txt_daa001.TabIndex = 216;
+            // 
+            // txt_wgTime
+            // 
+            this.txt_wgTime.Location = new System.Drawing.Point(671, 76);
+            this.txt_wgTime.Name = "txt_wgTime";
+            this.txt_wgTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
+            this.txt_wgTime.Properties.ReadOnly = true;
+            this.txt_wgTime.Size = new System.Drawing.Size(165, 28);
+            this.txt_wgTime.StyleController = this.layoutMx1;
+            this.txt_wgTime.TabIndex = 258;
+            // 
+            // txt_wgUser
+            // 
+            this.txt_wgUser.Location = new System.Drawing.Point(671, 44);
+            this.txt_wgUser.Name = "txt_wgUser";
+            this.txt_wgUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_wgUser.Properties.ReadOnly = true;
+            this.txt_wgUser.Size = new System.Drawing.Size(165, 28);
+            this.txt_wgUser.StyleController = this.layoutMx1;
+            this.txt_wgUser.TabIndex = 262;
+            // 
+            // txt_daa014
+            // 
+            this.txt_daa014.Location = new System.Drawing.Point(395, 12);
+            this.txt_daa014.Name = "txt_daa014";
+            this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa014.Properties.ReadOnly = true;
+            this.txt_daa014.Size = new System.Drawing.Size(165, 28);
+            this.txt_daa014.StyleController = this.layoutMx1;
+            this.txt_daa014.TabIndex = 226;
+            // 
+            // txt_daa018
+            // 
+            this.txt_daa018.Location = new System.Drawing.Point(671, 12);
+            this.txt_daa018.Name = "txt_daa018";
+            this.txt_daa018.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_daa018.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa018.Properties.ReadOnly = true;
+            this.txt_daa018.Size = new System.Drawing.Size(165, 28);
+            this.txt_daa018.StyleController = this.layoutMx1;
+            this.txt_daa018.TabIndex = 252;
+            // 
+            // txt_mesStartProd
+            // 
+            this.txt_mesStartProd.Location = new System.Drawing.Point(947, 12);
+            this.txt_mesStartProd.Name = "txt_mesStartProd";
+            this.txt_mesStartProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
+            this.txt_mesStartProd.Properties.ReadOnly = true;
+            this.txt_mesStartProd.Size = new System.Drawing.Size(167, 28);
+            this.txt_mesStartProd.StyleController = this.layoutMx1;
+            this.txt_mesStartProd.TabIndex = 231;
+            // 
+            // txt_blState
+            // 
+            this.txt_blState.Location = new System.Drawing.Point(947, 76);
+            this.txt_blState.Name = "txt_blState";
+            this.txt_blState.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_blState.Properties.Appearance.Options.UseFont = true;
+            this.txt_blState.Properties.ReadOnly = true;
+            this.txt_blState.Size = new System.Drawing.Size(167, 28);
+            this.txt_blState.StyleController = this.layoutMx1;
+            this.txt_blState.TabIndex = 240;
+            // 
+            // txt_itemNo
+            // 
+            this.txt_itemNo.Location = new System.Drawing.Point(119, 44);
+            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.Properties.ReadOnly = true;
+            this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
+            this.txt_itemNo.StyleController = this.layoutMx1;
+            this.txt_itemNo.TabIndex = 217;
+            // 
+            // txt_daa008
+            // 
+            this.txt_daa008.Location = new System.Drawing.Point(395, 44);
+            this.txt_daa008.Name = "txt_daa008";
+            this.txt_daa008.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_daa008.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa008.Properties.ReadOnly = true;
+            this.txt_daa008.Size = new System.Drawing.Size(165, 28);
+            this.txt_daa008.StyleController = this.layoutMx1;
+            this.txt_daa008.TabIndex = 219;
+            // 
+            // txt_mesEndProd
+            // 
+            this.txt_mesEndProd.Location = new System.Drawing.Point(947, 44);
+            this.txt_mesEndProd.Name = "txt_mesEndProd";
+            this.txt_mesEndProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
+            this.txt_mesEndProd.Properties.ReadOnly = true;
+            this.txt_mesEndProd.Size = new System.Drawing.Size(167, 28);
+            this.txt_mesEndProd.StyleController = this.layoutMx1;
+            this.txt_mesEndProd.TabIndex = 235;
+            // 
+            // txt_daa011
+            // 
+            this.txt_daa011.Location = new System.Drawing.Point(119, 76);
+            this.txt_daa011.Name = "txt_daa011";
+            this.txt_daa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_daa011.Properties.Appearance.Options.UseFont = true;
+            this.txt_daa011.Properties.ReadOnly = true;
+            this.txt_daa011.Size = new System.Drawing.Size(165, 28);
+            this.txt_daa011.StyleController = this.layoutMx1;
+            this.txt_daa011.TabIndex = 228;
+            // 
+            // txt_dwName
+            // 
+            this.txt_dwName.Location = new System.Drawing.Point(395, 76);
+            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.Properties.ReadOnly = true;
+            this.txt_dwName.Size = new System.Drawing.Size(165, 28);
+            this.txt_dwName.StyleController = this.layoutMx1;
+            this.txt_dwName.TabIndex = 222;
             // 
             // Root
             // 
@@ -855,7 +868,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1105, 148);
+            this.Root.Size = new System.Drawing.Size(1126, 148);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -863,37 +876,37 @@
             this.layoutControlItem1.Control = this.txt_daa001;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem1.Text = "宸ュ崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_daa014;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa018;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_mesStartProd;
-            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂� ";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
             // 
@@ -903,40 +916,40 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem5.Text = "鐗╂枡";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_daa008;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem6.Location = new System.Drawing.Point(276, 32);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_wgUser;
-            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem7.Location = new System.Drawing.Point(552, 32);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem7.Text = "瀹屽伐浜� ";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_mesEndProd;
-            this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(828, 32);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿 ";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
             // 
@@ -946,40 +959,40 @@
             this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem9.Text = "鐢熶骇鏁�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_dwName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
+            this.layoutControlItem10.Location = new System.Drawing.Point(276, 64);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem10.Text = "鍗曚綅";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_wgTime;
-            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
+            this.layoutControlItem11.Location = new System.Drawing.Point(552, 64);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem11.Text = "瀹屽伐鏃堕棿 ";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_blState;
-            this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem12.Location = new System.Drawing.Point(828, 64);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem12.Text = "澶囨枡鐘舵�� ";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
             // 
@@ -989,40 +1002,40 @@
             this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem13.Text = "澶囨敞";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_blUser;
-            this.layoutControlItem14.Location = new System.Drawing.Point(271, 96);
+            this.layoutControlItem14.Location = new System.Drawing.Point(276, 96);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem14.Text = "澶囨枡浜� ";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_blTime;
-            this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem15.Location = new System.Drawing.Point(552, 96);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem15.Text = "澶囨枡鏃堕棿 ";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.lbGuid;
-            this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem16.Location = new System.Drawing.Point(828, 96);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem16.Text = "lbGuid";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem16.TextVisible = false;
@@ -1365,6 +1378,17 @@
             this.gvMx1dab002.VisibleIndex = 15;
             this.gvMx1dab002.Width = 50;
             // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
+            this.picCheckBox.Location = new System.Drawing.Point(892, 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 = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
             // Frm_WwGd
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1377,7 +1401,6 @@
             this.Text = "濮斿宸ュ崟";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.xtraTabPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
             this.split1.Panel1.ResumeLayout(false);
@@ -1393,23 +1416,23 @@
             this.splitMx1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
             this.splitMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_blUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_blTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_blState.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_blUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_blTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wgTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_blState.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1432,6 +1455,7 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1526,5 +1550,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab001;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab012;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab002;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
index 1397760..301b5a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
@@ -29,19 +29,65 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_outType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -55,246 +101,737 @@
             this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
-            this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_outType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_outType = new DevExpress.XtraEditors.TextEdit();
-            this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_workNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
-            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_status = new DevExpress.XtraEditors.LabelControl();
-            this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
-            this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = 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_depotName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
-            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.Panel2.SuspendLayout();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            this.tabMxPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.SuspendLayout();
             // 
-            // tabMxPage2
+            // toolBarMenu1
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 423);
-            this.tabMxPage2.Text = "鍑哄簱鏉$爜";
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
             // 
-            // gcMx2
+            // xtraTabControl1
             // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
-            this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1124, 423);
-            this.gcMx2.TabIndex = 1;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
             // 
-            // gvMx2
+            // xtraTabPage1
             // 
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2itemBarcode,
-            this.gvMx2itemNo,
-            this.gvMx2lotNo,
-            this.gridColumn5,
-            this.gvMx2quantity,
-            this.gvMx2depotCode,
-            this.gvMx2depotSectionCode,
-            this.gridColumn6,
-            this.gridColumn7,
-            this.gvMx2remark});
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
-            // gvMx2itemBarcode
+            // split1
             // 
-            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 0;
-            this.gvMx2itemBarcode.Width = 94;
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Name = "split1";
             // 
-            // gvMx2itemNo
+            // split1.Panel1
             // 
-            this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
-            this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 50;
-            this.gvMx2itemNo.Name = "gvMx2itemNo";
-            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
-            this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 1;
-            this.gvMx2itemNo.Width = 94;
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
             // 
-            // gvMx2lotNo
+            // split1.Panel2
             // 
-            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
-            this.gvMx2lotNo.FieldName = "itemName";
-            this.gvMx2lotNo.MinWidth = 50;
-            this.gvMx2lotNo.Name = "gvMx2lotNo";
-            this.gvMx2lotNo.Tag = "query_a.LOT_NO";
-            this.gvMx2lotNo.Visible = true;
-            this.gvMx2lotNo.VisibleIndex = 2;
-            this.gvMx2lotNo.Width = 94;
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.SplitterPosition = 558;
+            this.split1.TabIndex = 0;
             // 
-            // gridColumn5
+            // gcMain1
             // 
-            this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn5.FieldName = "itemModel";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 3;
-            this.gridColumn5.Width = 94;
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
             // 
-            // gvMx2quantity
+            // gridView1
             // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺";
-            this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.MinWidth = 50;
-            this.gvMx2quantity.Name = "gvMx2quantity";
-            this.gvMx2quantity.Tag = "query_a.QUANTITY";
-            this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 4;
-            this.gvMx2quantity.Width = 94;
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_status,
+            this.gv_itemOutNo,
+            this.gv_workNo,
+            this.gv_pbillNo,
+            this.gv_boardItem,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gv_outDate,
+            this.gv_outType,
+            this.gv_checkUser,
+            this.gv_checkDate,
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gv_remark});
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
-            // gvMx2depotCode
+            // gv_status
             // 
-            this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
-            this.gvMx2depotCode.FieldName = "depotCode";
-            this.gvMx2depotCode.MinWidth = 50;
-            this.gvMx2depotCode.Name = "gvMx2depotCode";
-            this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
-            this.gvMx2depotCode.Visible = true;
-            this.gvMx2depotCode.VisibleIndex = 5;
-            this.gvMx2depotCode.Width = 94;
+            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_status.AppearanceCell.Options.UseFont = true;
+            this.gv_status.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_status.FieldName = "statusChk";
+            this.gv_status.MaxWidth = 50;
+            this.gv_status.MinWidth = 50;
+            this.gv_status.Name = "gv_status";
+            this.gv_status.OptionsColumn.AllowEdit = false;
+            this.gv_status.Tag = "query_a.status";
+            this.gv_status.Visible = true;
+            this.gv_status.VisibleIndex = 0;
+            this.gv_status.Width = 50;
             // 
-            // gvMx2depotSectionCode
+            // gv_itemOutNo
             // 
-            this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
-            this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
-            this.gvMx2depotSectionCode.MinWidth = 50;
-            this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
-            this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
-            this.gvMx2depotSectionCode.Visible = true;
-            this.gvMx2depotSectionCode.VisibleIndex = 6;
-            this.gvMx2depotSectionCode.Width = 94;
+            this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
+            this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
+            this.gv_itemOutNo.FieldName = "itemOutNo";
+            this.gv_itemOutNo.MinWidth = 100;
+            this.gv_itemOutNo.Name = "gv_itemOutNo";
+            this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
+            this.gv_itemOutNo.Tag = "query_a.item_out_no";
+            this.gv_itemOutNo.Visible = true;
+            this.gv_itemOutNo.VisibleIndex = 1;
+            this.gv_itemOutNo.Width = 150;
             // 
-            // gridColumn6
+            // gv_workNo
             // 
-            this.gridColumn6.Caption = "寤虹珛鑰�";
-            this.gridColumn6.FieldName = "createBy";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 7;
-            this.gridColumn6.Width = 94;
+            this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_workNo.AppearanceCell.Options.UseFont = true;
+            this.gv_workNo.Caption = "浠诲姟鍗曞彿";
+            this.gv_workNo.FieldName = "workNo";
+            this.gv_workNo.MinWidth = 100;
+            this.gv_workNo.Name = "gv_workNo";
+            this.gv_workNo.OptionsColumn.AllowEdit = false;
+            this.gv_workNo.Tag = "query_a.work_no";
+            this.gv_workNo.Visible = true;
+            this.gv_workNo.VisibleIndex = 2;
+            this.gv_workNo.Width = 100;
             // 
-            // gridColumn7
+            // gv_pbillNo
             // 
-            this.gridColumn7.Caption = "寤虹珛鏃堕棿";
-            this.gridColumn7.FieldName = "createDate";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 8;
-            this.gridColumn7.Width = 94;
+            this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
+            this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
+            this.gv_pbillNo.FieldName = "pbillNo";
+            this.gv_pbillNo.MinWidth = 50;
+            this.gv_pbillNo.Name = "gv_pbillNo";
+            this.gv_pbillNo.OptionsColumn.AllowEdit = false;
+            this.gv_pbillNo.Tag = "query_a.pbill_no";
+            this.gv_pbillNo.Visible = true;
+            this.gv_pbillNo.VisibleIndex = 3;
+            this.gv_pbillNo.Width = 94;
             // 
-            // gvMx2remark
+            // gv_boardItem
             // 
-            this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
-            this.gvMx2remark.Caption = "澶囨敞 ";
-            this.gvMx2remark.FieldName = "remark";
-            this.gvMx2remark.MinWidth = 50;
-            this.gvMx2remark.Name = "gvMx2remark";
-            this.gvMx2remark.Tag = "query_a.REMARK";
-            this.gvMx2remark.Visible = true;
-            this.gvMx2remark.VisibleIndex = 9;
-            this.gvMx2remark.Width = 94;
+            this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_boardItem.AppearanceCell.Options.UseFont = true;
+            this.gv_boardItem.Caption = "浜у搧缂栫爜";
+            this.gv_boardItem.FieldName = "itemNo";
+            this.gv_boardItem.MinWidth = 50;
+            this.gv_boardItem.Name = "gv_boardItem";
+            this.gv_boardItem.OptionsColumn.AllowEdit = false;
+            this.gv_boardItem.Tag = "query_a.board_item";
+            this.gv_boardItem.Visible = true;
+            this.gv_boardItem.VisibleIndex = 4;
+            this.gv_boardItem.Width = 94;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "浜у搧鍚嶇О";
+            this.gridColumn1.FieldName = "itemName";
+            this.gridColumn1.MinWidth = 120;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 120;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "浜у搧瑙勬牸";
+            this.gridColumn2.FieldName = "itemModel";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 6;
+            this.gridColumn2.Width = 94;
+            // 
+            // gv_outDate
+            // 
+            this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_outDate.AppearanceCell.Options.UseFont = true;
+            this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
+            this.gv_outDate.FieldName = "outDate";
+            this.gv_outDate.MinWidth = 120;
+            this.gv_outDate.Name = "gv_outDate";
+            this.gv_outDate.OptionsColumn.AllowEdit = false;
+            this.gv_outDate.Tag = "query_a.out_date";
+            this.gv_outDate.Visible = true;
+            this.gv_outDate.VisibleIndex = 7;
+            this.gv_outDate.Width = 120;
+            // 
+            // gv_outType
+            // 
+            this.gv_outType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_outType.AppearanceCell.Options.UseFont = true;
+            this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
+            this.gv_outType.FieldName = "outType";
+            this.gv_outType.MinWidth = 50;
+            this.gv_outType.Name = "gv_outType";
+            this.gv_outType.OptionsColumn.AllowEdit = false;
+            this.gv_outType.Tag = "query_a.out_type";
+            this.gv_outType.Visible = true;
+            this.gv_outType.VisibleIndex = 8;
+            this.gv_outType.Width = 94;
+            // 
+            // gv_checkUser
+            // 
+            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+            this.gv_checkUser.Caption = "瀹℃牳浜� ";
+            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.MinWidth = 50;
+            this.gv_checkUser.Name = "gv_checkUser";
+            this.gv_checkUser.OptionsColumn.AllowEdit = false;
+            this.gv_checkUser.Tag = "query_a.check_user";
+            this.gv_checkUser.Visible = true;
+            this.gv_checkUser.VisibleIndex = 9;
+            this.gv_checkUser.Width = 94;
+            // 
+            // gv_checkDate
+            // 
+            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+            this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
+            this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.MinWidth = 120;
+            this.gv_checkDate.Name = "gv_checkDate";
+            this.gv_checkDate.OptionsColumn.AllowEdit = false;
+            this.gv_checkDate.Tag = "query_a.check_date";
+            this.gv_checkDate.Visible = true;
+            this.gv_checkDate.VisibleIndex = 10;
+            this.gv_checkDate.Width = 120;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "鍒涘缓浜�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 50;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.create_by";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 11;
+            this.gv_createBy.Width = 94;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 50;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.create_date";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 12;
+            this.gv_createDate.Width = 94;
+            // 
+            // gv_remark
+            // 
+            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark.AppearanceCell.Options.UseFont = true;
+            this.gv_remark.Caption = "澶囨敞淇℃伅 ";
+            this.gv_remark.FieldName = "remark";
+            this.gv_remark.MinWidth = 50;
+            this.gv_remark.Name = "gv_remark";
+            this.gv_remark.OptionsColumn.AllowEdit = false;
+            this.gv_remark.Tag = "query_a.remark";
+            this.gv_remark.Visible = true;
+            this.gv_remark.VisibleIndex = 13;
+            this.gv_remark.Width = 94;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Controls.Add(this.tabMx);
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+            this.splitMx1.SplitterPosition = 119;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_depotName);
+            this.layoutMx1.Controls.Add(this.txt_remark);
+            this.layoutMx1.Controls.Add(this.txt_outType);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_pbillNo);
+            this.layoutMx1.Controls.Add(this.txt_itemOutNo);
+            this.layoutMx1.Controls.Add(this.txt_workNo);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_checkUser);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
+            this.layoutMx1.Controls.Add(this.txt_status);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 119);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(825, 76);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_depotName
+            // 
+            this.txt_depotName.Location = new System.Drawing.Point(355, 12);
+            this.txt_depotName.Name = "txt_depotName";
+            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotName.Size = new System.Drawing.Size(195, 28);
+            this.txt_depotName.StyleController = this.layoutMx1;
+            this.txt_depotName.TabIndex = 575;
+            // 
+            // txt_remark
+            // 
+            this.txt_remark.Location = new System.Drawing.Point(355, 76);
+            this.txt_remark.Name = "txt_remark";
+            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_remark.Size = new System.Drawing.Size(195, 28);
+            this.txt_remark.StyleController = this.layoutMx1;
+            this.txt_remark.TabIndex = 243;
+            // 
+            // txt_outType
+            // 
+            this.txt_outType.Location = new System.Drawing.Point(355, 44);
+            this.txt_outType.Name = "txt_outType";
+            this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_outType.Properties.Appearance.Options.UseFont = true;
+            this.txt_outType.Size = new System.Drawing.Size(195, 28);
+            this.txt_outType.StyleController = this.layoutMx1;
+            this.txt_outType.TabIndex = 450;
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(897, 44);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkDate.Size = new System.Drawing.Size(196, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 262;
+            // 
+            // txt_pbillNo
+            // 
+            this.txt_pbillNo.Location = new System.Drawing.Point(84, 76);
+            this.txt_pbillNo.Name = "txt_pbillNo";
+            this.txt_pbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_pbillNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_pbillNo.Size = new System.Drawing.Size(195, 28);
+            this.txt_pbillNo.StyleController = this.layoutMx1;
+            this.txt_pbillNo.TabIndex = 216;
+            // 
+            // txt_itemOutNo
+            // 
+            this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_itemOutNo.Name = "txt_itemOutNo";
+            this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_itemOutNo.Size = new System.Drawing.Size(195, 28);
+            this.txt_itemOutNo.StyleController = this.layoutMx1;
+            this.txt_itemOutNo.TabIndex = 213;
+            // 
+            // txt_workNo
+            // 
+            this.txt_workNo.Location = new System.Drawing.Point(84, 44);
+            this.txt_workNo.Name = "txt_workNo";
+            this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_workNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_workNo.Size = new System.Drawing.Size(195, 28);
+            this.txt_workNo.StyleController = this.layoutMx1;
+            this.txt_workNo.TabIndex = 387;
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(626, 12);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(195, 28);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 222;
+            // 
+            // txt_checkUser
+            // 
+            this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
+            this.txt_checkUser.Name = "txt_checkUser";
+            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkUser.Size = new System.Drawing.Size(196, 28);
+            this.txt_checkUser.StyleController = this.layoutMx1;
+            this.txt_checkUser.TabIndex = 258;
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(626, 44);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(195, 28);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 226;
+            // 
+            // txt_status
+            // 
+            this.txt_status.Location = new System.Drawing.Point(554, 76);
+            this.txt_status.Name = "txt_status";
+            this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_status.Size = new System.Drawing.Size(267, 24);
+            this.txt_status.StyleController = this.layoutMx1;
+            this.txt_status.TabIndex = 576;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem9,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem12});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
+            this.Root.Size = new System.Drawing.Size(1105, 148);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_itemOutNo;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_depotName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Text = "鍙戣揣浠撳簱";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_createBy;
+            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Text = "鍒涘缓浜�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_checkUser;
+            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem4.Text = "瀹℃牳浜�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_workNo;
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_outType;
+            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem6.Text = "鍑哄簱绫诲埆";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_createDate;
+            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_pbillNo;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Text = "鐢熶骇璁㈠崟";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_remark;
+            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem10.Text = "澶囨敞淇℃伅";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_status;
+            this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem11.TextVisible = false;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.lbGuid;
+            this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.TextVisible = false;
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(968, 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 = 10;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // tabMx
+            // 
+            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(1126, 439);
+            this.tabMx.TabIndex = 3;
+            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.tabMxPage1,
+            this.tabMxPage2});
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 423);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 407);
             this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
             // 
             // gcMx1
@@ -303,7 +840,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, 423);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 407);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -449,574 +986,163 @@
             this.gridColumn4.VisibleIndex = 7;
             this.gridColumn4.Width = 94;
             // 
-            // lb_depotId
+            // tabMxPage2
             // 
-            this.lb_depotId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_depotId.Appearance.Options.UseFont = true;
-            this.lb_depotId.Location = new System.Drawing.Point(271, 20);
-            this.lb_depotId.Name = "lb_depotId";
-            this.lb_depotId.Size = new System.Drawing.Size(68, 21);
-            this.lb_depotId.TabIndex = 571;
-            this.lb_depotId.Text = "鍙戣揣浠撳簱";
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 538);
+            this.tabMxPage2.Text = "鍑哄簱鏉$爜";
             // 
-            // gv_pbillNo
+            // gcMx2
             // 
-            this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
-            this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
-            this.gv_pbillNo.FieldName = "pbillNo";
-            this.gv_pbillNo.MinWidth = 50;
-            this.gv_pbillNo.Name = "gv_pbillNo";
-            this.gv_pbillNo.OptionsColumn.AllowEdit = false;
-            this.gv_pbillNo.Tag = "query_a.pbill_no";
-            this.gv_pbillNo.Visible = true;
-            this.gv_pbillNo.VisibleIndex = 3;
-            this.gv_pbillNo.Width = 94;
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1124, 538);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
             // 
-            // gv_boardItem
+            // gvMx2
             // 
-            this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_boardItem.AppearanceCell.Options.UseFont = true;
-            this.gv_boardItem.Caption = "浜у搧缂栫爜";
-            this.gv_boardItem.FieldName = "itemNo";
-            this.gv_boardItem.MinWidth = 50;
-            this.gv_boardItem.Name = "gv_boardItem";
-            this.gv_boardItem.OptionsColumn.AllowEdit = false;
-            this.gv_boardItem.Tag = "query_a.board_item";
-            this.gv_boardItem.Visible = true;
-            this.gv_boardItem.VisibleIndex = 4;
-            this.gv_boardItem.Width = 94;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2itemBarcode,
+            this.gvMx2itemNo,
+            this.gvMx2lotNo,
+            this.gridColumn5,
+            this.gvMx2quantity,
+            this.gvMx2depotCode,
+            this.gvMx2depotSectionCode,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gvMx2remark});
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
-            // lb_outType
+            // gvMx2itemBarcode
             // 
-            this.lb_outType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_outType.Appearance.Options.UseFont = true;
-            this.lb_outType.Location = new System.Drawing.Point(271, 52);
-            this.lb_outType.Name = "lb_outType";
-            this.lb_outType.Size = new System.Drawing.Size(68, 21);
-            this.lb_outType.TabIndex = 450;
-            this.lb_outType.Text = "鍑哄簱绫诲埆";
+            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx2itemBarcode.FieldName = "itemBarcode";
+            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx2itemBarcode.Visible = true;
+            this.gvMx2itemBarcode.VisibleIndex = 0;
+            this.gvMx2itemBarcode.Width = 94;
             // 
-            // txt_outType
+            // gvMx2itemNo
             // 
-            this.txt_outType.Location = new System.Drawing.Point(342, 48);
-            this.txt_outType.Name = "txt_outType";
-            this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_outType.Properties.Appearance.Options.UseFont = true;
-            this.txt_outType.Size = new System.Drawing.Size(184, 28);
-            this.txt_outType.TabIndex = 450;
+            this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
+            this.gvMx2itemNo.FieldName = "itemNo";
+            this.gvMx2itemNo.MinWidth = 50;
+            this.gvMx2itemNo.Name = "gvMx2itemNo";
+            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
+            this.gvMx2itemNo.Visible = true;
+            this.gvMx2itemNo.VisibleIndex = 1;
+            this.gvMx2itemNo.Width = 94;
             // 
-            // gv_outType
+            // gvMx2lotNo
             // 
-            this.gv_outType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_outType.AppearanceCell.Options.UseFont = true;
-            this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
-            this.gv_outType.FieldName = "outType";
-            this.gv_outType.MinWidth = 50;
-            this.gv_outType.Name = "gv_outType";
-            this.gv_outType.OptionsColumn.AllowEdit = false;
-            this.gv_outType.Tag = "query_a.out_type";
-            this.gv_outType.Visible = true;
-            this.gv_outType.VisibleIndex = 8;
-            this.gv_outType.Width = 94;
+            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx2lotNo.FieldName = "itemName";
+            this.gvMx2lotNo.MinWidth = 50;
+            this.gvMx2lotNo.Name = "gvMx2lotNo";
+            this.gvMx2lotNo.Tag = "query_a.LOT_NO";
+            this.gvMx2lotNo.Visible = true;
+            this.gvMx2lotNo.VisibleIndex = 2;
+            this.gvMx2lotNo.Width = 94;
             // 
-            // lb_workNo
+            // gridColumn5
             // 
-            this.lb_workNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_workNo.Appearance.Options.UseFont = true;
-            this.lb_workNo.Location = new System.Drawing.Point(20, 52);
-            this.lb_workNo.Name = "lb_workNo";
-            this.lb_workNo.Size = new System.Drawing.Size(68, 21);
-            this.lb_workNo.TabIndex = 387;
-            this.lb_workNo.Text = "鎶曟枡鍗曞彿";
+            this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn5.FieldName = "itemModel";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 94;
             // 
-            // txt_workNo
+            // gvMx2quantity
             // 
-            this.txt_workNo.Location = new System.Drawing.Point(89, 48);
-            this.txt_workNo.Name = "txt_workNo";
-            this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_workNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_workNo.Size = new System.Drawing.Size(176, 28);
-            this.txt_workNo.TabIndex = 387;
+            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx2quantity.Caption = "鏁伴噺";
+            this.gvMx2quantity.FieldName = "quantity";
+            this.gvMx2quantity.MinWidth = 50;
+            this.gvMx2quantity.Name = "gvMx2quantity";
+            this.gvMx2quantity.Tag = "query_a.QUANTITY";
+            this.gvMx2quantity.Visible = true;
+            this.gvMx2quantity.VisibleIndex = 4;
+            this.gvMx2quantity.Width = 94;
             // 
-            // gv_workNo
+            // gvMx2depotCode
             // 
-            this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_workNo.AppearanceCell.Options.UseFont = true;
-            this.gv_workNo.Caption = "浠诲姟鍗曞彿";
-            this.gv_workNo.FieldName = "workNo";
-            this.gv_workNo.MinWidth = 100;
-            this.gv_workNo.Name = "gv_workNo";
-            this.gv_workNo.OptionsColumn.AllowEdit = false;
-            this.gv_workNo.Tag = "query_a.work_no";
-            this.gv_workNo.Visible = true;
-            this.gv_workNo.VisibleIndex = 2;
-            this.gv_workNo.Width = 100;
+            this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
+            this.gvMx2depotCode.FieldName = "depotCode";
+            this.gvMx2depotCode.MinWidth = 50;
+            this.gvMx2depotCode.Name = "gvMx2depotCode";
+            this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
+            this.gvMx2depotCode.Visible = true;
+            this.gvMx2depotCode.VisibleIndex = 5;
+            this.gvMx2depotCode.Width = 94;
             // 
-            // gv_outDate
+            // gvMx2depotSectionCode
             // 
-            this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_outDate.AppearanceCell.Options.UseFont = true;
-            this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
-            this.gv_outDate.FieldName = "outDate";
-            this.gv_outDate.MinWidth = 120;
-            this.gv_outDate.Name = "gv_outDate";
-            this.gv_outDate.OptionsColumn.AllowEdit = false;
-            this.gv_outDate.Tag = "query_a.out_date";
-            this.gv_outDate.Visible = true;
-            this.gv_outDate.VisibleIndex = 7;
-            this.gv_outDate.Width = 120;
+            this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
+            this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
+            this.gvMx2depotSectionCode.MinWidth = 50;
+            this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
+            this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
+            this.gvMx2depotSectionCode.Visible = true;
+            this.gvMx2depotSectionCode.VisibleIndex = 6;
+            this.gvMx2depotSectionCode.Width = 94;
             // 
-            // lb_checkDate
+            // gridColumn6
             // 
-            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkDate.Appearance.Options.UseFont = true;
-            this.lb_checkDate.Location = new System.Drawing.Point(778, 52);
-            this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_checkDate.TabIndex = 262;
-            this.lb_checkDate.Text = "瀹℃牳鏃ユ湡";
+            this.gridColumn6.Caption = "寤虹珛鑰�";
+            this.gridColumn6.FieldName = "createBy";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 7;
+            this.gridColumn6.Width = 94;
             // 
-            // txt_checkDate
+            // gridColumn7
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(850, 48);
-            this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(168, 28);
-            this.txt_checkDate.TabIndex = 262;
+            this.gridColumn7.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn7.FieldName = "createDate";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 8;
+            this.gridColumn7.Width = 94;
             // 
-            // gv_checkDate
+            // gvMx2remark
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
-            this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
-            this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 120;
-            this.gv_checkDate.Name = "gv_checkDate";
-            this.gv_checkDate.OptionsColumn.AllowEdit = false;
-            this.gv_checkDate.Tag = "query_a.check_date";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 10;
-            this.gv_checkDate.Width = 120;
-            // 
-            // lb_checkUser
-            // 
-            this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkUser.Appearance.Options.UseFont = true;
-            this.lb_checkUser.Location = new System.Drawing.Point(795, 20);
-            this.lb_checkUser.Name = "lb_checkUser";
-            this.lb_checkUser.Size = new System.Drawing.Size(51, 21);
-            this.lb_checkUser.TabIndex = 258;
-            this.lb_checkUser.Text = "瀹℃牳浜�";
-            // 
-            // txt_checkUser
-            // 
-            this.txt_checkUser.Location = new System.Drawing.Point(850, 16);
-            this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(168, 28);
-            this.txt_checkUser.TabIndex = 258;
-            // 
-            // gv_checkUser
-            // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
-            this.gv_checkUser.Caption = "瀹℃牳浜� ";
-            this.gv_checkUser.FieldName = "checkUser";
-            this.gv_checkUser.MinWidth = 50;
-            this.gv_checkUser.Name = "gv_checkUser";
-            this.gv_checkUser.OptionsColumn.AllowEdit = false;
-            this.gv_checkUser.Tag = "query_a.check_user";
-            this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 9;
-            this.gv_checkUser.Width = 94;
-            // 
-            // lb_remark
-            // 
-            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remark.Appearance.Options.UseFont = true;
-            this.lb_remark.Location = new System.Drawing.Point(271, 85);
-            this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(68, 21);
-            this.lb_remark.TabIndex = 243;
-            this.lb_remark.Text = "澶囨敞淇℃伅";
-            // 
-            // txt_remark
-            // 
-            this.txt_remark.Location = new System.Drawing.Point(342, 81);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(428, 28);
-            this.txt_remark.TabIndex = 243;
-            // 
-            // gv_remark
-            // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_remark.AppearanceCell.Options.UseFont = true;
-            this.gv_remark.Caption = "澶囨敞淇℃伅 ";
-            this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
-            this.gv_remark.Name = "gv_remark";
-            this.gv_remark.OptionsColumn.AllowEdit = false;
-            this.gv_remark.Tag = "query_a.remark";
-            this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 13;
-            this.gv_remark.Width = 94;
-            // 
-            // lb_createDate
-            // 
-            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(527, 52);
-            this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_createDate.TabIndex = 226;
-            this.lb_createDate.Text = "鍒涘缓鏃堕棿";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(599, 48);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(171, 28);
-            this.txt_createDate.TabIndex = 226;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
-            this.gv_createDate.Name = "gv_createDate";
-            this.gv_createDate.OptionsColumn.AllowEdit = false;
-            this.gv_createDate.Tag = "query_a.create_date";
-            this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 12;
-            this.gv_createDate.Width = 94;
-            // 
-            // lb_createBy
-            // 
-            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(544, 20);
-            this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(51, 21);
-            this.lb_createBy.TabIndex = 222;
-            this.lb_createBy.Text = "鍒涘缓浜�";
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Location = new System.Drawing.Point(599, 16);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(171, 28);
-            this.txt_createBy.TabIndex = 222;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.create_by";
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 11;
-            this.gv_createBy.Width = 94;
-            // 
-            // lb_status
-            // 
-            this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_status.Appearance.Options.UseFont = true;
-            this.lb_status.Location = new System.Drawing.Point(812, 85);
-            this.lb_status.Name = "lb_status";
-            this.lb_status.Size = new System.Drawing.Size(34, 21);
-            this.lb_status.TabIndex = 219;
-            this.lb_status.Text = "瀹℃牳";
-            // 
-            // gv_status
-            // 
-            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_status.AppearanceCell.Options.UseFont = true;
-            this.gv_status.Caption = "瀹℃牳鏍囪瘑";
-            this.gv_status.FieldName = "statusChk";
-            this.gv_status.MaxWidth = 50;
-            this.gv_status.MinWidth = 50;
-            this.gv_status.Name = "gv_status";
-            this.gv_status.OptionsColumn.AllowEdit = false;
-            this.gv_status.Tag = "query_a.status";
-            this.gv_status.Visible = true;
-            this.gv_status.VisibleIndex = 0;
-            this.gv_status.Width = 50;
-            // 
-            // lb_taskNo
-            // 
-            this.lb_taskNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_taskNo.Appearance.Options.UseFont = true;
-            this.lb_taskNo.Location = new System.Drawing.Point(20, 85);
-            this.lb_taskNo.Name = "lb_taskNo";
-            this.lb_taskNo.Size = new System.Drawing.Size(68, 21);
-            this.lb_taskNo.TabIndex = 216;
-            this.lb_taskNo.Text = "鐢熶骇璁㈠崟";
-            // 
-            // txt_pbillNo
-            // 
-            this.txt_pbillNo.Location = new System.Drawing.Point(89, 81);
-            this.txt_pbillNo.Name = "txt_pbillNo";
-            this.txt_pbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_pbillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_pbillNo.Size = new System.Drawing.Size(176, 28);
-            this.txt_pbillNo.TabIndex = 216;
-            // 
-            // lb_itemOutNo
-            // 
-            this.lb_itemOutNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_itemOutNo.Appearance.Options.UseFont = true;
-            this.lb_itemOutNo.Location = new System.Drawing.Point(20, 20);
-            this.lb_itemOutNo.Name = "lb_itemOutNo";
-            this.lb_itemOutNo.Size = new System.Drawing.Size(68, 21);
-            this.lb_itemOutNo.TabIndex = 213;
-            this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿";
-            // 
-            // txt_itemOutNo
-            // 
-            this.txt_itemOutNo.Location = new System.Drawing.Point(89, 16);
-            this.txt_itemOutNo.Name = "txt_itemOutNo";
-            this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemOutNo.Size = new System.Drawing.Size(176, 28);
-            this.txt_itemOutNo.TabIndex = 213;
-            // 
-            // gv_itemOutNo
-            // 
-            this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
-            this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
-            this.gv_itemOutNo.FieldName = "itemOutNo";
-            this.gv_itemOutNo.MinWidth = 100;
-            this.gv_itemOutNo.Name = "gv_itemOutNo";
-            this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
-            this.gv_itemOutNo.Tag = "query_a.item_out_no";
-            this.gv_itemOutNo.Visible = true;
-            this.gv_itemOutNo.VisibleIndex = 1;
-            this.gv_itemOutNo.Width = 150;
-            // 
-            // 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;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1126, 531);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.ColumnPanelRowHeight = 50;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_status,
-            this.gv_itemOutNo,
-            this.gv_workNo,
-            this.gv_pbillNo,
-            this.gv_boardItem,
-            this.gridColumn1,
-            this.gridColumn2,
-            this.gv_outDate,
-            this.gv_outType,
-            this.gv_checkUser,
-            this.gv_checkDate,
-            this.gv_createBy,
-            this.gv_createDate,
-            this.gv_remark});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "浜у搧鍚嶇О";
-            this.gridColumn1.FieldName = "itemName";
-            this.gridColumn1.MinWidth = 120;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 5;
-            this.gridColumn1.Width = 120;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "浜у搧瑙勬牸";
-            this.gridColumn2.FieldName = "itemModel";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 6;
-            this.gridColumn2.Width = 94;
-            // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 531);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
-            this.pageBar1.TabIndex = 3;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.tabMx);
-            this.xtraTabPage2.Controls.Add(this.panel1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            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, 115);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 455);
-            this.tabMx.TabIndex = 2;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1,
-            this.tabMxPage2});
-            // 
-            // panel1
-            // 
-            this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_depotName);
-            this.panel1.Controls.Add(this.txt_status);
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_depotId);
-            this.panel1.Controls.Add(this.lb_outType);
-            this.panel1.Controls.Add(this.txt_outType);
-            this.panel1.Controls.Add(this.lb_workNo);
-            this.panel1.Controls.Add(this.txt_workNo);
-            this.panel1.Controls.Add(this.lb_checkDate);
-            this.panel1.Controls.Add(this.txt_checkDate);
-            this.panel1.Controls.Add(this.lb_checkUser);
-            this.panel1.Controls.Add(this.txt_checkUser);
-            this.panel1.Controls.Add(this.lb_remark);
-            this.panel1.Controls.Add(this.txt_remark);
-            this.panel1.Controls.Add(this.lb_createDate);
-            this.panel1.Controls.Add(this.txt_createDate);
-            this.panel1.Controls.Add(this.lb_createBy);
-            this.panel1.Controls.Add(this.txt_createBy);
-            this.panel1.Controls.Add(this.lb_status);
-            this.panel1.Controls.Add(this.lb_taskNo);
-            this.panel1.Controls.Add(this.txt_pbillNo);
-            this.panel1.Controls.Add(this.lb_itemOutNo);
-            this.panel1.Controls.Add(this.txt_itemOutNo);
-            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, 115);
-            this.panel1.TabIndex = 1;
-            // 
-            // txt_depotName
-            // 
-            this.txt_depotName.Location = new System.Drawing.Point(342, 16);
-            this.txt_depotName.Name = "txt_depotName";
-            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotName.Size = new System.Drawing.Size(184, 28);
-            this.txt_depotName.TabIndex = 575;
-            // 
-            // txt_status
-            // 
-            this.txt_status.Location = new System.Drawing.Point(850, 83);
-            this.txt_status.Name = "txt_status";
-            this.txt_status.Properties.Caption = "";
-            this.txt_status.Size = new System.Drawing.Size(44, 24);
-            this.txt_status.TabIndex = 572;
-            // 
-            // labelControl11
-            // 
-            this.labelControl11.Location = new System.Drawing.Point(919, 86);
-            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(970, 86);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
-            this.lbGuid.Visible = false;
-            // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(968, 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 = 10;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
+            this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
+            this.gvMx2remark.Caption = "澶囨敞 ";
+            this.gvMx2remark.FieldName = "remark";
+            this.gvMx2remark.MinWidth = 50;
+            this.gvMx2remark.Name = "gvMx2remark";
+            this.gvMx2remark.Tag = "query_a.REMARK";
+            this.gvMx2remark.Visible = true;
+            this.gvMx2remark.VisibleIndex = 9;
+            this.gvMx2remark.Width = 94;
             // 
             // Frm_WwLlDj
             // 
@@ -1028,98 +1154,114 @@
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_WwLlDj";
             this.Text = "棰嗘枡鍗�";
-            this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            this.splitMx1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
-            this.panel1.ResumeLayout(false);
-            this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            this.tabMxPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private UserControls.Data.UcPageBar pageBar1;
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
-        private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraEditors.LabelControl lb_depotId;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_boardItem;
-
-        private DevExpress.XtraEditors.LabelControl lb_outType;
-        private DevExpress.XtraEditors.TextEdit txt_outType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_outType;
-
-        private DevExpress.XtraEditors.LabelControl lb_workNo;
-        private DevExpress.XtraEditors.TextEdit txt_workNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkDate;
-        private DevExpress.XtraEditors.TextEdit txt_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkUser;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
-
-        private DevExpress.XtraEditors.LabelControl lb_remark;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-
-        private DevExpress.XtraEditors.LabelControl lb_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_status;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-
-        private DevExpress.XtraEditors.LabelControl lb_taskNo;
-        private DevExpress.XtraEditors.TextEdit txt_pbillNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
-        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
-        private DevExpress.XtraEditors.CheckEdit txt_status;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_outType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraEditors.TextEdit txt_depotName;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_outType;
+        private DevExpress.XtraEditors.TextEdit txt_workNo;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_checkUser;
+        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_pbillNo;
+        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.CheckEdit txt_status;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraTab.XtraTabControl tabMx;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
@@ -1132,6 +1274,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
index 06c0410..2803143 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -24,9 +24,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
-            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-            gvList.Add(gridView1);
-            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "statusChk", "", (value) =>
@@ -170,16 +168,16 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
+                    gcMain1.BindingContext = new BindingContext();
                     gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                     if (dt.Rows.Count > 0)
                     {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
                         gridView1.BestFitColumns();
                     }
                     else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                     gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                     pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -220,7 +218,7 @@
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     gvList.Add(gvMx2);
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 2fe376a..03ad3d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -29,16 +29,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1tld009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1tld007 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1tld006 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -384,10 +384,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -683,9 +683,9 @@
             this.lb_tbl005.Appearance.Options.UseFont = true;
             this.lb_tbl005.Location = new System.Drawing.Point(11, 85);
             this.lb_tbl005.Name = "lb_tbl005";
-            this.lb_tbl005.Size = new System.Drawing.Size(73, 21);
+            this.lb_tbl005.Size = new System.Drawing.Size(68, 21);
             this.lb_tbl005.TabIndex = 222;
-            this.lb_tbl005.Text = "閫�鏂欏師鍥� ";
+            this.lb_tbl005.Text = "閫�鏂欑被鍨�";
             // 
             // lb_tbl004
             // 
@@ -1187,10 +1187,10 @@
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1300,14 +1300,17 @@
             // 
             // txt_tbl005
             // 
+            this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
             this.txt_tbl005.Location = new System.Drawing.Point(85, 83);
             this.txt_tbl005.Name = "txt_tbl005";
             this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_tbl005.Properties.Items.AddRange(new object[] {
+            "-璇烽�夋嫨-",
             "鑹搧閫�鏂�",
             "鏉ユ枡涓嶈壇閫�鏂�",
             "浣滀笟涓嶈壇閫�鏂�"});
+            this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_tbl005.Size = new System.Drawing.Size(213, 24);
             this.txt_tbl005.TabIndex = 459;
             // 
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index dc26a85..5f193d0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -85,7 +85,7 @@
                 };
                 frm.ShowDialog();
             };
-          
+
             this.ucBtnPrint1.btnDesignClick += (s, e) =>
             {
                 ucBtnPrint1.rptParameter = "rpt_wwtl{}";
@@ -383,9 +383,9 @@
                 txt_tbl002.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
+            if (txt_tbl005.SelectedIndex <= 0)
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍘熷洜锛�");
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欑被鍨嬶紒");
                 txt_tbl005.Focus();
                 return;
             }
@@ -393,7 +393,7 @@
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 bz = txt_tbl006.Text.Trim(),//澶囨敞
-                yy = txt_tbl005.Text.Trim(),//鍘熷洜
+                yy = txt_tbl005.Text.Trim(),// 
                 inDaaGuid = workId,//宸ュ崟
                 inOrgId = "",//缁勭粐
                 list = new List<dynamic>(),

--
Gitblit v1.9.3