From c26069c9418efe9f9c0f963f43fb98b8a7440adf Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 01 三月 2025 10:10:25 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs                |   10 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs            |    3 
 DevApp/Gs.DevApp/UserControl/UcLookSales.cs                  |   29 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 1322 ++++++++++++++++++++++++++++++++++
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs          |  357 +++++++++
 DevApp/Gs.DevApp/Gs.DevApp.csproj                            |    9 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.resx        |  120 +++
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs   |  347 +++++---
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs                    |   70 -
 9 files changed, 2,059 insertions(+), 208 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 4354c20..719e16d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -52,7 +52,6 @@
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fBillTypeID = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fStockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fCreatorId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fApproverID = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fCreateDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,6 +62,9 @@
             this.gv_fNote = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -71,7 +73,6 @@
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
             this.txt_fSaleOrgIdTxt = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
             this.txt_fNote = new DevExpress.XtraEditors.TextEdit();
             this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -81,7 +82,10 @@
             this.txt_fApproveDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fCreateDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fApproverID = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_shf = new DevExpress.XtraEditors.TextEdit();
+            this.txt_shName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -94,10 +98,12 @@
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_fApproverStaus = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -167,7 +173,6 @@
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerIDTxt.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
@@ -177,7 +182,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -190,10 +198,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -258,8 +268,9 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 553;
+            this.split1.SplitterPosition = 482;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -269,7 +280,7 @@
             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, 514);
+            this.gcMain1.Size = new System.Drawing.Size(1126, 443);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -283,7 +294,6 @@
             this.gv_billNo,
             this.gv_fBillTypeID,
             this.gv_fSaleOrgId,
-            this.gv_fStockOrgId,
             this.gv_fCreatorId,
             this.gv_fApproverID,
             this.gv_fCreateDate,
@@ -293,7 +303,10 @@
             this.gv_fDate,
             this.gv_fNote,
             this.gv_fApproverStaus,
-            this.gridColumn2});
+            this.gridColumn2,
+            this.gridColumn33,
+            this.gridColumn34,
+            this.gridColumn35});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -348,7 +361,7 @@
             this.gv_fSaleOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fSaleOrgId.AppearanceCell.Options.UseFont = true;
             this.gv_fSaleOrgId.Caption = "閿�鍞粍缁� ";
-            this.gv_fSaleOrgId.FieldName = "fSaleOrgId";
+            this.gv_fSaleOrgId.FieldName = "xszzName";
             this.gv_fSaleOrgId.MinWidth = 50;
             this.gv_fSaleOrgId.Name = "gv_fSaleOrgId";
             this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false;
@@ -356,20 +369,6 @@
             this.gv_fSaleOrgId.Visible = true;
             this.gv_fSaleOrgId.VisibleIndex = 3;
             this.gv_fSaleOrgId.Width = 94;
-            // 
-            // gv_fStockOrgId
-            // 
-            this.gv_fStockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fStockOrgId.AppearanceCell.Options.UseFont = true;
-            this.gv_fStockOrgId.Caption = "鍙戣揣缁勭粐 ";
-            this.gv_fStockOrgId.FieldName = "fStockOrgId";
-            this.gv_fStockOrgId.MinWidth = 50;
-            this.gv_fStockOrgId.Name = "gv_fStockOrgId";
-            this.gv_fStockOrgId.OptionsColumn.AllowEdit = false;
-            this.gv_fStockOrgId.Tag = "query_a.FStockOrgId";
-            this.gv_fStockOrgId.Visible = true;
-            this.gv_fStockOrgId.VisibleIndex = 4;
-            this.gv_fStockOrgId.Width = 94;
             // 
             // gv_fCreatorId
             // 
@@ -382,7 +381,7 @@
             this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
             this.gv_fCreatorId.Tag = "query_a.FCreatorId";
             this.gv_fCreatorId.Visible = true;
-            this.gv_fCreatorId.VisibleIndex = 5;
+            this.gv_fCreatorId.VisibleIndex = 4;
             this.gv_fCreatorId.Width = 94;
             // 
             // gv_fApproverID
@@ -396,7 +395,7 @@
             this.gv_fApproverID.OptionsColumn.AllowEdit = false;
             this.gv_fApproverID.Tag = "query_a.FApproverID";
             this.gv_fApproverID.Visible = true;
-            this.gv_fApproverID.VisibleIndex = 6;
+            this.gv_fApproverID.VisibleIndex = 5;
             this.gv_fApproverID.Width = 94;
             // 
             // gv_fCreateDate
@@ -410,7 +409,7 @@
             this.gv_fCreateDate.OptionsColumn.AllowEdit = false;
             this.gv_fCreateDate.Tag = "query_a.FCreateDate";
             this.gv_fCreateDate.Visible = true;
-            this.gv_fCreateDate.VisibleIndex = 7;
+            this.gv_fCreateDate.VisibleIndex = 6;
             this.gv_fCreateDate.Width = 94;
             // 
             // gv_fApproveDate
@@ -424,35 +423,35 @@
             this.gv_fApproveDate.OptionsColumn.AllowEdit = false;
             this.gv_fApproveDate.Tag = "query_a.FApproveDate";
             this.gv_fApproveDate.Visible = true;
-            this.gv_fApproveDate.VisibleIndex = 8;
+            this.gv_fApproveDate.VisibleIndex = 7;
             this.gv_fApproveDate.Width = 94;
             // 
             // gv_fSalesManID
             // 
             this.gv_fSalesManID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fSalesManID.AppearanceCell.Options.UseFont = true;
-            this.gv_fSalesManID.Caption = "閿�鍞憳 ";
+            this.gv_fSalesManID.Caption = "閿�鍞憳ID";
             this.gv_fSalesManID.FieldName = "fSalesManID";
             this.gv_fSalesManID.MinWidth = 50;
             this.gv_fSalesManID.Name = "gv_fSalesManID";
             this.gv_fSalesManID.OptionsColumn.AllowEdit = false;
             this.gv_fSalesManID.Tag = "query_a.FSalesManID";
             this.gv_fSalesManID.Visible = true;
-            this.gv_fSalesManID.VisibleIndex = 9;
+            this.gv_fSalesManID.VisibleIndex = 8;
             this.gv_fSalesManID.Width = 94;
             // 
             // gv_fCustomerID
             // 
             this.gv_fCustomerID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fCustomerID.AppearanceCell.Options.UseFont = true;
-            this.gv_fCustomerID.Caption = "瀹㈡埛 ";
+            this.gv_fCustomerID.Caption = "瀹㈡埛ID";
             this.gv_fCustomerID.FieldName = "fCustomerID";
             this.gv_fCustomerID.MinWidth = 50;
             this.gv_fCustomerID.Name = "gv_fCustomerID";
             this.gv_fCustomerID.OptionsColumn.AllowEdit = false;
             this.gv_fCustomerID.Tag = "query_a.FCustomerID";
             this.gv_fCustomerID.Visible = true;
-            this.gv_fCustomerID.VisibleIndex = 10;
+            this.gv_fCustomerID.VisibleIndex = 9;
             this.gv_fCustomerID.Width = 94;
             // 
             // gv_fDate
@@ -466,7 +465,7 @@
             this.gv_fDate.OptionsColumn.AllowEdit = false;
             this.gv_fDate.Tag = "query_a.FDate";
             this.gv_fDate.Visible = true;
-            this.gv_fDate.VisibleIndex = 11;
+            this.gv_fDate.VisibleIndex = 10;
             this.gv_fDate.Width = 94;
             // 
             // gv_fNote
@@ -480,7 +479,7 @@
             this.gv_fNote.OptionsColumn.AllowEdit = false;
             this.gv_fNote.Tag = "query_a.FNote";
             this.gv_fNote.Visible = true;
-            this.gv_fNote.VisibleIndex = 12;
+            this.gv_fNote.VisibleIndex = 11;
             this.gv_fNote.Width = 94;
             // 
             // gv_fApproverStaus
@@ -494,7 +493,7 @@
             this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
             this.gv_fApproverStaus.Tag = "query_a.FApproverStaus";
             this.gv_fApproverStaus.Visible = true;
-            this.gv_fApproverStaus.VisibleIndex = 13;
+            this.gv_fApproverStaus.VisibleIndex = 12;
             this.gv_fApproverStaus.Width = 94;
             // 
             // gridColumn2
@@ -504,14 +503,44 @@
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 14;
+            this.gridColumn2.VisibleIndex = 13;
             this.gridColumn2.Width = 94;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "閿�鍞憳鍚�";
+            this.gridColumn33.FieldName = "xsyName";
+            this.gridColumn33.MinWidth = 25;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Visible = true;
+            this.gridColumn33.VisibleIndex = 14;
+            this.gridColumn33.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "瀹㈡埛鍚嶇О";
+            this.gridColumn34.FieldName = "khName";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 15;
+            this.gridColumn34.Width = 94;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "閿�鍞崟鍙�";
+            this.gridColumn35.FieldName = "xsNo";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 16;
+            this.gridColumn35.Width = 94;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 514);
+            this.pageBar1.Location = new System.Drawing.Point(0, 443);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -553,7 +582,6 @@
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_salesId);
             this.layoutMx1.Controls.Add(this.txt_fSaleOrgIdTxt);
-            this.layoutMx1.Controls.Add(this.txt_fDate);
             this.layoutMx1.Controls.Add(this.txt_id);
             this.layoutMx1.Controls.Add(this.txt_fNote);
             this.layoutMx1.Controls.Add(this.txt_fBillTypeID);
@@ -563,7 +591,10 @@
             this.layoutMx1.Controls.Add(this.txt_fApproveDate);
             this.layoutMx1.Controls.Add(this.txt_fCreateDate);
             this.layoutMx1.Controls.Add(this.txt_fApproverID);
-            this.layoutMx1.Controls.Add(this.txt_fApproverStaus);
+            this.layoutMx1.Controls.Add(this.txt_wjStatus);
+            this.layoutMx1.Controls.Add(this.txt_shf);
+            this.layoutMx1.Controls.Add(this.txt_shName);
+            this.layoutMx1.Controls.Add(this.txt_chkStatus);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem15});
@@ -577,11 +608,11 @@
             // 
             // txt_fCustomerIDTxt
             // 
-            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(90, 108);
+            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(99, 108);
             this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
             this.txt_fCustomerIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(194, 28);
+            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(185, 28);
             this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
             this.txt_fCustomerIDTxt.TabIndex = 368;
             this.txt_fCustomerIDTxt.Tag = "readonly";
@@ -597,143 +628,158 @@
             // txt_salesId
             // 
             this.txt_salesId.IsReadly = false;
-            this.txt_salesId.Location = new System.Drawing.Point(90, 44);
+            this.txt_salesId.Location = new System.Drawing.Point(99, 44);
             this.txt_salesId.Name = "txt_salesId";
-            this.txt_salesId.Size = new System.Drawing.Size(194, 28);
+            this.txt_salesId.Size = new System.Drawing.Size(185, 28);
             this.txt_salesId.TabIndex = 367;
             // 
             // txt_fSaleOrgIdTxt
             // 
-            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(366, 44);
+            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(375, 44);
             this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
             this.txt_fSaleOrgIdTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(194, 28);
+            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(185, 28);
             this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
             this.txt_fSaleOrgIdTxt.TabIndex = 365;
             this.txt_fSaleOrgIdTxt.Tag = "readonly";
             // 
-            // txt_fDate
-            // 
-            this.txt_fDate.Location = new System.Drawing.Point(366, 108);
-            this.txt_fDate.Name = "txt_fDate";
-            this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fDate.Size = new System.Drawing.Size(194, 28);
-            this.txt_fDate.StyleController = this.layoutMx1;
-            this.txt_fDate.TabIndex = 240;
-            this.txt_fDate.Tag = "readonly";
-            // 
             // txt_id
             // 
-            this.txt_id.Location = new System.Drawing.Point(90, 12);
+            this.txt_id.Location = new System.Drawing.Point(99, 12);
             this.txt_id.Name = "txt_id";
             this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_id.Properties.Appearance.Options.UseFont = true;
-            this.txt_id.Size = new System.Drawing.Size(194, 28);
+            this.txt_id.Size = new System.Drawing.Size(185, 28);
             this.txt_id.StyleController = this.layoutMx1;
             this.txt_id.TabIndex = 211;
             this.txt_id.Tag = "readonly";
             // 
             // txt_fNote
             // 
-            this.txt_fNote.Location = new System.Drawing.Point(90, 76);
+            this.txt_fNote.Location = new System.Drawing.Point(99, 76);
             this.txt_fNote.Name = "txt_fNote";
             this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fNote.Properties.Appearance.Options.UseFont = true;
-            this.txt_fNote.Size = new System.Drawing.Size(194, 28);
+            this.txt_fNote.Size = new System.Drawing.Size(185, 28);
             this.txt_fNote.StyleController = this.layoutMx1;
             this.txt_fNote.TabIndex = 243;
             // 
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(642, 12);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(651, 12);
             this.txt_fBillTypeID.Name = "txt_fBillTypeID";
             this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(194, 24);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(185, 24);
             this.txt_fBillTypeID.StyleController = this.layoutMx1;
             this.txt_fBillTypeID.TabIndex = 362;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(366, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(375, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(194, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(185, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
             // 
             // txt_fCreatorId
             // 
-            this.txt_fCreatorId.Location = new System.Drawing.Point(642, 44);
+            this.txt_fCreatorId.Location = new System.Drawing.Point(651, 44);
             this.txt_fCreatorId.Name = "txt_fCreatorId";
             this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreatorId.Size = new System.Drawing.Size(194, 28);
+            this.txt_fCreatorId.Size = new System.Drawing.Size(185, 28);
             this.txt_fCreatorId.StyleController = this.layoutMx1;
             this.txt_fCreatorId.TabIndex = 219;
             this.txt_fCreatorId.Tag = "readonly";
             // 
             // txt_fSalesManIDTxt
             // 
-            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(366, 76);
+            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(375, 76);
             this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
             this.txt_fSalesManIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(194, 28);
+            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(185, 28);
             this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
             this.txt_fSalesManIDTxt.TabIndex = 231;
             this.txt_fSalesManIDTxt.Tag = "readonly";
             // 
             // txt_fApproveDate
             // 
-            this.txt_fApproveDate.Location = new System.Drawing.Point(918, 44);
+            this.txt_fApproveDate.Location = new System.Drawing.Point(927, 44);
             this.txt_fApproveDate.Name = "txt_fApproveDate";
             this.txt_fApproveDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproveDate.Size = new System.Drawing.Size(196, 28);
+            this.txt_fApproveDate.Size = new System.Drawing.Size(187, 28);
             this.txt_fApproveDate.StyleController = this.layoutMx1;
             this.txt_fApproveDate.TabIndex = 228;
             this.txt_fApproveDate.Tag = "readonly";
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(642, 76);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(651, 76);
             this.txt_fCreateDate.Name = "txt_fCreateDate";
             this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(194, 28);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(185, 28);
             this.txt_fCreateDate.StyleController = this.layoutMx1;
             this.txt_fCreateDate.TabIndex = 226;
             this.txt_fCreateDate.Tag = "readonly";
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(918, 12);
+            this.txt_fApproverID.Location = new System.Drawing.Point(927, 12);
             this.txt_fApproverID.Name = "txt_fApproverID";
             this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproverID.Size = new System.Drawing.Size(196, 28);
+            this.txt_fApproverID.Size = new System.Drawing.Size(187, 28);
             this.txt_fApproverID.StyleController = this.layoutMx1;
             this.txt_fApproverID.TabIndex = 222;
             this.txt_fApproverID.Tag = "readonly";
             // 
-            // txt_fApproverStaus
+            // txt_wjStatus
             // 
-            this.txt_fApproverStaus.Enabled = false;
-            this.txt_fApproverStaus.Location = new System.Drawing.Point(840, 76);
-            this.txt_fApproverStaus.Name = "txt_fApproverStaus";
-            this.txt_fApproverStaus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_fApproverStaus.Size = new System.Drawing.Size(274, 24);
-            this.txt_fApproverStaus.StyleController = this.layoutMx1;
-            this.txt_fApproverStaus.TabIndex = 371;
+            this.txt_wjStatus.Location = new System.Drawing.Point(840, 108);
+            this.txt_wjStatus.Name = "txt_wjStatus";
+            this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��";
+            this.txt_wjStatus.Size = new System.Drawing.Size(274, 24);
+            this.txt_wjStatus.StyleController = this.layoutMx1;
+            this.txt_wjStatus.TabIndex = 372;
+            // 
+            // txt_shf
+            // 
+            this.txt_shf.Location = new System.Drawing.Point(375, 108);
+            this.txt_shf.Name = "txt_shf";
+            this.txt_shf.Size = new System.Drawing.Size(185, 24);
+            this.txt_shf.StyleController = this.layoutMx1;
+            this.txt_shf.TabIndex = 373;
+            this.txt_shf.Tag = "readonly";
+            // 
+            // txt_shName
+            // 
+            this.txt_shName.Location = new System.Drawing.Point(651, 108);
+            this.txt_shName.Name = "txt_shName";
+            this.txt_shName.Size = new System.Drawing.Size(185, 24);
+            this.txt_shName.StyleController = this.layoutMx1;
+            this.txt_shName.TabIndex = 374;
+            this.txt_shName.Tag = "readonly";
+            // 
+            // txt_chkStatus
+            // 
+            this.txt_chkStatus.Location = new System.Drawing.Point(840, 76);
+            this.txt_chkStatus.Name = "txt_chkStatus";
+            this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
+            this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
+            this.txt_chkStatus.StyleController = this.layoutMx1;
+            this.txt_chkStatus.TabIndex = 375;
             // 
             // layoutControlItem15
             // 
@@ -762,10 +808,12 @@
             this.layoutControlItem9,
             this.layoutControlItem10,
             this.layoutControlItem13,
-            this.layoutControlItem14,
             this.layoutControlItem1,
             this.layoutControlItem11,
-            this.layoutControlItem16});
+            this.layoutControlItem12,
+            this.layoutControlItem14,
+            this.layoutControlItem17,
+            this.txt_fApproverStaus});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -804,8 +852,8 @@
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem2.Text = "鍗曟嵁缂栧彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem2.Text = "鐢宠缂栧彿";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem3
             // 
@@ -815,7 +863,7 @@
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem4
             // 
@@ -825,7 +873,7 @@
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem4.Text = "閿�鍞鍗�";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem5
             // 
@@ -836,7 +884,7 @@
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem5.Text = "閿�鍞粍缁�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem6
             // 
@@ -847,7 +895,7 @@
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem6.Text = "鍒涘缓浜�";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
@@ -858,7 +906,7 @@
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem8
             // 
@@ -867,8 +915,8 @@
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem8.Text = "澶囨敞";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem8.Text = "鐢宠澶囨敞";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem9
             // 
@@ -879,7 +927,7 @@
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem9.Text = "閿�鍞憳";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem10
             // 
@@ -889,7 +937,7 @@
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem10.Text = "瀹℃牳浜�";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem13
             // 
@@ -898,19 +946,8 @@
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem13.Text = "瀹㈡埛";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_fDate;
-            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(276, 32);
-            this.layoutControlItem14.Text = "鏃ユ湡";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem1
             // 
@@ -919,7 +956,7 @@
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
             this.layoutControlItem1.Text = "涓婚敭GUID";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
             // 
@@ -930,19 +967,53 @@
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem11.Size = new System.Drawing.Size(278, 32);
             this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem16
+            // layoutControlItem12
             // 
-            this.layoutControlItem16.Control = this.txt_fApproverStaus;
-            this.layoutControlItem16.Location = new System.Drawing.Point(828, 64);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(278, 32);
-            this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem16.TextVisible = false;
+            this.layoutControlItem12.Control = this.txt_wjStatus;
+            this.layoutControlItem12.Location = new System.Drawing.Point(828, 96);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(278, 32);
+            this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.TextVisible = false;
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_shf;
+            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(276, 32);
+            this.layoutControlItem14.Text = "鏀惰揣鏂�";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_shName;
+            this.layoutControlItem17.Location = new System.Drawing.Point(552, 96);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem17.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // txt_fApproverStaus
+            // 
+            this.txt_fApproverStaus.Control = this.txt_chkStatus;
+            this.txt_fApproverStaus.Location = new System.Drawing.Point(828, 64);
+            this.txt_fApproverStaus.Name = "txt_fApproverStaus";
+            this.txt_fApproverStaus.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.txt_fApproverStaus.OptionsTableLayoutItem.RowIndex = 2;
+            this.txt_fApproverStaus.Size = new System.Drawing.Size(278, 32);
+            this.txt_fApproverStaus.Text = "瀹℃牳鏍囪瘑";
+            this.txt_fApproverStaus.TextSize = new System.Drawing.Size(0, 0);
+            this.txt_fApproverStaus.TextVisible = false;
             // 
             // tabMx
             // 
@@ -1509,7 +1580,6 @@
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerIDTxt.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
@@ -1519,7 +1589,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1532,10 +1605,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1562,7 +1637,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fBillTypeID;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fSaleOrgId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fStockOrgId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fCreatorId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverID;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fCreateDate;
@@ -1634,7 +1708,6 @@
         private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_fNote;
-        private DevExpress.XtraEditors.TextEdit txt_fDate;
         private DevExpress.XtraEditors.TextEdit txt_fSalesManIDTxt;
         private DevExpress.XtraEditors.TextEdit txt_fApproveDate;
         private DevExpress.XtraEditors.TextEdit txt_fCreateDate;
@@ -1649,11 +1722,19 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.TextEdit txt_shf;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraEditors.TextEdit txt_shName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
+        private DevExpress.XtraLayout.LayoutControlItem txt_fApproverStaus;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index bc0d8ea..5aefb5f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -54,6 +54,9 @@
                 txt_fSalesManIDTxt.Text = txt_salesId.GetSalesUserName();
                 txt_fCustomerIDTxt.Text = txt_salesId.GetSalesCusName();
                 txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
+                txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
+                txt_shf.Text = txt_salesId.GetSalesShf();
+                txt_shName.Text = txt_salesId.GetSalesShfName();
                 System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
                 var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
                 var json = JsonConvert.SerializeObject(_obj);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
new file mode 100644
index 0000000..1f051eb
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -0,0 +1,1322 @@
+锘縩amespace Gs.DevApp.DevFrm.Ck
+{
+    partial class Frm_SalesDeliverDj
+    {
+
+
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </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.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_outType = new DevExpress.XtraEditors.LabelControl();
+            this.txt_cusName = new DevExpress.XtraEditors.TextEdit();
+            this.gv_outType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_workNo = new DevExpress.XtraEditors.LabelControl();
+            this.txt_abtNo = new DevExpress.XtraEditors.TextEdit();
+            this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_receiver = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.lb_outPart = new DevExpress.XtraEditors.LabelControl();
+            this.gv_outPart = 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.gv_reason = 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_kcOrg = 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.gridColumn6 = 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.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_cusNo = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_xxNo = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_ckNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_outType = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_xxzz = 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_cusName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.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_kcOrg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+            this.tabMx.SuspendLayout();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cusNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xxNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xxzz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 268);
+            this.tabMxPage2.Text = "鍑哄簱鏉$爜";
+            // 
+            // gcMx2
+            // 
+            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, 268);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2itemBarcode,
+            this.gvMx2itemNo,
+            this.gvMx2lotNo,
+            this.gvMx2quantity,
+            this.gvMx2depotCode,
+            this.gvMx2depotSectionCode,
+            this.gridColumn2,
+            this.gridColumn3,
+            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;
+            // 
+            // gvMx2itemBarcode
+            // 
+            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;
+            // 
+            // gvMx2itemNo
+            // 
+            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;
+            // 
+            // gvMx2lotNo
+            // 
+            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;
+            // 
+            // gvMx2quantity
+            // 
+            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 = 3;
+            this.gvMx2quantity.Width = 94;
+            // 
+            // gvMx2depotCode
+            // 
+            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 = 4;
+            this.gvMx2depotCode.Width = 94;
+            // 
+            // gvMx2depotSectionCode
+            // 
+            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 = 5;
+            this.gvMx2depotSectionCode.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "寤虹珛鑰�";
+            this.gridColumn2.FieldName = "createBy";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 6;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn3.FieldName = "createDate";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 7;
+            this.gridColumn3.Width = 94;
+            // 
+            // gvMx2remark
+            // 
+            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 = 8;
+            this.gvMx2remark.Width = 94;
+            // 
+            // tabMxPage1
+            // 
+            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Name = "tabMxPage1";
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 268);
+            this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
+            // 
+            // gcMx1
+            // 
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            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, 268);
+            this.gcMx1.TabIndex = 1;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1guid,
+            this.gvMx1workNo,
+            this.gvMx1itemNo,
+            this.gvMx1itemId,
+            this.gvMx1createBy,
+            this.gvMx1createDate,
+            this.gvMx1quantity,
+            this.gvMx1tlQty,
+            this.gvMx1remark,
+            this.gridColumn4,
+            this.gridColumn5});
+            this.gvMx1.GridControl = this.gcMx1;
+            this.gvMx1.Name = "gvMx1";
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx1guid
+            // 
+            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1guid.Caption = "guid ";
+            this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 50;
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.Tag = "query_a.guid";
+            this.gvMx1guid.Width = 94;
+            // 
+            // gvMx1workNo
+            // 
+            this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1workNo.Caption = "鐢宠鍗曞彿";
+            this.gvMx1workNo.FieldName = "workNo";
+            this.gvMx1workNo.MinWidth = 50;
+            this.gvMx1workNo.Name = "gvMx1workNo";
+            this.gvMx1workNo.Tag = "query_a.work_no";
+            this.gvMx1workNo.Visible = true;
+            this.gvMx1workNo.VisibleIndex = 0;
+            this.gvMx1workNo.Width = 94;
+            // 
+            // gvMx1itemNo
+            // 
+            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
+            this.gvMx1itemNo.FieldName = "itemNo";
+            this.gvMx1itemNo.MinWidth = 50;
+            this.gvMx1itemNo.Name = "gvMx1itemNo";
+            this.gvMx1itemNo.Tag = "query_a.item_no";
+            this.gvMx1itemNo.Visible = true;
+            this.gvMx1itemNo.VisibleIndex = 1;
+            this.gvMx1itemNo.Width = 94;
+            // 
+            // gvMx1itemId
+            // 
+            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemId.Caption = "鐗╂枡ID ";
+            this.gvMx1itemId.FieldName = "itemId";
+            this.gvMx1itemId.MinWidth = 50;
+            this.gvMx1itemId.Name = "gvMx1itemId";
+            this.gvMx1itemId.Tag = "query_a.item_id";
+            this.gvMx1itemId.Visible = true;
+            this.gvMx1itemId.VisibleIndex = 2;
+            this.gvMx1itemId.Width = 94;
+            // 
+            // gvMx1createBy
+            // 
+            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx1createBy.FieldName = "itemName";
+            this.gvMx1createBy.MinWidth = 50;
+            this.gvMx1createBy.Name = "gvMx1createBy";
+            this.gvMx1createBy.Tag = "query_a.create_by";
+            this.gvMx1createBy.Visible = true;
+            this.gvMx1createBy.VisibleIndex = 3;
+            this.gvMx1createBy.Width = 94;
+            // 
+            // gvMx1createDate
+            // 
+            this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
+            this.gvMx1createDate.FieldName = "itemModel";
+            this.gvMx1createDate.MinWidth = 50;
+            this.gvMx1createDate.Name = "gvMx1createDate";
+            this.gvMx1createDate.Tag = "query_a.create_date";
+            this.gvMx1createDate.Visible = true;
+            this.gvMx1createDate.VisibleIndex = 4;
+            this.gvMx1createDate.Width = 94;
+            // 
+            // gvMx1quantity
+            // 
+            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
+            this.gvMx1quantity.FieldName = "quantitySq";
+            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.Name = "gvMx1quantity";
+            this.gvMx1quantity.Tag = "query_a.quantity";
+            this.gvMx1quantity.Visible = true;
+            this.gvMx1quantity.VisibleIndex = 5;
+            this.gvMx1quantity.Width = 94;
+            // 
+            // gvMx1tlQty
+            // 
+            this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
+            this.gvMx1tlQty.FieldName = "tlQty";
+            this.gvMx1tlQty.MinWidth = 50;
+            this.gvMx1tlQty.Name = "gvMx1tlQty";
+            this.gvMx1tlQty.Tag = "query_a.tl_qty";
+            this.gvMx1tlQty.Visible = true;
+            this.gvMx1tlQty.VisibleIndex = 6;
+            this.gvMx1tlQty.Width = 94;
+            // 
+            // gvMx1remark
+            // 
+            this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1remark.AppearanceCell.Options.UseFont = true;
+            this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
+            this.gvMx1remark.FieldName = "remark";
+            this.gvMx1remark.MinWidth = 50;
+            this.gvMx1remark.Name = "gvMx1remark";
+            this.gvMx1remark.Tag = "query_a.remark";
+            this.gvMx1remark.Visible = true;
+            this.gvMx1remark.VisibleIndex = 7;
+            this.gvMx1remark.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "寤虹珛鑰�";
+            this.gridColumn4.FieldName = "createBy";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 8;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn5.FieldName = "createDate";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 9;
+            this.gridColumn5.Width = 94;
+            // 
+            // gv_pbillNo
+            // 
+            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 = "workNo";
+            this.gv_pbillNo.MinWidth = 25;
+            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;
+            // 
+            // lb_outType
+            // 
+            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(311, 85);
+            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 = "瀹㈡埛鍚嶇О";
+            // 
+            // txt_cusName
+            // 
+            this.txt_cusName.Location = new System.Drawing.Point(349, 81);
+            this.txt_cusName.Name = "txt_cusName";
+            this.txt_cusName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_cusName.Properties.Appearance.Options.UseFont = true;
+            this.txt_cusName.Size = new System.Drawing.Size(187, 28);
+            this.txt_cusName.TabIndex = 450;
+            // 
+            // 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 = 25;
+            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 = 5;
+            this.gv_outType.Width = 94;
+            // 
+            // lb_workNo
+            // 
+            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(790, 20);
+            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 = "鐢宠鍗曞彿";
+            // 
+            // txt_abtNo
+            // 
+            this.txt_abtNo.Location = new System.Drawing.Point(868, 16);
+            this.txt_abtNo.Name = "txt_abtNo";
+            this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_abtNo.Size = new System.Drawing.Size(168, 28);
+            this.txt_abtNo.TabIndex = 387;
+            // 
+            // gv_workNo
+            // 
+            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 = "taskNo";
+            this.gv_workNo.MinWidth = 25;
+            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;
+            // 
+            // gv_receiver
+            // 
+            this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_receiver.AppearanceCell.Options.UseFont = true;
+            this.gv_receiver.Caption = "鍑哄簱缂栧彿";
+            this.gv_receiver.FieldName = "ckNo";
+            this.gv_receiver.MinWidth = 25;
+            this.gv_receiver.Name = "gv_receiver";
+            this.gv_receiver.OptionsColumn.AllowEdit = false;
+            this.gv_receiver.Tag = "query_a.receiver";
+            this.gv_receiver.Visible = true;
+            this.gv_receiver.VisibleIndex = 8;
+            this.gv_receiver.Width = 94;
+            // 
+            // lb_outPart
+            // 
+            this.lb_outPart.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_outPart.Appearance.Options.UseFont = true;
+            this.lb_outPart.Location = new System.Drawing.Point(277, 53);
+            this.lb_outPart.Name = "lb_outPart";
+            this.lb_outPart.Size = new System.Drawing.Size(68, 21);
+            this.lb_outPart.TabIndex = 319;
+            this.lb_outPart.Text = "閿�鍞粍缁�";
+            // 
+            // gv_outPart
+            // 
+            this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_outPart.AppearanceCell.Options.UseFont = true;
+            this.gv_outPart.Caption = "鍑哄簱鍚嶇О";
+            this.gv_outPart.FieldName = "ckName";
+            this.gv_outPart.MinWidth = 25;
+            this.gv_outPart.Name = "gv_outPart";
+            this.gv_outPart.OptionsColumn.AllowEdit = false;
+            this.gv_outPart.Tag = "query_a.out_part";
+            this.gv_outPart.Visible = true;
+            this.gv_outPart.VisibleIndex = 9;
+            this.gv_outPart.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 = 25;
+            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 = 4;
+            this.gv_outDate.Width = 120;
+            // 
+            // lb_checkDate
+            // 
+            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(790, 85);
+            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 = "瀹℃牳鏃ユ湡";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(868, 81);
+            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;
+            // 
+            // 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 = 25;
+            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 = 7;
+            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(807, 53);
+            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(868, 49);
+            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 = 25;
+            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 = 6;
+            this.gv_checkUser.Width = 94;
+            // 
+            // gv_reason
+            // 
+            this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_reason.AppearanceCell.Options.UseFont = true;
+            this.gv_reason.Caption = "瀹㈡埛鍚嶇О";
+            this.gv_reason.FieldName = "cusName";
+            this.gv_reason.MinWidth = 25;
+            this.gv_reason.Name = "gv_reason";
+            this.gv_reason.OptionsColumn.AllowEdit = false;
+            this.gv_reason.Tag = "query_a.reason";
+            this.gv_reason.Visible = true;
+            this.gv_reason.VisibleIndex = 13;
+            this.gv_reason.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(542, 118);
+            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(612, 114);
+            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(171, 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 = 25;
+            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 = 12;
+            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(542, 85);
+            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(612, 81);
+            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 = 25;
+            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 = 11;
+            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(559, 53);
+            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(612, 49);
+            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 = 25;
+            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 = 10;
+            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(824, 118);
+            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(15, 133);
+            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_kcOrg
+            // 
+            this.txt_kcOrg.Location = new System.Drawing.Point(86, 129);
+            this.txt_kcOrg.Name = "txt_kcOrg";
+            this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
+            this.txt_kcOrg.Size = new System.Drawing.Size(185, 28);
+            this.txt_kcOrg.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(14, 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(85, 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(185, 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 = 25;
+            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_outDate,
+            this.gv_outType,
+            this.gv_checkUser,
+            this.gv_checkDate,
+            this.gv_receiver,
+            this.gv_outPart,
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gv_remark,
+            this.gv_reason,
+            this.gridColumn1,
+            this.gridColumn6});
+            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 = "cusNo";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 14;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "閿�鍞粍缁�";
+            this.gridColumn6.FieldName = "xxzz";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 15;
+            this.gridColumn6.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, 270);
+            this.tabMx.Name = "tabMx";
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(1126, 300);
+            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.labelControl7);
+            this.panel1.Controls.Add(this.txt_cusNo);
+            this.panel1.Controls.Add(this.labelControl6);
+            this.panel1.Controls.Add(this.txt_ckName);
+            this.panel1.Controls.Add(this.labelControl5);
+            this.panel1.Controls.Add(this.txt_xxNo);
+            this.panel1.Controls.Add(this.labelControl4);
+            this.panel1.Controls.Add(this.txt_ckNo);
+            this.panel1.Controls.Add(this.txt_outType);
+            this.panel1.Controls.Add(this.labelControl1);
+            this.panel1.Controls.Add(this.txt_xxzz);
+            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_outType);
+            this.panel1.Controls.Add(this.txt_cusName);
+            this.panel1.Controls.Add(this.lb_workNo);
+            this.panel1.Controls.Add(this.txt_abtNo);
+            this.panel1.Controls.Add(this.lb_outPart);
+            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_kcOrg);
+            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, 270);
+            this.panel1.TabIndex = 1;
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl7.Appearance.Options.UseFont = true;
+            this.labelControl7.Location = new System.Drawing.Point(311, 136);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(68, 21);
+            this.labelControl7.TabIndex = 588;
+            this.labelControl7.Text = "瀹㈡埛缂栧彿";
+            // 
+            // txt_cusNo
+            // 
+            this.txt_cusNo.Location = new System.Drawing.Point(349, 132);
+            this.txt_cusNo.Name = "txt_cusNo";
+            this.txt_cusNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_cusNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_cusNo.Size = new System.Drawing.Size(187, 28);
+            this.txt_cusNo.TabIndex = 589;
+            // 
+            // labelControl6
+            // 
+            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl6.Appearance.Options.UseFont = true;
+            this.labelControl6.Location = new System.Drawing.Point(581, 180);
+            this.labelControl6.Name = "labelControl6";
+            this.labelControl6.Size = new System.Drawing.Size(68, 21);
+            this.labelControl6.TabIndex = 586;
+            this.labelControl6.Text = "鍑哄簱鍚嶇О";
+            // 
+            // txt_ckName
+            // 
+            this.txt_ckName.Location = new System.Drawing.Point(653, 176);
+            this.txt_ckName.Name = "txt_ckName";
+            this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_ckName.Properties.Appearance.Options.UseFont = true;
+            this.txt_ckName.Size = new System.Drawing.Size(187, 28);
+            this.txt_ckName.TabIndex = 587;
+            // 
+            // labelControl5
+            // 
+            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl5.Appearance.Options.UseFont = true;
+            this.labelControl5.Location = new System.Drawing.Point(8, 181);
+            this.labelControl5.Name = "labelControl5";
+            this.labelControl5.Size = new System.Drawing.Size(68, 21);
+            this.labelControl5.TabIndex = 584;
+            this.labelControl5.Text = "閿�鍞崟鍙�";
+            // 
+            // txt_xxNo
+            // 
+            this.txt_xxNo.Location = new System.Drawing.Point(86, 177);
+            this.txt_xxNo.Name = "txt_xxNo";
+            this.txt_xxNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_xxNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_xxNo.Size = new System.Drawing.Size(168, 28);
+            this.txt_xxNo.TabIndex = 585;
+            // 
+            // labelControl4
+            // 
+            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl4.Appearance.Options.UseFont = true;
+            this.labelControl4.Location = new System.Drawing.Point(277, 182);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(68, 21);
+            this.labelControl4.TabIndex = 582;
+            this.labelControl4.Text = "鍑哄簱缂栧彿";
+            // 
+            // txt_ckNo
+            // 
+            this.txt_ckNo.Location = new System.Drawing.Point(349, 178);
+            this.txt_ckNo.Name = "txt_ckNo";
+            this.txt_ckNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_ckNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_ckNo.Size = new System.Drawing.Size(187, 28);
+            this.txt_ckNo.TabIndex = 583;
+            // 
+            // txt_outType
+            // 
+            this.txt_outType.Location = new System.Drawing.Point(86, 81);
+            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(185, 28);
+            this.txt_outType.TabIndex = 577;
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl1.Appearance.Options.UseFont = true;
+            this.labelControl1.Location = new System.Drawing.Point(14, 85);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(68, 21);
+            this.labelControl1.TabIndex = 576;
+            this.labelControl1.Text = "鍑哄簱绫诲埆";
+            // 
+            // txt_xxzz
+            // 
+            this.txt_xxzz.Location = new System.Drawing.Point(349, 49);
+            this.txt_xxzz.Name = "txt_xxzz";
+            this.txt_xxzz.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_xxzz.Properties.Appearance.Options.UseFont = true;
+            this.txt_xxzz.Size = new System.Drawing.Size(187, 28);
+            this.txt_xxzz.TabIndex = 573;
+            // 
+            // txt_status
+            // 
+            this.txt_status.Location = new System.Drawing.Point(868, 116);
+            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, 122);
+            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(964, 119);
+            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(996, 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_SalesDeliverDj
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Name = "Frm_SalesDeliverDj";
+            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_cusName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_abtNo.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_kcOrg.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);
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+            this.tabMx.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cusNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xxNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ckNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xxzz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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 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.XtraGrid.Columns.GridColumn gv_pbillNo;
+
+        private DevExpress.XtraEditors.LabelControl lb_outType;
+        private DevExpress.XtraEditors.TextEdit txt_cusName;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_outType;
+
+        private DevExpress.XtraEditors.LabelControl lb_workNo;
+        private DevExpress.XtraEditors.TextEdit txt_abtNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_receiver;
+
+        private DevExpress.XtraEditors.LabelControl lb_outPart;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_outPart;
+        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.XtraGrid.Columns.GridColumn gv_reason;
+
+        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_kcOrg;
+
+        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 System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lotNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotSectionCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
+        private DevExpress.XtraEditors.TextEdit txt_xxzz;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private DevExpress.XtraEditors.TextEdit txt_ckNo;
+        private DevExpress.XtraEditors.TextEdit txt_outType;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraEditors.LabelControl labelControl5;
+        private DevExpress.XtraEditors.TextEdit txt_xxNo;
+        private DevExpress.XtraEditors.LabelControl labelControl6;
+        private DevExpress.XtraEditors.TextEdit txt_ckName;
+        private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraEditors.TextEdit txt_cusNo;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
new file mode 100644
index 0000000..e2a537e
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs
@@ -0,0 +1,357 @@
+锘縰sing Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Ck
+{
+    public partial class Frm_SalesDeliverDj : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "SalesDeliverDjManager/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        public Frm_SalesDeliverDj()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            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) =>
+           {
+               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+           });
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            });
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+        }
+
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            Task.Delay(100);
+            getPageList(1);
+        }
+        /// <summary>
+        /// 鏃ュ織
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemOutNo, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
+            string json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                        gridView1.BestFitColumns();
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    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);
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = dt;
+                        gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+                    }
+                    JArray array1 = new JArray();
+                    foreach (var a in _job["rtnData"]["list2"])
+                    {
+                        array1.Add(a);
+                    }
+                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                    if (dt1.Rows.Count > 0)
+                    {
+                        gcMx2.BindingContext = new BindingContext();
+                        gcMx2.DataSource = dt1;
+                        gcMx2.ForceInitialize();
+                        gvMx2.BestFitColumns();
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+                    }
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            gvMx2.CloseEditor();
+            gvMx2.UpdateCurrentRow();
+            var rowhandle = gvMx2.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMx2.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvMx2.DeleteRow(rowhandle);
+                    return;
+                }
+                var strJson = "";
+                var lst = new List<string>();
+                lst.Add(mxGuid);
+                try
+                {
+                    strJson = UtilityHelper.HttpPost("",
+                        _webServiceName + "DeleteModelMx2",
+                        JsonConvert.SerializeObject(lst));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                inFieldValue = _inFieldValue,
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModelSubmit",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    Form parentForm = this.FindForm();
+                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, parentForm, _inFieldValue.ToString());
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.resx b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 76b5c4a..6fc4e5e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -376,6 +376,12 @@
     <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.Designer.cs">
       <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesDeliverDj.Designer.cs">
+      <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Sales\Frm_SalesDeliver.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1078,6 +1084,9 @@
     <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
       <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliverDj.resx">
+      <DependentUpon>Frm_SalesDeliverDj.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sales\Frm_SalesDeliver.resx">
       <DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0d5f043..2ccb088 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2057,76 +2057,6 @@
                
             }
         }
-
-        public static void getXmlConfig(string namespaceFullName, List<DevExpress.XtraGrid.Views.Grid.GridView> gvList)
-        {
-            // gridView1.ShowCustomization();
-            // gridView1.OptionsMenu.EnableColumnMenu = false;
-            JArray array = new JArray();
-            var _obj = new
-            {
-                formPath = namespaceFullName,
-            };
-            try
-            {
-                string strJson = UtilityHelper.HttpPost("", "Fm/GetModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    JObject _job = JObject.Parse(strJson);
-                    foreach (var a in _job["rtnData"]["list"])
-                    {
-                        //string _id = a["controlId"].ToString();
-                        //string _controlType = a["controlType"].ToString();
-                        //string _controlXml = a["controlXml"].ToString();
-                        //string _splitterPosition = a["splitterPosition"].ToString();
-                        array.Add(a);
-                    }
-                    foreach (GridView gridView1 in gvList)
-                    {
-                        gridView1.PopupMenuShowing += (s, e) =>
-                        {
-                            if (e.MenuType == DevExpress.XtraGrid.Views.Grid.GridMenuType.Column)
-                            {
-                                GridViewColumnMenu menu = e.Menu as GridViewColumnMenu;
-                                if (menu != null)
-                                {
-                                    string[] ary = { "Column Chooser", "Hide This Column", "Clear All Sorting", "Clear Sorting", "Sort Descending", "Sort Ascending", "Best Fit (all columns)" };
-                                    for (int i = menu.Items.Count - 1; i >= 0; i--)
-                                    {
-                                        string _caption = menu.Items[i].Caption;
-                                        if (!ary.Contains(_caption))
-                                        {
-                                            menu.Items.Remove(menu.Items[i]);
-                                        }
-                                    }
-                                }
-                            }
-                        };
-                        gridView1.OptionsView.ShowGroupPanel = false;
-                        gridView1.OptionsCustomization.AllowGroup = false;
-                        JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gridView1.Name.ToString().Trim().ToUpper());
-                        if (john != null)
-                        {
-                            string controlId = john["controlId"].ToString();
-                            string controlXml = john["controlXml"].ToString();
-                            byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
-                            using (var stream = new MemoryStream(byteArray))
-                            {
-                                gridView1.RestoreLayoutFromStream(stream);
-                            }
-                        }
-                    }
-                }
-                else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-            }
-            catch (Exception ex)
-            {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-
-        }
     }
 
     /// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
index 69905ec..054e83b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -165,6 +165,33 @@
             }
             return "";
         }
-
+        /// <summary>
+        /// 鏀惰揣鏂�
+        /// </summary>
+        /// <returns></returns>
+        public string GetSalesShf()
+        {
+            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            if (row != null)
+            {
+                string id = row["shfTxt"].ToString();
+                return id;
+            }
+            return "";
+        }
+        /// <summary>
+        /// 鏀惰揣浜哄鍚�
+        /// </summary>
+        /// <returns></returns>
+        public string GetSalesShfName()
+        {
+            var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+            if (row != null)
+            {
+                string id = row["shfName"].ToString();
+                return id;
+            }
+            return "";
+        }
     }
 }
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index d1506cd..00da511 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -9,11 +9,9 @@
 using System.Windows.Forms;
 using DevExpress.XtraBars;
 using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.TextEditController;
 using DevExpress.XtraGrid;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraLayout;
-using Gs.DevApp.DevFrm.QC.Models;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.Entity;
@@ -1142,8 +1140,6 @@
                     }
                     foreach (GridView gv in gvList)
                     {
-                       
-
                         JToken john = array.FirstOrDefault(t => t["controlId"].ToString().ToUpper() == gv.Name.ToString().Trim().ToUpper());
                         if (john != null)
                         {
@@ -1177,11 +1173,17 @@
                         {
                             string controlId = john["controlId"].ToString();
                             string controlXml = john["controlXml"].ToString();
+                           // string splitterPosition = john["splitterPosition"].ToString();
                             byte[] byteArray = Encoding.UTF8.GetBytes(controlXml);
                             using (var stream = new MemoryStream(byteArray))
                             {
                                 spt.RestoreLayoutFromStream(stream);
                             }
+                            spt.Horizontal = false;
+                            spt.Panel1.AutoScroll = false;
+                            spt.Panel2.AutoScroll = false;
+                            spt.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+                            //   spt.SplitterPosition = int.Parse( splitterPosition);
                         }
                     }
                 }

--
Gitblit v1.9.3