From 3d429071ceeda5ce75ca660c13459c13f3d92337 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 26 二月 2025 10:30:11 +0800
Subject: [PATCH] 调拨

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs | 1607 +++++++++++++++----------
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs          |   18 
 DevApp/Gs.DevApp/Gs.DevApp.csproj                           |    9 
 DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json         |    2 
 DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs               |  242 +--
 DevApp/Gs.DevApp/ToolBox/SetDrag.Designer.cs                |  194 +++
 DevApp/Gs.DevApp/ToolBox/SetDrag.resx                       |  140 ++
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs  |  120 +
 DevApp/Gs.DevApp/DevFrm/XtraForm1.resx                      |    5 
 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs                   |   31 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs           |   20 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs            |   42 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs    | 1029 +++++++++++-----
 DevApp/Gs.DevApp/ToolBox/SetDrag.cs                         |   21 
 DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs                  |   87 +
 DevApp/Gs.DevApp/DevFrm/Sales/Sales.rar                     |    0 
 DevApp/Gs.DevApp/DevFrm/XtraForm1.cs                        |   10 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs             |    4 
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs   |  128 +-
 19 files changed, 2,427 insertions(+), 1,282 deletions(-)

diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
index 4cfe291..08f4c0d 100644
--- a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
+++ b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDaaDirectOut.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDaaDirectOut.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSqDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSqDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesInvItemOut_SCLL.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesInvItemOut_SCLL.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBl.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBlDJ.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBlDJ.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemCl.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemCl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemClDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemClDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQtDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQtDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlcl.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlcl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclDj.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclDj.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectType.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectType.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesDefectCode.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesDefectType.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql2.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql3.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitem.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookupTypes.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbck.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbck.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQt.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQt.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrk.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrk.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl_RK.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl_RK.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\FileSelector.cs"},{"SourceFile":"DevFrm\\FrmLogin.cs"},{"SourceFile":"DevFrm\\FrmLogin.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintInfo.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbckDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbckDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemInCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem3.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBlDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBlDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwLlDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwLlDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTblDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTblDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwClDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwClDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTbl.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTbl.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBl.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_ProductionOrder.cs"},{"SourceFile":"DevFrm\\WW\\Frm_ProductionOrder.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwCl.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwCl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwGd.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwGd.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwPc.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwPc.Designer.cs"},{"SourceFile":"DevFrm\\WW\\SelectWwTbl.cs"},{"SourceFile":"DevFrm\\WW\\SelectWwTbl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\WwBlcl.cs"},{"SourceFile":"DevFrm\\WW\\WwBlcl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\WwBlclDj.cs"},{"SourceFile":"DevFrm\\WW\\WwBlclDj.Designer.cs"},{"SourceFile":"DevFrm\\XtraForm1.cs"},{"SourceFile":"DevFrm\\XtraForm1.Designer.cs"},{"SourceFile":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"ToolBox\\DragResizeHelp.cs"},{"SourceFile":"ToolBox\\LogHelper.cs"},{"SourceFile":"ToolBox\\MsgHelper.cs"},{"SourceFile":"ToolBox\\UpdateParentEventArgs.cs"},{"SourceFile":"ToolBox\\UtilityHelper.cs"},{"SourceFile":"UserControl\\SelectCgMx.cs"},{"SourceFile":"UserControl\\SelectCgMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.Designer.cs"},{"SourceFile":"UserControl\\SelectCw.cs"},{"SourceFile":"UserControl\\SelectCw.Designer.cs"},{"SourceFile":"UserControl\\SelectHz.cs"},{"SourceFile":"UserControl\\SelectHz.Designer.cs"},{"SourceFile":"UserControl\\SelectItemTbl.cs"},{"SourceFile":"UserControl\\SelectItemTbl.Designer.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.Designer.cs"},{"SourceFile":"UserControl\\SelectOrg.cs"},{"SourceFile":"UserControl\\SelectOrg.Designer.cs"},{"SourceFile":"UserControl\\SelectWomdaahb.cs"},{"SourceFile":"UserControl\\SelectWomdaahb.Designer.cs"},{"SourceFile":"UserControl\\SelectWompba.cs"},{"SourceFile":"UserControl\\SelectWompba.Designer.cs"},{"SourceFile":"UserControl\\SelectWwPc.cs"},{"SourceFile":"UserControl\\SelectWwPc.Designer.cs"},{"SourceFile":"UserControl\\ShowFile.cs"},{"SourceFile":"UserControl\\ShowFile.Designer.cs"},{"SourceFile":"UserControl\\showLayOut.cs"},{"SourceFile":"UserControl\\showLayOut.Designer.cs"},{"SourceFile":"UserControl\\ShowLogcs.cs"},{"SourceFile":"UserControl\\ShowLogcs.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\ShowUp.cs"},{"SourceFile":"UserControl\\ShowUp.Designer.cs"},{"SourceFile":"UserControl\\showZhongTai.cs"},{"SourceFile":"UserControl\\showZhongTai.Designer.cs"},{"SourceFile":"UserControl\\UcBtnPrint.cs"},{"SourceFile":"UserControl\\UcBtnPrint.Designer.cs"},{"SourceFile":"UserControl\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookCustomer.cs"},{"SourceFile":"UserControl\\UcLookCustomer.Designer.cs"},{"SourceFile":"UserControl\\UcLookDaa.cs"},{"SourceFile":"UserControl\\UcLookDaa.Designer.cs"},{"SourceFile":"UserControl\\UcLookDefectType.cs"},{"SourceFile":"UserControl\\UcLookDefectType.Designer.cs"},{"SourceFile":"UserControl\\UcLookDepartment.cs"},{"SourceFile":"UserControl\\UcLookDepartment.Designer.cs"},{"SourceFile":"UserControl\\UcLookHuoZhu.cs"},{"SourceFile":"UserControl\\UcLookHuoZhu.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookOrg.cs"},{"SourceFile":"UserControl\\UcLookOrg.Designer.cs"},{"SourceFile":"UserControl\\UcLookPrint.cs"},{"SourceFile":"UserControl\\UcLookPrint.Designer.cs"},{"SourceFile":"UserControl\\UcLookStaff.cs"},{"SourceFile":"UserControl\\UcLookStaff.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcLookUnit.cs"},{"SourceFile":"UserControl\\UcLookUnit.Designer.cs"},{"SourceFile":"UserControl\\UcLookUser.cs"},{"SourceFile":"UserControl\\UcLookUser.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkline.cs"},{"SourceFile":"UserControl\\UcLookWorkline.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.Designer.cs"},{"SourceFile":"UserControl\\UcLookWwgd.cs"},{"SourceFile":"UserControl\\UcLookWwgd.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\UCUpFile.cs"},{"SourceFile":"UserControl\\UCUpFile.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.WinForms.129.0.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDaaDirectOut.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDaaDirectOut.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSqDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSqDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesInvItemOut_SCLL.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesInvItemOut_SCLL.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBl.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBlDJ.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBlDJ.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemCl.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemCl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemClDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemClDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQtDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQtDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlcl.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlcl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclDj.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclDj.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectType.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectType.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesDefectCode.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesDefectType.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql2.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql3.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitem.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookupTypes.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesDeliver.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesDeliver.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesOrder.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesOrder.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesOrder111.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesOrder111.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbck.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbck.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQt.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQt.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrk.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrk.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl_RK.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTbl_RK.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\FileSelector.cs"},{"SourceFile":"DevFrm\\FrmLogin.cs"},{"SourceFile":"DevFrm\\FrmLogin.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintInfo.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbckDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbckDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemInCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem3.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBlDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBlDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwLlDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwLlDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTblDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTblDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwClDj.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwClDj.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTbl.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwTbl.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBl.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwBl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_ProductionOrder.cs"},{"SourceFile":"DevFrm\\WW\\Frm_ProductionOrder.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwCl.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwCl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwGd.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwGd.Designer.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwPc.cs"},{"SourceFile":"DevFrm\\WW\\Frm_WwPc.Designer.cs"},{"SourceFile":"DevFrm\\WW\\SelectWwTbl.cs"},{"SourceFile":"DevFrm\\WW\\SelectWwTbl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\WwBlcl.cs"},{"SourceFile":"DevFrm\\WW\\WwBlcl.Designer.cs"},{"SourceFile":"DevFrm\\WW\\WwBlclDj.cs"},{"SourceFile":"DevFrm\\WW\\WwBlclDj.Designer.cs"},{"SourceFile":"DevFrm\\XtraForm1.cs"},{"SourceFile":"DevFrm\\XtraForm1.Designer.cs"},{"SourceFile":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"ToolBox\\DragResizeHelp.cs"},{"SourceFile":"ToolBox\\LogHelper.cs"},{"SourceFile":"ToolBox\\MsgHelper.cs"},{"SourceFile":"ToolBox\\UpdateParentEventArgs.cs"},{"SourceFile":"ToolBox\\UtilityHelper.cs"},{"SourceFile":"UserControl\\SelectCgMx.cs"},{"SourceFile":"UserControl\\SelectCgMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.Designer.cs"},{"SourceFile":"UserControl\\SelectCw.cs"},{"SourceFile":"UserControl\\SelectCw.Designer.cs"},{"SourceFile":"UserControl\\SelectHz.cs"},{"SourceFile":"UserControl\\SelectHz.Designer.cs"},{"SourceFile":"UserControl\\SelectItemTbl.cs"},{"SourceFile":"UserControl\\SelectItemTbl.Designer.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.Designer.cs"},{"SourceFile":"UserControl\\SelectOrg.cs"},{"SourceFile":"UserControl\\SelectOrg.Designer.cs"},{"SourceFile":"UserControl\\SelectWomdaahb.cs"},{"SourceFile":"UserControl\\SelectWomdaahb.Designer.cs"},{"SourceFile":"UserControl\\SelectWompba.cs"},{"SourceFile":"UserControl\\SelectWompba.Designer.cs"},{"SourceFile":"UserControl\\SelectWwPc.cs"},{"SourceFile":"UserControl\\SelectWwPc.Designer.cs"},{"SourceFile":"UserControl\\ShowFile.cs"},{"SourceFile":"UserControl\\ShowFile.Designer.cs"},{"SourceFile":"UserControl\\showLayOut.cs"},{"SourceFile":"UserControl\\showLayOut.Designer.cs"},{"SourceFile":"UserControl\\ShowLogcs.cs"},{"SourceFile":"UserControl\\ShowLogcs.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\ShowUp.cs"},{"SourceFile":"UserControl\\ShowUp.Designer.cs"},{"SourceFile":"UserControl\\showZhongTai.cs"},{"SourceFile":"UserControl\\showZhongTai.Designer.cs"},{"SourceFile":"UserControl\\UcBtnPrint.cs"},{"SourceFile":"UserControl\\UcBtnPrint.Designer.cs"},{"SourceFile":"UserControl\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookCustomer.cs"},{"SourceFile":"UserControl\\UcLookCustomer.Designer.cs"},{"SourceFile":"UserControl\\UcLookDaa.cs"},{"SourceFile":"UserControl\\UcLookDaa.Designer.cs"},{"SourceFile":"UserControl\\UcLookDefectType.cs"},{"SourceFile":"UserControl\\UcLookDefectType.Designer.cs"},{"SourceFile":"UserControl\\UcLookDepartment.cs"},{"SourceFile":"UserControl\\UcLookDepartment.Designer.cs"},{"SourceFile":"UserControl\\UcLookHuoZhu.cs"},{"SourceFile":"UserControl\\UcLookHuoZhu.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookOrg.cs"},{"SourceFile":"UserControl\\UcLookOrg.Designer.cs"},{"SourceFile":"UserControl\\UcLookPrint.cs"},{"SourceFile":"UserControl\\UcLookPrint.Designer.cs"},{"SourceFile":"UserControl\\UcLookSales.cs"},{"SourceFile":"UserControl\\UcLookSales.Designer.cs"},{"SourceFile":"UserControl\\UcLookStaff.cs"},{"SourceFile":"UserControl\\UcLookStaff.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcLookUnit.cs"},{"SourceFile":"UserControl\\UcLookUnit.Designer.cs"},{"SourceFile":"UserControl\\UcLookUser.cs"},{"SourceFile":"UserControl\\UcLookUser.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkline.cs"},{"SourceFile":"UserControl\\UcLookWorkline.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.Designer.cs"},{"SourceFile":"UserControl\\UcLookWwgd.cs"},{"SourceFile":"UserControl\\UcLookWwgd.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\UCUpFile.cs"},{"SourceFile":"UserControl\\UCUpFile.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.WinForms.129.0.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index aa1dbf3..d89e316 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -47,6 +47,8 @@
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
             this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
             this.txt_fApproverStaus = new DevExpress.XtraEditors.TextEdit();
             this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -88,28 +90,28 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
             this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
             this.lb_salesId = new DevExpress.XtraEditors.LabelControl();
             this.txt_fSaleOrgId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fStockOrgId = new DevExpress.XtraEditors.TextEdit();
             this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
@@ -131,10 +133,8 @@
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1fseq
@@ -240,7 +240,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 282);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 354);
             this.tabMxPage1.Text = "鏄庣粏1";
             // 
             // gcMx1
@@ -252,7 +252,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 282);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 354);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -308,6 +308,27 @@
             this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 8;
+            this.gvMxDel.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
             // lb_fApproverStaus
             // 
             this.lb_fApproverStaus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -331,8 +352,8 @@
             // 
             this.gv_fApproverStaus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
-            this.gv_fApproverStaus.Caption = "FApproverStaus ";
-            this.gv_fApproverStaus.FieldName = "fApproverStaus";
+            this.gv_fApproverStaus.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_fApproverStaus.FieldName = "chkStatus";
             this.gv_fApproverStaus.MinWidth = 50;
             this.gv_fApproverStaus.Name = "gv_fApproverStaus";
             this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
@@ -386,7 +407,7 @@
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(830, 84);
+            this.txt_fDate.Location = new System.Drawing.Point(849, 84);
             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;
@@ -509,7 +530,7 @@
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(830, 52);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(849, 52);
             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;
@@ -542,7 +563,7 @@
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(580, 52);
+            this.txt_fApproverID.Location = new System.Drawing.Point(592, 52);
             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;
@@ -553,7 +574,7 @@
             // 
             this.gv_fApproverID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
-            this.gv_fApproverID.Caption = "FApproverID ";
+            this.gv_fApproverID.Caption = "瀹℃牳浜�";
             this.gv_fApproverID.FieldName = "fApproverID";
             this.gv_fApproverID.MinWidth = 50;
             this.gv_fApproverID.Name = "gv_fApproverID";
@@ -779,13 +800,24 @@
             this.gv_fCustomerID,
             this.gv_fDate,
             this.gv_fNote,
-            this.gv_fApproverStaus});
+            this.gv_fApproverStaus,
+            this.gridColumn2});
             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;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "瀹岀粨鏍囪瘑";
+            this.gridColumn2.FieldName = "wjStatus";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 14;
+            this.gridColumn2.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -831,10 +863,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 256);
+            this.tabMx.Location = new System.Drawing.Point(0, 184);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 314);
+            this.tabMx.Size = new System.Drawing.Size(1126, 386);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -842,11 +874,11 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_fStockOrgId);
             this.panel1.Controls.Add(this.txt_fCustomerID);
             this.panel1.Controls.Add(this.txt_salesId);
             this.panel1.Controls.Add(this.lb_salesId);
             this.panel1.Controls.Add(this.txt_fSaleOrgId);
-            this.panel1.Controls.Add(this.txt_fStockOrgId);
             this.panel1.Controls.Add(this.txt_fBillTypeID);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
@@ -878,12 +910,20 @@
             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, 256);
+            this.panel1.Size = new System.Drawing.Size(1126, 184);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_fStockOrgId
+            // 
+            this.txt_fStockOrgId.IsReadly = false;
+            this.txt_fStockOrgId.Location = new System.Drawing.Point(80, 48);
+            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
+            this.txt_fStockOrgId.Size = new System.Drawing.Size(138, 30);
+            this.txt_fStockOrgId.TabIndex = 369;
             // 
             // txt_fCustomerID
             // 
-            this.txt_fCustomerID.Location = new System.Drawing.Point(565, 86);
+            this.txt_fCustomerID.Location = new System.Drawing.Point(592, 86);
             this.txt_fCustomerID.Name = "txt_fCustomerID";
             this.txt_fCustomerID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCustomerID.Properties.Appearance.Options.UseFont = true;
@@ -893,7 +933,7 @@
             // txt_salesId
             // 
             this.txt_salesId.IsReadly = false;
-            this.txt_salesId.Location = new System.Drawing.Point(144, 190);
+            this.txt_salesId.Location = new System.Drawing.Point(80, 150);
             this.txt_salesId.Name = "txt_salesId";
             this.txt_salesId.Size = new System.Drawing.Size(234, 29);
             this.txt_salesId.TabIndex = 367;
@@ -902,7 +942,7 @@
             // 
             this.lb_salesId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_salesId.Appearance.Options.UseFont = true;
-            this.lb_salesId.Location = new System.Drawing.Point(39, 190);
+            this.lb_salesId.Location = new System.Drawing.Point(20, 150);
             this.lb_salesId.Name = "lb_salesId";
             this.lb_salesId.Size = new System.Drawing.Size(68, 21);
             this.lb_salesId.TabIndex = 366;
@@ -917,19 +957,10 @@
             this.txt_fSaleOrgId.Size = new System.Drawing.Size(150, 28);
             this.txt_fSaleOrgId.TabIndex = 365;
             // 
-            // txt_fStockOrgId
-            // 
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(90, 52);
-            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fStockOrgId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(150, 28);
-            this.txt_fStockOrgId.TabIndex = 364;
-            // 
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(584, 17);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(592, 17);
             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)});
@@ -967,27 +998,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 8;
-            this.gvMxDel.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
             // Frm_SalesDeliver
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1002,6 +1012,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
@@ -1024,10 +1035,8 @@
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1109,7 +1118,6 @@
         private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
         private DevExpress.XtraEditors.TextEdit txt_fSaleOrgId;
-        private DevExpress.XtraEditors.TextEdit txt_fStockOrgId;
         private DevExpress.XtraEditors.LabelControl lb_salesId;
         private UserControl.UcLookSales txt_salesId;
         private DevExpress.XtraEditors.TextEdit txt_fCustomerID;
@@ -1118,5 +1126,7 @@
         private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private UserControl.UcLookOrg txt_fStockOrgId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
     }
 }
\ 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 a19206e..11979a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -131,7 +131,7 @@
         {
             string rowGuid = "", rowName = "";
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billNo, gridView1, "fBillNo");
+                lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -239,9 +239,16 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-             string djlx = txt_fBillTypeID.Text.ToString();
-             string FNote = txt_fNote.Text.ToString();
+            string djlx = txt_fBillTypeID.Text.ToString();
+            string FNote = txt_fNote.Text.ToString();
             string _sqGuid = txt_salesId.GetId();
+            string _fhOrg = txt_fStockOrgId.GetId();
+            if (string.IsNullOrEmpty(_fhOrg))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戣揣缁勭粐锛�");
+                txt_fStockOrgId.Focus();
+                return;
+            }
             if (txt_fBillTypeID.SelectedIndex < 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -260,6 +267,7 @@
                 djlx = djlx,//鍗曟嵁绫诲瀷
                 salesId = _sqGuid,//閿�鍞崟鍙�
                 inRemark = FNote.Trim(),//澶囨敞
+                fhOrg = _fhOrg,
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -460,7 +468,7 @@
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "fBillNo");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -488,7 +496,7 @@
                     }
                     int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                     gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, _inFieldValue.ToString());
                 }
             }
             catch (Exception ex)
@@ -551,6 +559,6 @@
             }
         }
 
-       
+
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index 4a97a25..6c5e7a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -29,6 +29,8 @@
         /// </summary>
         private void InitializeComponent()
         {
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1eHid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1settleOrgIds = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -148,41 +150,17 @@
             this.lb_salerId = new DevExpress.XtraEditors.LabelControl();
             this.txt_salerId = new DevExpress.XtraEditors.TextEdit();
             this.gv_salerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_saleDeptId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_saleDeptId = new DevExpress.XtraEditors.TextEdit();
             this.gv_saleDeptId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_custId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_custId = new DevExpress.XtraEditors.TextEdit();
             this.gv_custId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_headLocId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_headLocId = new DevExpress.XtraEditors.TextEdit();
             this.gv_headLocId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_headDeliveryWay = new DevExpress.XtraEditors.LabelControl();
-            this.txt_headDeliveryWay = new DevExpress.XtraEditors.TextEdit();
             this.gv_headDeliveryWay = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_businessType = new DevExpress.XtraEditors.LabelControl();
-            this.txt_businessType = new DevExpress.XtraEditors.TextEdit();
             this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_documentStatus = new DevExpress.XtraEditors.LabelControl();
-            this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit();
             this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_billTypeId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_billTypeId = new DevExpress.XtraEditors.TextEdit();
             this.gv_billTypeId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_erpId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_erpId = new DevExpress.XtraEditors.TextEdit();
             this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_id = new DevExpress.XtraEditors.LabelControl();
-            this.txt_id = new DevExpress.XtraEditors.TextEdit();
             this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
@@ -195,7 +173,57 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.lb_id = new DevExpress.XtraEditors.LabelControl();
+            this.txt_id = new DevExpress.XtraEditors.TextEdit();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.lb_erpId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_erpId = new DevExpress.XtraEditors.TextEdit();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.lb_billTypeId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_billTypeId = new DevExpress.XtraEditors.TextEdit();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
+            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.panel6 = new System.Windows.Forms.Panel();
+            this.panel7 = new System.Windows.Forms.Panel();
+            this.panel8 = new System.Windows.Forms.Panel();
+            this.panel9 = new System.Windows.Forms.Panel();
+            this.panel10 = new System.Windows.Forms.Panel();
+            this.panel11 = new System.Windows.Forms.Panel();
+            this.panel12 = new System.Windows.Forms.Panel();
+            this.panel13 = new System.Windows.Forms.Panel();
+            this.panel14 = new System.Windows.Forms.Panel();
+            this.panel15 = new System.Windows.Forms.Panel();
+            this.panel16 = new System.Windows.Forms.Panel();
+            this.panel17 = new System.Windows.Forms.Panel();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
+            this.lb_headDeliveryWay = new DevExpress.XtraEditors.LabelControl();
+            this.txt_headDeliveryWay = new DevExpress.XtraEditors.TextEdit();
+            this.lb_businessType = new DevExpress.XtraEditors.LabelControl();
+            this.txt_businessType = new DevExpress.XtraEditors.TextEdit();
+            this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
+            this.lb_documentStatus = new DevExpress.XtraEditors.LabelControl();
+            this.txt_documentStatus = new DevExpress.XtraEditors.TextEdit();
+            this.lb_saleDeptId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_saleDeptId = new DevExpress.XtraEditors.TextEdit();
+            this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
+            this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
+            this.lb_custId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_custId = new DevExpress.XtraEditors.TextEdit();
+            this.lb_headLocId = new DevExpress.XtraEditors.LabelControl();
+            this.txt_headLocId = new DevExpress.XtraEditors.TextEdit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -224,18 +252,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_note.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_changeReason.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salerId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -245,7 +261,45 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+            this.splitContainerControl1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+            this.splitContainerControl1.SuspendLayout();
+            this.panel4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
+            this.panel5.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).BeginInit();
+            this.panel3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).BeginInit();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            this.panel6.SuspendLayout();
+            this.panel7.SuspendLayout();
+            this.panel8.SuspendLayout();
+            this.panel9.SuspendLayout();
+            this.panel10.SuspendLayout();
+            this.panel11.SuspendLayout();
+            this.panel12.SuspendLayout();
+            this.panel13.SuspendLayout();
+            this.panel14.SuspendLayout();
+            this.panel15.SuspendLayout();
+            this.panel16.SuspendLayout();
+            this.panel17.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1eHid
@@ -1675,25 +1729,6 @@
             this.gv_salerId.VisibleIndex = 12;
             this.gv_salerId.Width = 94;
             // 
-            // lb_saleDeptId
-            // 
-            this.lb_saleDeptId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_saleDeptId.Appearance.Options.UseFont = true;
-            this.lb_saleDeptId.Location = new System.Drawing.Point(770, 84);
-            this.lb_saleDeptId.Name = "lb_saleDeptId";
-            this.lb_saleDeptId.Size = new System.Drawing.Size(73, 21);
-            this.lb_saleDeptId.TabIndex = 240;
-            this.lb_saleDeptId.Text = "閿�鍞儴闂� ";
-            // 
-            // txt_saleDeptId
-            // 
-            this.txt_saleDeptId.Location = new System.Drawing.Point(830, 84);
-            this.txt_saleDeptId.Name = "txt_saleDeptId";
-            this.txt_saleDeptId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_saleDeptId.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleDeptId.Size = new System.Drawing.Size(150, 28);
-            this.txt_saleDeptId.TabIndex = 240;
-            // 
             // gv_saleDeptId
             // 
             this.gv_saleDeptId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1707,25 +1742,6 @@
             this.gv_saleDeptId.Visible = true;
             this.gv_saleDeptId.VisibleIndex = 11;
             this.gv_saleDeptId.Width = 94;
-            // 
-            // lb_closeStatus
-            // 
-            this.lb_closeStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_closeStatus.Appearance.Options.UseFont = true;
-            this.lb_closeStatus.Location = new System.Drawing.Point(520, 84);
-            this.lb_closeStatus.Name = "lb_closeStatus";
-            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_closeStatus.TabIndex = 235;
-            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
-            // 
-            // txt_closeStatus
-            // 
-            this.txt_closeStatus.Location = new System.Drawing.Point(580, 84);
-            this.txt_closeStatus.Name = "txt_closeStatus";
-            this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_closeStatus.TabIndex = 235;
             // 
             // gv_closeStatus
             // 
@@ -1741,25 +1757,6 @@
             this.gv_closeStatus.VisibleIndex = 10;
             this.gv_closeStatus.Width = 94;
             // 
-            // lb_custId
-            // 
-            this.lb_custId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_custId.Appearance.Options.UseFont = true;
-            this.lb_custId.Location = new System.Drawing.Point(270, 84);
-            this.lb_custId.Name = "lb_custId";
-            this.lb_custId.Size = new System.Drawing.Size(39, 21);
-            this.lb_custId.TabIndex = 231;
-            this.lb_custId.Text = "瀹㈡埛 ";
-            // 
-            // txt_custId
-            // 
-            this.txt_custId.Location = new System.Drawing.Point(330, 84);
-            this.txt_custId.Name = "txt_custId";
-            this.txt_custId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_custId.Properties.Appearance.Options.UseFont = true;
-            this.txt_custId.Size = new System.Drawing.Size(150, 28);
-            this.txt_custId.TabIndex = 231;
-            // 
             // gv_custId
             // 
             this.gv_custId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1773,25 +1770,6 @@
             this.gv_custId.Visible = true;
             this.gv_custId.VisibleIndex = 9;
             this.gv_custId.Width = 94;
-            // 
-            // lb_headLocId
-            // 
-            this.lb_headLocId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_headLocId.Appearance.Options.UseFont = true;
-            this.lb_headLocId.Location = new System.Drawing.Point(20, 84);
-            this.lb_headLocId.Name = "lb_headLocId";
-            this.lb_headLocId.Size = new System.Drawing.Size(73, 21);
-            this.lb_headLocId.TabIndex = 228;
-            this.lb_headLocId.Text = "浜よ揣鍦扮偣 ";
-            // 
-            // txt_headLocId
-            // 
-            this.txt_headLocId.Location = new System.Drawing.Point(80, 84);
-            this.txt_headLocId.Name = "txt_headLocId";
-            this.txt_headLocId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
-            this.txt_headLocId.Size = new System.Drawing.Size(150, 28);
-            this.txt_headLocId.TabIndex = 228;
             // 
             // gv_headLocId
             // 
@@ -1807,25 +1785,6 @@
             this.gv_headLocId.VisibleIndex = 8;
             this.gv_headLocId.Width = 94;
             // 
-            // lb_headDeliveryWay
-            // 
-            this.lb_headDeliveryWay.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_headDeliveryWay.Appearance.Options.UseFont = true;
-            this.lb_headDeliveryWay.Location = new System.Drawing.Point(770, 52);
-            this.lb_headDeliveryWay.Name = "lb_headDeliveryWay";
-            this.lb_headDeliveryWay.Size = new System.Drawing.Size(73, 21);
-            this.lb_headDeliveryWay.TabIndex = 226;
-            this.lb_headDeliveryWay.Text = "浜よ揣鏂瑰紡 ";
-            // 
-            // txt_headDeliveryWay
-            // 
-            this.txt_headDeliveryWay.Location = new System.Drawing.Point(830, 52);
-            this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
-            this.txt_headDeliveryWay.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
-            this.txt_headDeliveryWay.Size = new System.Drawing.Size(150, 28);
-            this.txt_headDeliveryWay.TabIndex = 226;
-            // 
             // gv_headDeliveryWay
             // 
             this.gv_headDeliveryWay.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1839,25 +1798,6 @@
             this.gv_headDeliveryWay.Visible = true;
             this.gv_headDeliveryWay.VisibleIndex = 7;
             this.gv_headDeliveryWay.Width = 94;
-            // 
-            // lb_businessType
-            // 
-            this.lb_businessType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_businessType.Appearance.Options.UseFont = true;
-            this.lb_businessType.Location = new System.Drawing.Point(520, 52);
-            this.lb_businessType.Name = "lb_businessType";
-            this.lb_businessType.Size = new System.Drawing.Size(73, 21);
-            this.lb_businessType.TabIndex = 222;
-            this.lb_businessType.Text = "涓氬姟绫诲瀷 ";
-            // 
-            // txt_businessType
-            // 
-            this.txt_businessType.Location = new System.Drawing.Point(580, 52);
-            this.txt_businessType.Name = "txt_businessType";
-            this.txt_businessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_businessType.Properties.Appearance.Options.UseFont = true;
-            this.txt_businessType.Size = new System.Drawing.Size(150, 28);
-            this.txt_businessType.TabIndex = 222;
             // 
             // gv_businessType
             // 
@@ -1873,25 +1813,6 @@
             this.gv_businessType.VisibleIndex = 6;
             this.gv_businessType.Width = 94;
             // 
-            // lb_fDate
-            // 
-            this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fDate.Appearance.Options.UseFont = true;
-            this.lb_fDate.Location = new System.Drawing.Point(270, 52);
-            this.lb_fDate.Name = "lb_fDate";
-            this.lb_fDate.Size = new System.Drawing.Size(39, 21);
-            this.lb_fDate.TabIndex = 219;
-            this.lb_fDate.Text = "鏃ユ湡 ";
-            // 
-            // txt_fDate
-            // 
-            this.txt_fDate.Location = new System.Drawing.Point(330, 52);
-            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(150, 28);
-            this.txt_fDate.TabIndex = 219;
-            // 
             // gv_fDate
             // 
             this.gv_fDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1905,25 +1826,6 @@
             this.gv_fDate.Visible = true;
             this.gv_fDate.VisibleIndex = 5;
             this.gv_fDate.Width = 94;
-            // 
-            // lb_documentStatus
-            // 
-            this.lb_documentStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_documentStatus.Appearance.Options.UseFont = true;
-            this.lb_documentStatus.Location = new System.Drawing.Point(20, 52);
-            this.lb_documentStatus.Name = "lb_documentStatus";
-            this.lb_documentStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_documentStatus.TabIndex = 217;
-            this.lb_documentStatus.Text = "鍗曟嵁鐘舵�� ";
-            // 
-            // txt_documentStatus
-            // 
-            this.txt_documentStatus.Location = new System.Drawing.Point(80, 52);
-            this.txt_documentStatus.Name = "txt_documentStatus";
-            this.txt_documentStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_documentStatus.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentStatus.Size = new System.Drawing.Size(150, 28);
-            this.txt_documentStatus.TabIndex = 217;
             // 
             // gv_documentStatus
             // 
@@ -1939,25 +1841,6 @@
             this.gv_documentStatus.VisibleIndex = 4;
             this.gv_documentStatus.Width = 94;
             // 
-            // lb_billTypeId
-            // 
-            this.lb_billTypeId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_billTypeId.Appearance.Options.UseFont = true;
-            this.lb_billTypeId.Location = new System.Drawing.Point(770, 20);
-            this.lb_billTypeId.Name = "lb_billTypeId";
-            this.lb_billTypeId.Size = new System.Drawing.Size(73, 21);
-            this.lb_billTypeId.TabIndex = 216;
-            this.lb_billTypeId.Text = "鍗曟嵁绫诲瀷 ";
-            // 
-            // txt_billTypeId
-            // 
-            this.txt_billTypeId.Location = new System.Drawing.Point(830, 20);
-            this.txt_billTypeId.Name = "txt_billTypeId";
-            this.txt_billTypeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
-            this.txt_billTypeId.Size = new System.Drawing.Size(150, 28);
-            this.txt_billTypeId.TabIndex = 216;
-            // 
             // gv_billTypeId
             // 
             this.gv_billTypeId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1971,25 +1854,6 @@
             this.gv_billTypeId.Visible = true;
             this.gv_billTypeId.VisibleIndex = 3;
             this.gv_billTypeId.Width = 94;
-            // 
-            // lb_billNo
-            // 
-            this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(520, 20);
-            this.lb_billNo.Name = "lb_billNo";
-            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
-            this.lb_billNo.TabIndex = 213;
-            this.lb_billNo.Text = "鍗曟嵁缂栧彿 ";
-            // 
-            // txt_billNo
-            // 
-            this.txt_billNo.Location = new System.Drawing.Point(580, 20);
-            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(150, 28);
-            this.txt_billNo.TabIndex = 213;
             // 
             // gv_billNo
             // 
@@ -2005,25 +1869,6 @@
             this.gv_billNo.VisibleIndex = 2;
             this.gv_billNo.Width = 94;
             // 
-            // lb_erpId
-            // 
-            this.lb_erpId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_erpId.Appearance.Options.UseFont = true;
-            this.lb_erpId.Location = new System.Drawing.Point(270, 20);
-            this.lb_erpId.Name = "lb_erpId";
-            this.lb_erpId.Size = new System.Drawing.Size(51, 21);
-            this.lb_erpId.TabIndex = 211;
-            this.lb_erpId.Text = "erp_id ";
-            // 
-            // txt_erpId
-            // 
-            this.txt_erpId.Location = new System.Drawing.Point(330, 20);
-            this.txt_erpId.Name = "txt_erpId";
-            this.txt_erpId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_erpId.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpId.Size = new System.Drawing.Size(150, 28);
-            this.txt_erpId.TabIndex = 211;
-            // 
             // gv_erpId
             // 
             this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -2037,25 +1882,6 @@
             this.gv_erpId.Visible = true;
             this.gv_erpId.VisibleIndex = 1;
             this.gv_erpId.Width = 94;
-            // 
-            // lb_id
-            // 
-            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_id.Appearance.Options.UseFont = true;
-            this.lb_id.Location = new System.Drawing.Point(20, 20);
-            this.lb_id.Name = "lb_id";
-            this.lb_id.Size = new System.Drawing.Size(18, 21);
-            this.lb_id.TabIndex = 210;
-            this.lb_id.Text = "id ";
-            // 
-            // txt_id
-            // 
-            this.txt_id.Location = new System.Drawing.Point(80, 20);
-            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(150, 28);
-            this.txt_id.TabIndex = 210;
             // 
             // gv_id
             // 
@@ -2149,6 +1975,9 @@
             // 
             // xtraTabControl1
             // 
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.properties_16x16;
+            this.xtraTabControl1.CustomHeaderButtons.AddRange(new DevExpress.XtraTab.Buttons.CustomHeaderButton[] {
+            new DevExpress.XtraTab.Buttons.CustomHeaderButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, editorButtonImageOptions1, serializableAppearanceObject1, "", null, null)});
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
@@ -2157,7 +1986,8 @@
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2});
+            this.xtraTabPage2,
+            this.xtraTabPage3});
             // 
             // xtraTabPage1
             // 
@@ -2184,7 +2014,6 @@
             this.xtraTabPage2.Controls.Add(this.tabMx);
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.PageEnabled = false;
             this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
             // 
@@ -2254,30 +2083,6 @@
             this.panel1.Controls.Add(this.txt_changeReason);
             this.panel1.Controls.Add(this.lb_salerId);
             this.panel1.Controls.Add(this.txt_salerId);
-            this.panel1.Controls.Add(this.lb_saleDeptId);
-            this.panel1.Controls.Add(this.txt_saleDeptId);
-            this.panel1.Controls.Add(this.lb_closeStatus);
-            this.panel1.Controls.Add(this.txt_closeStatus);
-            this.panel1.Controls.Add(this.lb_custId);
-            this.panel1.Controls.Add(this.txt_custId);
-            this.panel1.Controls.Add(this.lb_headLocId);
-            this.panel1.Controls.Add(this.txt_headLocId);
-            this.panel1.Controls.Add(this.lb_headDeliveryWay);
-            this.panel1.Controls.Add(this.txt_headDeliveryWay);
-            this.panel1.Controls.Add(this.lb_businessType);
-            this.panel1.Controls.Add(this.txt_businessType);
-            this.panel1.Controls.Add(this.lb_fDate);
-            this.panel1.Controls.Add(this.txt_fDate);
-            this.panel1.Controls.Add(this.lb_documentStatus);
-            this.panel1.Controls.Add(this.txt_documentStatus);
-            this.panel1.Controls.Add(this.lb_billTypeId);
-            this.panel1.Controls.Add(this.txt_billTypeId);
-            this.panel1.Controls.Add(this.lb_billNo);
-            this.panel1.Controls.Add(this.txt_billNo);
-            this.panel1.Controls.Add(this.lb_erpId);
-            this.panel1.Controls.Add(this.txt_erpId);
-            this.panel1.Controls.Add(this.lb_id);
-            this.panel1.Controls.Add(this.txt_id);
             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);
@@ -2302,6 +2107,162 @@
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
             // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage3.Text = "xtraTabPage3";
+            // 
+            // splitContainerControl1
+            // 
+            this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainerControl1.Horizontal = false;
+            this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainerControl1.Name = "splitContainerControl1";
+            // 
+            // splitContainerControl1.Panel1
+            // 
+            this.splitContainerControl1.Panel1.Appearance.BackColor = System.Drawing.Color.White;
+            this.splitContainerControl1.Panel1.Appearance.Options.UseBackColor = true;
+            this.splitContainerControl1.Panel1.AutoScroll = true;
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel14);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel15);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel16);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel17);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel10);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel11);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel12);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel13);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel9);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel8);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel7);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel6);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel4);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel5);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel3);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel2);
+            this.splitContainerControl1.Panel1.Text = "Panel1";
+            // 
+            // splitContainerControl1.Panel2
+            // 
+            this.splitContainerControl1.Panel2.Text = "Panel2";
+            this.splitContainerControl1.Size = new System.Drawing.Size(1126, 570);
+            this.splitContainerControl1.SplitterPosition = 371;
+            this.splitContainerControl1.TabIndex = 3;
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.lb_id);
+            this.panel4.Controls.Add(this.txt_id);
+            this.panel4.Location = new System.Drawing.Point(11, 13);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(240, 40);
+            this.panel4.TabIndex = 3;
+            // 
+            // lb_id
+            // 
+            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_id.Appearance.Options.UseFont = true;
+            this.lb_id.Location = new System.Drawing.Point(15, 10);
+            this.lb_id.Name = "lb_id";
+            this.lb_id.Size = new System.Drawing.Size(18, 21);
+            this.lb_id.TabIndex = 211;
+            this.lb_id.Text = "id ";
+            // 
+            // txt_id
+            // 
+            this.txt_id.Location = new System.Drawing.Point(75, 6);
+            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(155, 28);
+            this.txt_id.TabIndex = 212;
+            // 
+            // panel5
+            // 
+            this.panel5.Controls.Add(this.lb_erpId);
+            this.panel5.Controls.Add(this.txt_erpId);
+            this.panel5.Location = new System.Drawing.Point(267, 13);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(240, 40);
+            this.panel5.TabIndex = 3;
+            // 
+            // lb_erpId
+            // 
+            this.lb_erpId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_erpId.Appearance.Options.UseFont = true;
+            this.lb_erpId.Location = new System.Drawing.Point(15, 10);
+            this.lb_erpId.Name = "lb_erpId";
+            this.lb_erpId.Size = new System.Drawing.Size(51, 21);
+            this.lb_erpId.TabIndex = 212;
+            this.lb_erpId.Text = "erp_id ";
+            // 
+            // txt_erpId
+            // 
+            this.txt_erpId.Location = new System.Drawing.Point(81, 6);
+            this.txt_erpId.Name = "txt_erpId";
+            this.txt_erpId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_erpId.Properties.Appearance.Options.UseFont = true;
+            this.txt_erpId.Size = new System.Drawing.Size(155, 28);
+            this.txt_erpId.TabIndex = 213;
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.lb_billTypeId);
+            this.panel3.Controls.Add(this.txt_billTypeId);
+            this.panel3.Location = new System.Drawing.Point(767, 13);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(240, 40);
+            this.panel3.TabIndex = 3;
+            // 
+            // lb_billTypeId
+            // 
+            this.lb_billTypeId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_billTypeId.Appearance.Options.UseFont = true;
+            this.lb_billTypeId.Location = new System.Drawing.Point(3, 10);
+            this.lb_billTypeId.Name = "lb_billTypeId";
+            this.lb_billTypeId.Size = new System.Drawing.Size(73, 21);
+            this.lb_billTypeId.TabIndex = 217;
+            this.lb_billTypeId.Text = "鍗曟嵁绫诲瀷 ";
+            // 
+            // txt_billTypeId
+            // 
+            this.txt_billTypeId.Location = new System.Drawing.Point(82, 6);
+            this.txt_billTypeId.Name = "txt_billTypeId";
+            this.txt_billTypeId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
+            this.txt_billTypeId.Size = new System.Drawing.Size(155, 28);
+            this.txt_billTypeId.TabIndex = 218;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.lb_billNo);
+            this.panel2.Controls.Add(this.txt_billNo);
+            this.panel2.Location = new System.Drawing.Point(517, 13);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(240, 40);
+            this.panel2.TabIndex = 2;
+            // 
+            // lb_billNo
+            // 
+            this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_billNo.Appearance.Options.UseFont = true;
+            this.lb_billNo.Location = new System.Drawing.Point(8, 10);
+            this.lb_billNo.Name = "lb_billNo";
+            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_billNo.TabIndex = 214;
+            this.lb_billNo.Text = "鍗曟嵁缂栧彿 ";
+            // 
+            // txt_billNo
+            // 
+            this.txt_billNo.Location = new System.Drawing.Point(81, 6);
+            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(155, 28);
+            this.txt_billNo.TabIndex = 215;
+            // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -2312,6 +2273,342 @@
             this.picCheckBox.TabIndex = 9;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
+            // 
+            // panel6
+            // 
+            this.panel6.Controls.Add(this.labelControl4);
+            this.panel6.Controls.Add(this.textEdit4);
+            this.panel6.Location = new System.Drawing.Point(11, 59);
+            this.panel6.Name = "panel6";
+            this.panel6.Size = new System.Drawing.Size(240, 40);
+            this.panel6.TabIndex = 4;
+            // 
+            // panel7
+            // 
+            this.panel7.Controls.Add(this.labelControl2);
+            this.panel7.Controls.Add(this.textEdit2);
+            this.panel7.Location = new System.Drawing.Point(517, 59);
+            this.panel7.Name = "panel7";
+            this.panel7.Size = new System.Drawing.Size(240, 40);
+            this.panel7.TabIndex = 5;
+            // 
+            // panel8
+            // 
+            this.panel8.Controls.Add(this.labelControl1);
+            this.panel8.Controls.Add(this.textEdit1);
+            this.panel8.Location = new System.Drawing.Point(767, 59);
+            this.panel8.Name = "panel8";
+            this.panel8.Size = new System.Drawing.Size(240, 40);
+            this.panel8.TabIndex = 5;
+            // 
+            // panel9
+            // 
+            this.panel9.Controls.Add(this.labelControl3);
+            this.panel9.Controls.Add(this.textEdit3);
+            this.panel9.Location = new System.Drawing.Point(267, 59);
+            this.panel9.Name = "panel9";
+            this.panel9.Size = new System.Drawing.Size(240, 40);
+            this.panel9.TabIndex = 6;
+            // 
+            // panel10
+            // 
+            this.panel10.Controls.Add(this.lb_fDate);
+            this.panel10.Controls.Add(this.txt_fDate);
+            this.panel10.Location = new System.Drawing.Point(267, 105);
+            this.panel10.Name = "panel10";
+            this.panel10.Size = new System.Drawing.Size(240, 40);
+            this.panel10.TabIndex = 10;
+            // 
+            // panel11
+            // 
+            this.panel11.Controls.Add(this.lb_headDeliveryWay);
+            this.panel11.Controls.Add(this.txt_headDeliveryWay);
+            this.panel11.Location = new System.Drawing.Point(767, 105);
+            this.panel11.Name = "panel11";
+            this.panel11.Size = new System.Drawing.Size(240, 40);
+            this.panel11.TabIndex = 8;
+            // 
+            // panel12
+            // 
+            this.panel12.Controls.Add(this.lb_businessType);
+            this.panel12.Controls.Add(this.txt_businessType);
+            this.panel12.Location = new System.Drawing.Point(517, 105);
+            this.panel12.Name = "panel12";
+            this.panel12.Size = new System.Drawing.Size(240, 40);
+            this.panel12.TabIndex = 9;
+            // 
+            // panel13
+            // 
+            this.panel13.Controls.Add(this.lb_documentStatus);
+            this.panel13.Controls.Add(this.txt_documentStatus);
+            this.panel13.Location = new System.Drawing.Point(11, 105);
+            this.panel13.Name = "panel13";
+            this.panel13.Size = new System.Drawing.Size(240, 40);
+            this.panel13.TabIndex = 7;
+            // 
+            // panel14
+            // 
+            this.panel14.Controls.Add(this.lb_custId);
+            this.panel14.Controls.Add(this.txt_custId);
+            this.panel14.Location = new System.Drawing.Point(267, 153);
+            this.panel14.Name = "panel14";
+            this.panel14.Size = new System.Drawing.Size(240, 40);
+            this.panel14.TabIndex = 14;
+            // 
+            // panel15
+            // 
+            this.panel15.Controls.Add(this.lb_saleDeptId);
+            this.panel15.Controls.Add(this.txt_saleDeptId);
+            this.panel15.Location = new System.Drawing.Point(767, 153);
+            this.panel15.Name = "panel15";
+            this.panel15.Size = new System.Drawing.Size(240, 40);
+            this.panel15.TabIndex = 12;
+            // 
+            // panel16
+            // 
+            this.panel16.Controls.Add(this.lb_closeStatus);
+            this.panel16.Controls.Add(this.txt_closeStatus);
+            this.panel16.Location = new System.Drawing.Point(517, 153);
+            this.panel16.Name = "panel16";
+            this.panel16.Size = new System.Drawing.Size(240, 40);
+            this.panel16.TabIndex = 13;
+            // 
+            // panel17
+            // 
+            this.panel17.Controls.Add(this.lb_headLocId);
+            this.panel17.Controls.Add(this.txt_headLocId);
+            this.panel17.Location = new System.Drawing.Point(11, 153);
+            this.panel17.Name = "panel17";
+            this.panel17.Size = new System.Drawing.Size(240, 40);
+            this.panel17.TabIndex = 11;
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl1.Appearance.Options.UseFont = true;
+            this.labelControl1.Location = new System.Drawing.Point(12, 10);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(73, 21);
+            this.labelControl1.TabIndex = 233;
+            this.labelControl1.Text = "浜よ揣鏂瑰紡 ";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(72, 10);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit1.Properties.Appearance.Options.UseFont = true;
+            this.textEdit1.Size = new System.Drawing.Size(150, 28);
+            this.textEdit1.TabIndex = 234;
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(25, 6);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(73, 21);
+            this.labelControl2.TabIndex = 231;
+            this.labelControl2.Text = "涓氬姟绫诲瀷 ";
+            // 
+            // textEdit2
+            // 
+            this.textEdit2.Location = new System.Drawing.Point(85, 6);
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit2.Properties.Appearance.Options.UseFont = true;
+            this.textEdit2.Size = new System.Drawing.Size(150, 28);
+            this.textEdit2.TabIndex = 232;
+            // 
+            // labelControl3
+            // 
+            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl3.Appearance.Options.UseFont = true;
+            this.labelControl3.Location = new System.Drawing.Point(15, 10);
+            this.labelControl3.Name = "labelControl3";
+            this.labelControl3.Size = new System.Drawing.Size(39, 21);
+            this.labelControl3.TabIndex = 229;
+            this.labelControl3.Text = "鏃ユ湡 ";
+            // 
+            // textEdit3
+            // 
+            this.textEdit3.Location = new System.Drawing.Point(75, 10);
+            this.textEdit3.Name = "textEdit3";
+            this.textEdit3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit3.Properties.Appearance.Options.UseFont = true;
+            this.textEdit3.Size = new System.Drawing.Size(150, 28);
+            this.textEdit3.TabIndex = 230;
+            // 
+            // labelControl4
+            // 
+            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl4.Appearance.Options.UseFont = true;
+            this.labelControl4.Location = new System.Drawing.Point(15, 3);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(73, 21);
+            this.labelControl4.TabIndex = 227;
+            this.labelControl4.Text = "鍗曟嵁鐘舵�� ";
+            // 
+            // textEdit4
+            // 
+            this.textEdit4.Location = new System.Drawing.Point(75, 3);
+            this.textEdit4.Name = "textEdit4";
+            this.textEdit4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit4.Properties.Appearance.Options.UseFont = true;
+            this.textEdit4.Size = new System.Drawing.Size(150, 28);
+            this.textEdit4.TabIndex = 228;
+            // 
+            // lb_headDeliveryWay
+            // 
+            this.lb_headDeliveryWay.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_headDeliveryWay.Appearance.Options.UseFont = true;
+            this.lb_headDeliveryWay.Location = new System.Drawing.Point(12, 10);
+            this.lb_headDeliveryWay.Name = "lb_headDeliveryWay";
+            this.lb_headDeliveryWay.Size = new System.Drawing.Size(73, 21);
+            this.lb_headDeliveryWay.TabIndex = 233;
+            this.lb_headDeliveryWay.Text = "浜よ揣鏂瑰紡 ";
+            // 
+            // txt_headDeliveryWay
+            // 
+            this.txt_headDeliveryWay.Location = new System.Drawing.Point(72, 10);
+            this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
+            this.txt_headDeliveryWay.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
+            this.txt_headDeliveryWay.Size = new System.Drawing.Size(150, 28);
+            this.txt_headDeliveryWay.TabIndex = 234;
+            // 
+            // lb_businessType
+            // 
+            this.lb_businessType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_businessType.Appearance.Options.UseFont = true;
+            this.lb_businessType.Location = new System.Drawing.Point(25, 13);
+            this.lb_businessType.Name = "lb_businessType";
+            this.lb_businessType.Size = new System.Drawing.Size(73, 21);
+            this.lb_businessType.TabIndex = 231;
+            this.lb_businessType.Text = "涓氬姟绫诲瀷 ";
+            // 
+            // txt_businessType
+            // 
+            this.txt_businessType.Location = new System.Drawing.Point(87, 3);
+            this.txt_businessType.Name = "txt_businessType";
+            this.txt_businessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_businessType.Properties.Appearance.Options.UseFont = true;
+            this.txt_businessType.Size = new System.Drawing.Size(150, 28);
+            this.txt_businessType.TabIndex = 232;
+            // 
+            // lb_fDate
+            // 
+            this.lb_fDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_fDate.Appearance.Options.UseFont = true;
+            this.lb_fDate.Location = new System.Drawing.Point(27, 10);
+            this.lb_fDate.Name = "lb_fDate";
+            this.lb_fDate.Size = new System.Drawing.Size(39, 21);
+            this.lb_fDate.TabIndex = 229;
+            this.lb_fDate.Text = "鏃ユ湡 ";
+            // 
+            // txt_fDate
+            // 
+            this.txt_fDate.Location = new System.Drawing.Point(87, 10);
+            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(150, 28);
+            this.txt_fDate.TabIndex = 230;
+            // 
+            // lb_documentStatus
+            // 
+            this.lb_documentStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_documentStatus.Appearance.Options.UseFont = true;
+            this.lb_documentStatus.Location = new System.Drawing.Point(15, 3);
+            this.lb_documentStatus.Name = "lb_documentStatus";
+            this.lb_documentStatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_documentStatus.TabIndex = 227;
+            this.lb_documentStatus.Text = "鍗曟嵁鐘舵�� ";
+            // 
+            // txt_documentStatus
+            // 
+            this.txt_documentStatus.Location = new System.Drawing.Point(75, 3);
+            this.txt_documentStatus.Name = "txt_documentStatus";
+            this.txt_documentStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_documentStatus.Properties.Appearance.Options.UseFont = true;
+            this.txt_documentStatus.Size = new System.Drawing.Size(150, 28);
+            this.txt_documentStatus.TabIndex = 228;
+            // 
+            // lb_saleDeptId
+            // 
+            this.lb_saleDeptId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_saleDeptId.Appearance.Options.UseFont = true;
+            this.lb_saleDeptId.Location = new System.Drawing.Point(24, 6);
+            this.lb_saleDeptId.Name = "lb_saleDeptId";
+            this.lb_saleDeptId.Size = new System.Drawing.Size(73, 21);
+            this.lb_saleDeptId.TabIndex = 247;
+            this.lb_saleDeptId.Text = "閿�鍞儴闂� ";
+            // 
+            // txt_saleDeptId
+            // 
+            this.txt_saleDeptId.Location = new System.Drawing.Point(84, 6);
+            this.txt_saleDeptId.Name = "txt_saleDeptId";
+            this.txt_saleDeptId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_saleDeptId.Properties.Appearance.Options.UseFont = true;
+            this.txt_saleDeptId.Size = new System.Drawing.Size(150, 28);
+            this.txt_saleDeptId.TabIndex = 248;
+            // 
+            // lb_closeStatus
+            // 
+            this.lb_closeStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_closeStatus.Appearance.Options.UseFont = true;
+            this.lb_closeStatus.Location = new System.Drawing.Point(25, 9);
+            this.lb_closeStatus.Name = "lb_closeStatus";
+            this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
+            this.lb_closeStatus.TabIndex = 245;
+            this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
+            // 
+            // txt_closeStatus
+            // 
+            this.txt_closeStatus.Location = new System.Drawing.Point(85, 9);
+            this.txt_closeStatus.Name = "txt_closeStatus";
+            this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
+            this.txt_closeStatus.Size = new System.Drawing.Size(150, 28);
+            this.txt_closeStatus.TabIndex = 246;
+            // 
+            // lb_custId
+            // 
+            this.lb_custId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_custId.Appearance.Options.UseFont = true;
+            this.lb_custId.Location = new System.Drawing.Point(27, 6);
+            this.lb_custId.Name = "lb_custId";
+            this.lb_custId.Size = new System.Drawing.Size(39, 21);
+            this.lb_custId.TabIndex = 243;
+            this.lb_custId.Text = "瀹㈡埛 ";
+            // 
+            // txt_custId
+            // 
+            this.txt_custId.Location = new System.Drawing.Point(87, 6);
+            this.txt_custId.Name = "txt_custId";
+            this.txt_custId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_custId.Properties.Appearance.Options.UseFont = true;
+            this.txt_custId.Size = new System.Drawing.Size(150, 28);
+            this.txt_custId.TabIndex = 244;
+            // 
+            // lb_headLocId
+            // 
+            this.lb_headLocId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_headLocId.Appearance.Options.UseFont = true;
+            this.lb_headLocId.Location = new System.Drawing.Point(15, 3);
+            this.lb_headLocId.Name = "lb_headLocId";
+            this.lb_headLocId.Size = new System.Drawing.Size(73, 21);
+            this.lb_headLocId.TabIndex = 241;
+            this.lb_headLocId.Text = "浜よ揣鍦扮偣 ";
+            // 
+            // txt_headLocId
+            // 
+            this.txt_headLocId.Location = new System.Drawing.Point(75, 3);
+            this.txt_headLocId.Name = "txt_headLocId";
+            this.txt_headLocId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
+            this.txt_headLocId.Size = new System.Drawing.Size(150, 28);
+            this.txt_headLocId.TabIndex = 242;
             // 
             // Frm_SalesOrder
             // 
@@ -2350,18 +2647,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_note.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_changeReason.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salerId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2372,7 +2657,61 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+            this.splitContainerControl1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+            this.splitContainerControl1.ResumeLayout(false);
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
+            this.panel5.ResumeLayout(false);
+            this.panel5.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).EndInit();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billTypeId.Properties)).EndInit();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            this.panel6.ResumeLayout(false);
+            this.panel6.PerformLayout();
+            this.panel7.ResumeLayout(false);
+            this.panel7.PerformLayout();
+            this.panel8.ResumeLayout(false);
+            this.panel8.PerformLayout();
+            this.panel9.ResumeLayout(false);
+            this.panel9.PerformLayout();
+            this.panel10.ResumeLayout(false);
+            this.panel10.PerformLayout();
+            this.panel11.ResumeLayout(false);
+            this.panel11.PerformLayout();
+            this.panel12.ResumeLayout(false);
+            this.panel12.PerformLayout();
+            this.panel13.ResumeLayout(false);
+            this.panel13.PerformLayout();
+            this.panel14.ResumeLayout(false);
+            this.panel14.PerformLayout();
+            this.panel15.ResumeLayout(false);
+            this.panel15.PerformLayout();
+            this.panel16.ResumeLayout(false);
+            this.panel16.PerformLayout();
+            this.panel17.ResumeLayout(false);
+            this.panel17.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headDeliveryWay.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_businessType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_documentStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_custId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_headLocId.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2533,54 +2872,68 @@
         private DevExpress.XtraEditors.LabelControl lb_salerId;
         private DevExpress.XtraEditors.TextEdit txt_salerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_salerId;
-
-        private DevExpress.XtraEditors.LabelControl lb_saleDeptId;
-        private DevExpress.XtraEditors.TextEdit txt_saleDeptId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_saleDeptId;
-
-        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
-        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_custId;
-        private DevExpress.XtraEditors.TextEdit txt_custId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_custId;
-
-        private DevExpress.XtraEditors.LabelControl lb_headLocId;
-        private DevExpress.XtraEditors.TextEdit txt_headLocId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_headLocId;
-
-        private DevExpress.XtraEditors.LabelControl lb_headDeliveryWay;
-        private DevExpress.XtraEditors.TextEdit txt_headDeliveryWay;
         private DevExpress.XtraGrid.Columns.GridColumn gv_headDeliveryWay;
-
-        private DevExpress.XtraEditors.LabelControl lb_businessType;
-        private DevExpress.XtraEditors.TextEdit txt_businessType;
         private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
-
-        private DevExpress.XtraEditors.LabelControl lb_fDate;
-        private DevExpress.XtraEditors.TextEdit txt_fDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_documentStatus;
-        private DevExpress.XtraEditors.TextEdit txt_documentStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_billTypeId;
-        private DevExpress.XtraEditors.TextEdit txt_billTypeId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billTypeId;
-
-        private DevExpress.XtraEditors.LabelControl lb_billNo;
-        private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_erpId;
-        private DevExpress.XtraEditors.TextEdit txt_erpId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
-
-        private DevExpress.XtraEditors.LabelControl lb_id;
-        private DevExpress.XtraEditors.TextEdit txt_id;
         private DevExpress.XtraGrid.Columns.GridColumn gv_id;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Panel panel4;
+        private DevExpress.XtraEditors.LabelControl lb_id;
+        private DevExpress.XtraEditors.TextEdit txt_id;
+        private System.Windows.Forms.Panel panel5;
+        private DevExpress.XtraEditors.LabelControl lb_erpId;
+        private DevExpress.XtraEditors.TextEdit txt_erpId;
+        private System.Windows.Forms.Panel panel3;
+        private DevExpress.XtraEditors.LabelControl lb_billTypeId;
+        private DevExpress.XtraEditors.TextEdit txt_billTypeId;
+        private DevExpress.XtraEditors.LabelControl lb_billNo;
+        private DevExpress.XtraEditors.TextEdit txt_billNo;
+        private System.Windows.Forms.Panel panel14;
+        private System.Windows.Forms.Panel panel15;
+        private System.Windows.Forms.Panel panel16;
+        private System.Windows.Forms.Panel panel17;
+        private System.Windows.Forms.Panel panel10;
+        private System.Windows.Forms.Panel panel11;
+        private System.Windows.Forms.Panel panel12;
+        private System.Windows.Forms.Panel panel13;
+        private System.Windows.Forms.Panel panel9;
+        private System.Windows.Forms.Panel panel8;
+        private System.Windows.Forms.Panel panel7;
+        private System.Windows.Forms.Panel panel6;
+        private DevExpress.XtraEditors.LabelControl labelControl3;
+        private DevExpress.XtraEditors.TextEdit textEdit3;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.TextEdit textEdit2;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private DevExpress.XtraEditors.TextEdit textEdit4;
+        private DevExpress.XtraEditors.LabelControl lb_fDate;
+        private DevExpress.XtraEditors.TextEdit txt_fDate;
+        private DevExpress.XtraEditors.LabelControl lb_headDeliveryWay;
+        private DevExpress.XtraEditors.TextEdit txt_headDeliveryWay;
+        private DevExpress.XtraEditors.LabelControl lb_businessType;
+        private DevExpress.XtraEditors.TextEdit txt_businessType;
+        private DevExpress.XtraEditors.LabelControl lb_documentStatus;
+        private DevExpress.XtraEditors.TextEdit txt_documentStatus;
+        private DevExpress.XtraEditors.LabelControl lb_custId;
+        private DevExpress.XtraEditors.TextEdit txt_custId;
+        private DevExpress.XtraEditors.LabelControl lb_saleDeptId;
+        private DevExpress.XtraEditors.TextEdit txt_saleDeptId;
+        private DevExpress.XtraEditors.LabelControl lb_closeStatus;
+        private DevExpress.XtraEditors.TextEdit txt_closeStatus;
+        private DevExpress.XtraEditors.LabelControl lb_headLocId;
+        private DevExpress.XtraEditors.TextEdit txt_headLocId;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
index 01c9686..cfce570 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs
@@ -1,4 +1,5 @@
 using DevExpress.RichEdit.Export;
+using DevExpress.XtraEditors;
 using DevExpress.XtraGrid.Views.Grid;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
 using Gs.DevApp.Entity;
@@ -19,9 +20,12 @@
     {
         string _webServiceName = "SalesManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
+        private Gs.DevApp.ToolBox.DragResizeHelp _drapHelp;
         public Frm_SalesOrder()
         {
             InitializeComponent();
+            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1);
+            this.xtraTabControl1.CustomHeaderButtonClick += (s, e) => { _drapHelp.Show(); };
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Sales.rar b/DevApp/Gs.DevApp/DevFrm/Sales/Sales.rar
new file mode 100644
index 0000000..8c65895
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Sales.rar
Binary files differ
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 893b05f..ca725b9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -29,51 +29,51 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions15 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject57 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject58 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject59 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject60 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions16 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject61 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject62 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject63 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject64 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions17 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject65 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject66 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject67 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject68 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions18 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject69 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject70 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject71 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject72 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -534,9 +534,9 @@
             // rptDcOrg
             // 
             this.rptDcOrg.AutoHeight = false;
-            editorButtonImageOptions10.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
             this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDcOrg.Name = "rptDcOrg";
             this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
             // 
@@ -558,9 +558,9 @@
             // rptDcCk
             // 
             this.rptDcCk.AutoHeight = false;
-            editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDcCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDcCk.Name = "rptDcCk";
             this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
             // 
@@ -578,9 +578,9 @@
             // rptDcCw
             // 
             this.rptDcCw.AutoHeight = false;
-            editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDcCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDcCw.Name = "rptDcCw";
             this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
             // 
@@ -602,9 +602,9 @@
             // rptDrOrg
             // 
             this.rptDrOrg.AutoHeight = false;
-            editorButtonImageOptions13.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDrOrg.Name = "rptDrOrg";
             this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
             // 
@@ -626,9 +626,9 @@
             // rptDrCk
             // 
             this.rptDrCk.AutoHeight = false;
-            editorButtonImageOptions14.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDrCk.Name = "rptDrCk";
             this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
             // 
@@ -644,9 +644,9 @@
             // rptDrCw
             // 
             this.rptDrCw.AutoHeight = false;
-            editorButtonImageOptions15.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions15, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject57, serializableAppearanceObject58, serializableAppearanceObject59, serializableAppearanceObject60, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDrCw.Name = "rptDrCw";
             this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
             // 
@@ -668,9 +668,9 @@
             // rptDcHz
             // 
             this.rptDcHz.AutoHeight = false;
-            editorButtonImageOptions16.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions16, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject61, serializableAppearanceObject62, serializableAppearanceObject63, serializableAppearanceObject64, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDcHz.Name = "rptDcHz";
             this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
             // 
@@ -692,9 +692,9 @@
             // rptDrHz
             // 
             this.rptDrHz.AutoHeight = false;
-            editorButtonImageOptions17.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
             this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions17, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject65, serializableAppearanceObject66, serializableAppearanceObject67, serializableAppearanceObject68, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.rptDrHz.Name = "rptDrHz";
             this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
             // 
@@ -711,10 +711,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions18.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions18.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions18, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject69, serializableAppearanceObject70, serializableAppearanceObject71, serializableAppearanceObject72, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 8c38d79..fb6a59f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -304,6 +304,36 @@
                         MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
                         return;
                     }
+                    if (string.IsNullOrEmpty(row["dcOrgGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨嚭缁勭粐涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["dcCkGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨嚭浠撳簱涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["drOrgGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨叆缁勭粐涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["drCkGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨叆浠撳簱涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["dcHzGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨嚭璐т富涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["drHzGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨叆璐т富涓嶈兘涓虹┖锛�");
+                        return;
+                    }
                     _obj.list.Add(new
                     {
                         Guid = _guid,
@@ -611,11 +641,6 @@
             if (rowhandle < 0)
                 return;
             var dr = gvMx1.GetDataRow(rowhandle);
-            if (dr["dcOrgGuid"] == null)
-            {
-                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
-                return;
-            };
             var strOrgGuid = dr["dcOrgGuid"].ToString();
             if (string.IsNullOrEmpty(strOrgGuid))
             {
@@ -696,15 +721,10 @@
             if (rowhandle < 0)
                 return;
             var dr = gvMx1.GetDataRow(rowhandle);
-            if (dr["drOrgGuid"] == null)
-            {
-                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
-                return;
-            };
             var strOrgGuid = dr["drOrgGuid"].ToString();
             if (string.IsNullOrEmpty(strOrgGuid))
             {
-                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
                 return;
             };
             SelectCk frm = new SelectCk(strOrgGuid);
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
index 4aa470c..cae9267 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
@@ -28,52 +28,47 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2workLine = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fmrmode = new DevExpress.XtraEditors.LabelControl();
-            this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
+            this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1mid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1bld002 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1bld003 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1bld007 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1bld010 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1bld008 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fType = new DevExpress.XtraEditors.LabelControl();
             this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_depotCode = new DevExpress.XtraEditors.LabelControl();
             this.gv_depotCode = 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.lb_reason = new DevExpress.XtraEditors.LabelControl();
-            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.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
-            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.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -93,25 +88,55 @@
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_fTransferDirect = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fBusinessType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fOwnerTypeInIdHead = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fOwnerTypeIdHead = new DevExpress.XtraEditors.TextEdit();
+            this.txt_ftranstype = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fBillTypeID = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fapporgid = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_djcreateDate = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_djcreateUser = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_djbillNo = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fCreateDate = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fRemarks = new DevExpress.XtraEditors.TextEdit();
+            this.txt_djwjStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_djchkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
+            this.lb_billno = new DevExpress.XtraEditors.LabelControl();
+            this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.lb_shState = new DevExpress.XtraEditors.LabelControl();
+            this.lb_shDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_djcheckdate = new DevExpress.XtraEditors.TextEdit();
+            this.lb_shBy = new DevExpress.XtraEditors.LabelControl();
+            this.txt_djcheckuser = new DevExpress.XtraEditors.TextEdit();
+            this.lb_ftransferdirect = new DevExpress.XtraEditors.LabelControl();
+            this.lb_fbilltypeid = new DevExpress.XtraEditors.LabelControl();
+            this.lb_id = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.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();
@@ -124,168 +149,35 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fTransferDirect.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeIdHead.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fapporgid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcreateDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcreateUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djbillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djwjStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djchkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcheckdate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcheckuser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
-            // 
-            // gvMx2itemOutId
-            // 
-            this.gvMx2itemOutId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemOutId.Caption = "鍑哄簱ID ";
-            this.gvMx2itemOutId.FieldName = "itemOutId";
-            this.gvMx2itemOutId.Name = "gvMx2itemOutId";
-            this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
-            this.gvMx2itemOutId.Tag = "query_a.item_out_id";
-            this.gvMx2itemOutId.Width = 94;
-            // 
-            // gvMx2tlQty
-            // 
-            this.gvMx2tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2tlQty.Caption = "宸叉壂鏁伴噺 ";
-            this.gvMx2tlQty.FieldName = "tlQty";
-            this.gvMx2tlQty.Name = "gvMx2tlQty";
-            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
-            this.gvMx2tlQty.Tag = "query_a.tl_qty";
-            this.gvMx2tlQty.Visible = true;
-            this.gvMx2tlQty.VisibleIndex = 8;
-            this.gvMx2tlQty.Width = 94;
-            // 
-            // gvMx2pbillNo
-            // 
-            this.gvMx2pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2pbillNo.Caption = "鍒拌揣鍗曞彿";
-            this.gvMx2pbillNo.FieldName = "pbillNo";
-            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
-            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
-            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
-            this.gvMx2pbillNo.Visible = true;
-            this.gvMx2pbillNo.VisibleIndex = 1;
-            this.gvMx2pbillNo.Width = 94;
-            // 
-            // gvMx2status
-            // 
-            this.gvMx2status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2status.AppearanceCell.Options.UseFont = true;
-            this.gvMx2status.Caption = "瀹岀粨";
-            this.gvMx2status.FieldName = "status";
-            this.gvMx2status.MaxWidth = 50;
-            this.gvMx2status.MinWidth = 50;
-            this.gvMx2status.Name = "gvMx2status";
-            this.gvMx2status.OptionsColumn.ReadOnly = true;
-            this.gvMx2status.Tag = "query_a.status";
-            this.gvMx2status.Visible = true;
-            this.gvMx2status.VisibleIndex = 0;
-            this.gvMx2status.Width = 50;
-            // 
-            // gvMx2lineK3id
-            // 
-            this.gvMx2lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lineK3id.Caption = "閲囪喘鍗曡ID ";
-            this.gvMx2lineK3id.FieldName = "lineK3id";
-            this.gvMx2lineK3id.Name = "gvMx2lineK3id";
-            this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
-            this.gvMx2lineK3id.Tag = "query_a.line_k3id";
-            this.gvMx2lineK3id.Visible = true;
-            this.gvMx2lineK3id.VisibleIndex = 12;
-            this.gvMx2lineK3id.Width = 94;
-            // 
-            // gvMx2ebelnK3id
-            // 
-            this.gvMx2ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
-            this.gvMx2ebelnK3id.Caption = "閲囪喘鍗旾D ";
-            this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
-            this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
-            this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
-            this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
-            this.gvMx2ebelnK3id.Visible = true;
-            this.gvMx2ebelnK3id.VisibleIndex = 11;
-            this.gvMx2ebelnK3id.Width = 94;
-            // 
-            // gvMx2workLine
-            // 
-            this.gvMx2workLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2workLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx2workLine.Caption = "琛屽彿 ";
-            this.gvMx2workLine.FieldName = "workLine";
-            this.gvMx2workLine.Name = "gvMx2workLine";
-            this.gvMx2workLine.OptionsColumn.ReadOnly = true;
-            this.gvMx2workLine.Tag = "query_a.work_line";
-            this.gvMx2workLine.Visible = true;
-            this.gvMx2workLine.VisibleIndex = 2;
-            this.gvMx2workLine.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.Name = "gvMx2depotCode";
-            this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
-            this.gvMx2depotCode.Tag = "query_a.depot_code";
-            this.gvMx2depotCode.Visible = true;
-            this.gvMx2depotCode.VisibleIndex = 9;
-            this.gvMx2depotCode.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.Name = "gvMx2remark";
-            this.gvMx2remark.OptionsColumn.ReadOnly = true;
-            this.gvMx2remark.Tag = "query_a.remark";
-            this.gvMx2remark.Visible = true;
-            this.gvMx2remark.VisibleIndex = 10;
-            this.gvMx2remark.Width = 94;
-            // 
-            // gvMx2quantity
-            // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2quantity.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx2quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx2quantity.Caption = "鐢宠鏁伴噺 ";
-            this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.Name = "gvMx2quantity";
-            this.gvMx2quantity.Tag = "query_a.quantity";
-            this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 7;
-            this.gvMx2quantity.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.Name = "gvMx2itemNo";
-            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
-            this.gvMx2itemNo.Tag = "query_a.item_no";
-            this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 3;
-            this.gvMx2itemNo.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx1);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
-            this.tabMxPage2.Text = "閫�璐х墿鏂欐槑缁�";
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 335);
+            this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
             // 
             // gcMx1
             // 
@@ -293,185 +185,396 @@
             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, 388);
-            this.gcMx1.TabIndex = 0;
+            this.gcMx1.Size = new System.Drawing.Size(1124, 335);
+            this.gcMx1.TabIndex = 2;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
             // 
             // gvMx1
             // 
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn12,
-            this.gridColumn11,
-            this.gvMx2status,
-            this.gvMx2pbillNo,
-            this.gvMx2workLine,
-            this.gvMx2itemNo,
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gvMx2quantity,
-            this.gvMx2tlQty,
-            this.gvMx2depotCode,
-            this.gvMx2remark,
-            this.gvMx2ebelnK3id,
-            this.gvMx2lineK3id,
-            this.gvMx2itemOutId});
+            this.gvMx1id,
+            this.gvMx1mid,
+            this.gvMx1bld002,
+            this.gvMx1bld003,
+            this.itemModel,
+            this.gvMx1bld007,
+            this.gvMx1bld010,
+            this.gvMx1bld008,
+            this.gridColumn2,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn25,
+            this.gridColumn26,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
-            // gridColumn12
+            // gvMx1id
             // 
-            this.gridColumn12.Caption = "guid";
-            this.gridColumn12.FieldName = "guid";
-            this.gridColumn12.MinWidth = 25;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.OptionsColumn.ReadOnly = true;
-            this.gridColumn12.Width = 94;
+            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1id.AppearanceCell.Options.UseFont = true;
+            this.gvMx1id.Caption = "ID";
+            this.gvMx1id.FieldName = "id";
+            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.Name = "gvMx1id";
+            this.gvMx1id.OptionsColumn.ReadOnly = true;
+            this.gvMx1id.Tag = "query_a.id";
+            this.gvMx1id.Width = 94;
             // 
-            // gridColumn11
+            // gvMx1mid
             // 
-            this.gridColumn11.Caption = "aboutGuid";
-            this.gridColumn11.FieldName = "aboutGuid";
-            this.gridColumn11.MinWidth = 25;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.OptionsColumn.ReadOnly = true;
-            this.gridColumn11.Width = 94;
+            this.gvMx1mid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1mid.Caption = "MID";
+            this.gvMx1mid.FieldName = "pid";
+            this.gvMx1mid.MinWidth = 50;
+            this.gvMx1mid.Name = "gvMx1mid";
+            this.gvMx1mid.OptionsColumn.ReadOnly = true;
+            this.gvMx1mid.Tag = "query_a.mid";
+            this.gvMx1mid.Width = 94;
             // 
-            // gridColumn5
+            // gvMx1bld002
             // 
-            this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.OptionsColumn.ReadOnly = true;
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 4;
-            this.gridColumn5.Width = 94;
+            this.gvMx1bld002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1bld002.AppearanceCell.Options.UseFont = true;
+            this.gvMx1bld002.Caption = "鐗╂枡缂栧彿";
+            this.gvMx1bld002.FieldName = "itemNo";
+            this.gvMx1bld002.MinWidth = 25;
+            this.gvMx1bld002.Name = "gvMx1bld002";
+            this.gvMx1bld002.OptionsColumn.ReadOnly = true;
+            this.gvMx1bld002.Tag = "query_a.bld002";
+            this.gvMx1bld002.Visible = true;
+            this.gvMx1bld002.VisibleIndex = 0;
+            this.gvMx1bld002.Width = 100;
             // 
-            // gridColumn6
+            // gvMx1bld003
             // 
-            this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.OptionsColumn.ReadOnly = true;
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 5;
-            this.gridColumn6.Width = 94;
+            this.gvMx1bld003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1bld003.AppearanceCell.Options.UseFont = true;
+            this.gvMx1bld003.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx1bld003.FieldName = "itemName";
+            this.gvMx1bld003.MinWidth = 25;
+            this.gvMx1bld003.Name = "gvMx1bld003";
+            this.gvMx1bld003.OptionsColumn.ReadOnly = true;
+            this.gvMx1bld003.Tag = "query_a.bld003";
+            this.gvMx1bld003.Visible = true;
+            this.gvMx1bld003.VisibleIndex = 1;
+            this.gvMx1bld003.Width = 120;
             // 
-            // lb_fmrmode
+            // itemModel
             // 
-            this.lb_fmrmode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fmrmode.Appearance.Options.UseFont = true;
-            this.lb_fmrmode.Location = new System.Drawing.Point(336, 51);
-            this.lb_fmrmode.Name = "lb_fmrmode";
-            this.lb_fmrmode.Size = new System.Drawing.Size(73, 21);
-            this.lb_fmrmode.TabIndex = 507;
-            this.lb_fmrmode.Text = "閫�鏂欐柟寮� ";
+            this.itemModel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.itemModel.AppearanceCell.Options.UseFont = true;
+            this.itemModel.Caption = "瑙勬牸鍨嬪彿";
+            this.itemModel.FieldName = "itemModel";
+            this.itemModel.MinWidth = 25;
+            this.itemModel.Name = "itemModel";
+            this.itemModel.OptionsColumn.ReadOnly = true;
+            this.itemModel.Tag = "query_a.bld004";
+            this.itemModel.Visible = true;
+            this.itemModel.VisibleIndex = 2;
+            this.itemModel.Width = 120;
             // 
-            // gv_fmrmode
+            // gvMx1bld007
             // 
-            this.gv_fmrmode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
-            this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
-            this.gv_fmrmode.FieldName = "fmrmode";
-            this.gv_fmrmode.Name = "gv_fmrmode";
-            this.gv_fmrmode.OptionsColumn.AllowEdit = false;
-            this.gv_fmrmode.Tag = "query_a.fmrmode";
-            this.gv_fmrmode.Visible = true;
-            this.gv_fmrmode.VisibleIndex = 14;
-            this.gv_fmrmode.Width = 94;
+            this.gvMx1bld007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1bld007.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+            this.gvMx1bld007.AppearanceCell.Options.UseFont = true;
+            this.gvMx1bld007.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1bld007.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1bld007.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1bld007.Caption = "鐢宠鏁伴噺";
+            this.gvMx1bld007.FieldName = "shNum";
+            this.gvMx1bld007.MinWidth = 50;
+            this.gvMx1bld007.Name = "gvMx1bld007";
+            this.gvMx1bld007.Tag = "yz_quantity_0_edit";
+            this.gvMx1bld007.Visible = true;
+            this.gvMx1bld007.VisibleIndex = 3;
+            this.gvMx1bld007.Width = 94;
             // 
-            // lb_suppNo
+            // gvMx1bld010
             // 
-            this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_suppNo.Appearance.Options.UseFont = true;
-            this.lb_suppNo.Location = new System.Drawing.Point(39, 51);
-            this.lb_suppNo.Name = "lb_suppNo";
-            this.lb_suppNo.Size = new System.Drawing.Size(51, 21);
-            this.lb_suppNo.TabIndex = 387;
-            this.lb_suppNo.Text = "渚涘簲鍟�";
+            this.gvMx1bld010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1bld010.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1bld010.AppearanceCell.Options.UseFont = true;
+            this.gvMx1bld010.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1bld010.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1bld010.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1bld010.Caption = "澶囨敞";
+            this.gvMx1bld010.FieldName = "remark";
+            this.gvMx1bld010.MinWidth = 50;
+            this.gvMx1bld010.Name = "gvMx1bld010";
+            this.gvMx1bld010.Tag = "edit";
+            this.gvMx1bld010.Visible = true;
+            this.gvMx1bld010.VisibleIndex = 4;
+            this.gvMx1bld010.Width = 150;
+            // 
+            // gvMx1bld008
+            // 
+            this.gvMx1bld008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1bld008.AppearanceCell.Options.UseFont = true;
+            this.gvMx1bld008.Caption = "璋冨嚭宸叉壂鏁伴噺";
+            this.gvMx1bld008.FieldName = "sQty";
+            this.gvMx1bld008.MinWidth = 50;
+            this.gvMx1bld008.Name = "gvMx1bld008";
+            this.gvMx1bld008.OptionsColumn.ReadOnly = true;
+            this.gvMx1bld008.Tag = "query_a.bld008";
+            this.gvMx1bld008.Visible = true;
+            this.gvMx1bld008.VisibleIndex = 5;
+            this.gvMx1bld008.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "璋冨叆宸叉壂鏁伴噺";
+            this.gridColumn2.FieldName = "rQty";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 6;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "鍗曚綅鍚嶇О";
+            this.gridColumn13.FieldName = "itemUnit";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 7;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn14.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn14.Caption = "璋冨嚭缁勭粐";
+            this.gridColumn14.FieldName = "dcOrg";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 8;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn15.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn15.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn15.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn15.Caption = "璋冨嚭浠撳簱";
+            this.gridColumn15.FieldName = "dcCk";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 9;
+            this.gridColumn15.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn16.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn16.Caption = "璋冨嚭浠撲綅";
+            this.gridColumn16.FieldName = "dcCw";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Width = 94;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn17.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn17.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn17.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn17.Caption = "璋冨叆缁勭粐";
+            this.gridColumn17.FieldName = "drOrg";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 10;
+            this.gridColumn17.Width = 94;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn18.Caption = "璋冨叆浠撳簱";
+            this.gridColumn18.FieldName = "drCk";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 11;
+            this.gridColumn18.Width = 94;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "璋冨叆浠撲綅";
+            this.gridColumn19.FieldName = "drCw";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn23.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn23.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn23.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn23.Caption = "璋冨嚭璐т富";
+            this.gridColumn23.FieldName = "dcHz";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 12;
+            this.gridColumn23.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn24.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn24.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn24.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn24.Caption = "璋冨叆璐т富";
+            this.gridColumn24.FieldName = "drHz";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 13;
+            this.gridColumn24.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鐗╂枡ID";
+            this.gridColumn20.FieldName = "itemId";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "璋冨嚭缁勭粐Guid";
+            this.gridColumn21.FieldName = "dcOrgGuid";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "璋冨嚭浠撳簱Guid";
+            this.gridColumn22.FieldName = "dcCkGuid";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "璋冨嚭浠撲綅Guid";
+            this.gridColumn25.FieldName = "dcCwGuid";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "璋冨叆缁勭粐Guid";
+            this.gridColumn26.FieldName = "drOrgGuid";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Width = 94;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "璋冨叆浠撳簱Guid";
+            this.gridColumn27.FieldName = "drCkGuid";
+            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "璋冨叆浠撲綅Guid";
+            this.gridColumn28.FieldName = "drCwGuid";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Width = 94;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "璋冨嚭璐т富Gui";
+            this.gridColumn29.FieldName = "dcHzGuid";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "璋冨叆璐т富Guid";
+            this.gridColumn30.FieldName = "drHzGuid";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Width = 94;
             // 
             // gv_suppNo
             // 
             this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
-            this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙� ";
-            this.gv_suppNo.FieldName = "suppNo2";
+            this.gv_suppNo.Caption = "鐢宠鍗曞彿";
+            this.gv_suppNo.FieldName = "taskNo";
             this.gv_suppNo.Name = "gv_suppNo";
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 4;
+            this.gv_suppNo.VisibleIndex = 3;
             this.gv_suppNo.Width = 94;
-            // 
-            // lb_fType
-            // 
-            this.lb_fType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fType.Appearance.Options.UseFont = true;
-            this.lb_fType.Location = new System.Drawing.Point(375, 19);
-            this.lb_fType.Name = "lb_fType";
-            this.lb_fType.Size = new System.Drawing.Size(34, 21);
-            this.lb_fType.TabIndex = 312;
-            this.lb_fType.Text = "濮斿";
             // 
             // gv_fType
             // 
             this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fType.AppearanceCell.Options.UseFont = true;
-            this.gv_fType.Caption = "濮斿鏍囪瘑";
-            this.gv_fType.FieldName = "isOut";
+            this.gv_fType.Caption = "瀹岀粨鏍囪瘑";
+            this.gv_fType.FieldName = "wjChk";
             this.gv_fType.MaxWidth = 50;
             this.gv_fType.MinWidth = 50;
             this.gv_fType.Name = "gv_fType";
             this.gv_fType.OptionsColumn.AllowEdit = false;
             this.gv_fType.Tag = "query_a.f_type";
             this.gv_fType.Visible = true;
-            this.gv_fType.VisibleIndex = 2;
+            this.gv_fType.VisibleIndex = 1;
             this.gv_fType.Width = 50;
-            // 
-            // lb_depotCode
-            // 
-            this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_depotCode.Appearance.Options.UseFont = true;
-            this.lb_depotCode.Location = new System.Drawing.Point(22, 84);
-            this.lb_depotCode.Name = "lb_depotCode";
-            this.lb_depotCode.Size = new System.Drawing.Size(68, 21);
-            this.lb_depotCode.TabIndex = 267;
-            this.lb_depotCode.Text = "閫�鏂欎粨搴�";
             // 
             // gv_depotCode
             // 
             this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotCode.Caption = "閫�鏂欎粨搴�";
-            this.gv_depotCode.FieldName = "depotCode";
+            this.gv_depotCode.Caption = "绉诲叆瀛愬簱ID";
+            this.gv_depotCode.FieldName = "invDepotsId";
             this.gv_depotCode.Name = "gv_depotCode";
             this.gv_depotCode.OptionsColumn.AllowEdit = false;
             this.gv_depotCode.Tag = "query_a.depot_code";
             this.gv_depotCode.Visible = true;
-            this.gv_depotCode.VisibleIndex = 6;
+            this.gv_depotCode.VisibleIndex = 5;
             this.gv_depotCode.Width = 94;
-            // 
-            // 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(548, 84);
-            this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_checkDate.TabIndex = 252;
-            this.lb_checkDate.Text = "瀹℃牳鏃ユ湡";
-            // 
-            // txt_checkDate
-            // 
-            this.txt_checkDate.Location = new System.Drawing.Point(623, 80);
-            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(158, 28);
-            this.txt_checkDate.TabIndex = 252;
             // 
             // gv_checkDate
             // 
@@ -483,73 +586,8 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 12;
+            this.gv_checkDate.VisibleIndex = 9;
             this.gv_checkDate.Width = 180;
-            // 
-            // 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(582, 19);
-            this.lb_checkUser.Name = "lb_checkUser";
-            this.lb_checkUser.Size = new System.Drawing.Size(34, 21);
-            this.lb_checkUser.TabIndex = 247;
-            this.lb_checkUser.Text = "瀹℃牳";
-            // 
-            // lb_reason
-            // 
-            this.lb_reason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_reason.Appearance.Options.UseFont = true;
-            this.lb_reason.Location = new System.Drawing.Point(336, 84);
-            this.lb_reason.Name = "lb_reason";
-            this.lb_reason.Size = new System.Drawing.Size(73, 21);
-            this.lb_reason.TabIndex = 240;
-            this.lb_reason.Text = "閫�璐у師鍥� ";
-            // 
-            // 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 = "reason";
-            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(22, 118);
-            this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(68, 21);
-            this.lb_remark.TabIndex = 235;
-            this.lb_remark.Text = "澶囨敞淇℃伅";
-            // 
-            // txt_remark
-            // 
-            this.txt_remark.Location = new System.Drawing.Point(94, 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(446, 28);
-            this.txt_remark.TabIndex = 235;
-            // 
-            // 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.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 = 8;
-            this.gv_remark.Width = 94;
             // 
             // gv_createDate
             // 
@@ -561,7 +599,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 10;
+            this.gv_createDate.VisibleIndex = 7;
             this.gv_createDate.Width = 180;
             // 
             // gv_status
@@ -576,39 +614,20 @@
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
-            this.gv_status.VisibleIndex = 1;
+            this.gv_status.VisibleIndex = 0;
             this.gv_status.Width = 50;
-            // 
-            // 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(22, 19);
-            this.lb_itemOutNo.Name = "lb_itemOutNo";
-            this.lb_itemOutNo.Size = new System.Drawing.Size(68, 21);
-            this.lb_itemOutNo.TabIndex = 210;
-            this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿";
-            // 
-            // txt_itemOutNo
-            // 
-            this.txt_itemOutNo.Location = new System.Drawing.Point(94, 15);
-            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(239, 28);
-            this.txt_itemOutNo.TabIndex = 210;
             // 
             // 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.Caption = "璋冩嫧鍗曞彿";
+            this.gv_itemOutNo.FieldName = "billNo";
             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 = 3;
+            this.gv_itemOutNo.VisibleIndex = 2;
             this.gv_itemOutNo.Width = 100;
             // 
             // toolBarMenu1
@@ -646,21 +665,16 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn13,
             this.gv_status,
             this.gv_fType,
             this.gv_itemOutNo,
             this.gv_suppNo,
             this.gridColumn1,
             this.gv_depotCode,
-            this.gridColumn2,
-            this.gv_remark,
             this.gridColumn3,
             this.gv_createDate,
             this.gridColumn4,
-            this.gv_checkDate,
-            this.gv_reason,
-            this.gv_fmrmode});
+            this.gv_checkDate});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -668,33 +682,14 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "閫�鏂欑粍缁�";
-            this.gridColumn13.FieldName = "receivingOrg";
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Tag = "org.fnamber";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 250;
-            // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
-            this.gridColumn1.FieldName = "suppName";
+            this.gridColumn1.Caption = "绉诲嚭瀛愬簱ID";
+            this.gridColumn1.FieldName = "fromDepotsId";
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.VisibleIndex = 4;
             this.gridColumn1.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "浠撳簱鍚嶇О";
-            this.gridColumn2.FieldName = "depotName";
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 7;
-            this.gridColumn2.Width = 94;
             // 
             // gridColumn3
             // 
@@ -702,7 +697,7 @@
             this.gridColumn3.FieldName = "createBy";
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 9;
+            this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 94;
             // 
             // gridColumn4
@@ -711,7 +706,7 @@
             this.gridColumn4.FieldName = "checkUser";
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 11;
+            this.gridColumn4.VisibleIndex = 8;
             this.gridColumn4.Width = 94;
             // 
             // xtraTabControl1
@@ -757,10 +752,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 150);
+            this.tabMx.Location = new System.Drawing.Point(0, 203);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1126, 420);
+            this.tabMx.Size = new System.Drawing.Size(1126, 367);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage2,
@@ -770,8 +765,8 @@
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 388);
-            this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮佹槑缁�";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 335);
+            this.xtraTabPage3.Text = "鎵爜鏄庣粏";
             // 
             // gcMx2
             // 
@@ -779,7 +774,7 @@
             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, 388);
+            this.gcMx2.Size = new System.Drawing.Size(1124, 335);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -796,8 +791,8 @@
             this.gridColumn10,
             this.gvMx1depotCode,
             this.gvMx1depotSectionCode,
-            this.gvMx1ebelnK3id,
-            this.gvMx1lineK3id});
+            this.gridColumn5,
+            this.gridColumn6});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -904,141 +899,464 @@
             this.gvMx1depotSectionCode.VisibleIndex = 7;
             this.gvMx1depotSectionCode.Width = 94;
             // 
-            // gvMx1ebelnK3id
-            // 
-            this.gvMx1ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
-            this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
-            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
-            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
-            this.gvMx1ebelnK3id.Visible = true;
-            this.gvMx1ebelnK3id.VisibleIndex = 8;
-            this.gvMx1ebelnK3id.Width = 94;
-            // 
-            // gvMx1lineK3id
-            // 
-            this.gvMx1lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
-            this.gvMx1lineK3id.FieldName = "lineK3id";
-            this.gvMx1lineK3id.Name = "gvMx1lineK3id";
-            this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
-            this.gvMx1lineK3id.Visible = true;
-            this.gvMx1lineK3id.VisibleIndex = 9;
-            this.gvMx1lineK3id.Width = 94;
-            // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_suppName);
-            this.panel1.Controls.Add(this.txt_depotName);
-            this.panel1.Controls.Add(this.txt_status);
-            this.panel1.Controls.Add(this.txt_fType);
-            this.panel1.Controls.Add(this.txt_fmrmode);
-            this.panel1.Controls.Add(this.txt_reason);
+            this.panel1.Controls.Add(this.txt_fTransferDirect);
+            this.panel1.Controls.Add(this.txt_fBusinessType);
+            this.panel1.Controls.Add(this.txt_fOwnerTypeInIdHead);
+            this.panel1.Controls.Add(this.txt_fOwnerTypeIdHead);
+            this.panel1.Controls.Add(this.txt_ftranstype);
+            this.panel1.Controls.Add(this.txt_fBillTypeID);
+            this.panel1.Controls.Add(this.txt_fapporgid);
+            this.panel1.Controls.Add(this.labelControl12);
+            this.panel1.Controls.Add(this.txt_djcreateDate);
+            this.panel1.Controls.Add(this.labelControl13);
+            this.panel1.Controls.Add(this.txt_djcreateUser);
+            this.panel1.Controls.Add(this.labelControl11);
+            this.panel1.Controls.Add(this.textEdit3);
+            this.panel1.Controls.Add(this.labelControl10);
+            this.panel1.Controls.Add(this.textEdit2);
+            this.panel1.Controls.Add(this.labelControl9);
+            this.panel1.Controls.Add(this.txt_djbillNo);
+            this.panel1.Controls.Add(this.labelControl7);
+            this.panel1.Controls.Add(this.txt_fCreateDate);
+            this.panel1.Controls.Add(this.labelControl8);
+            this.panel1.Controls.Add(this.txt_fCreatorId);
+            this.panel1.Controls.Add(this.labelControl6);
+            this.panel1.Controls.Add(this.labelControl5);
+            this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_checkUser);
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.labelControl1);
+            this.panel1.Controls.Add(this.txt_fRemarks);
+            this.panel1.Controls.Add(this.txt_djwjStatus);
+            this.panel1.Controls.Add(this.txt_djchkStatus);
+            this.panel1.Controls.Add(this.lb_isWc);
+            this.panel1.Controls.Add(this.lb_billno);
+            this.panel1.Controls.Add(this.txt_fBillNo);
+            this.panel1.Controls.Add(this.lb_shState);
+            this.panel1.Controls.Add(this.lb_shDate);
+            this.panel1.Controls.Add(this.txt_djcheckdate);
+            this.panel1.Controls.Add(this.lb_shBy);
+            this.panel1.Controls.Add(this.txt_djcheckuser);
+            this.panel1.Controls.Add(this.lb_ftransferdirect);
+            this.panel1.Controls.Add(this.lb_fbilltypeid);
+            this.panel1.Controls.Add(this.lb_id);
             this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_fmrmode);
-            this.panel1.Controls.Add(this.lb_suppNo);
-            this.panel1.Controls.Add(this.lb_fType);
-            this.panel1.Controls.Add(this.lb_depotCode);
-            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.lb_reason);
-            this.panel1.Controls.Add(this.lb_remark);
-            this.panel1.Controls.Add(this.txt_remark);
-            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, 150);
+            this.panel1.Size = new System.Drawing.Size(1126, 203);
             this.panel1.TabIndex = 1;
             // 
-            // txt_suppName
+            // txt_fTransferDirect
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(94, 80);
-            this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
-            this.txt_suppName.Size = new System.Drawing.Size(239, 28);
-            this.txt_suppName.TabIndex = 524;
+            this.txt_fTransferDirect.Location = new System.Drawing.Point(86, 96);
+            this.txt_fTransferDirect.Name = "txt_fTransferDirect";
+            this.txt_fTransferDirect.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fTransferDirect.Properties.Appearance.Options.UseFont = true;
+            this.txt_fTransferDirect.Size = new System.Drawing.Size(227, 28);
+            this.txt_fTransferDirect.TabIndex = 434;
+            this.txt_fTransferDirect.Tag = "readonly";
             // 
-            // txt_depotName
+            // txt_fBusinessType
             // 
-            this.txt_depotName.Location = new System.Drawing.Point(94, 47);
-            this.txt_depotName.Name = "txt_depotName";
-            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotName.Size = new System.Drawing.Size(239, 28);
-            this.txt_depotName.TabIndex = 523;
+            this.txt_fBusinessType.Location = new System.Drawing.Point(86, 64);
+            this.txt_fBusinessType.Name = "txt_fBusinessType";
+            this.txt_fBusinessType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fBusinessType.Properties.Appearance.Options.UseFont = true;
+            this.txt_fBusinessType.Size = new System.Drawing.Size(227, 28);
+            this.txt_fBusinessType.TabIndex = 433;
+            this.txt_fBusinessType.Tag = "readonly";
             // 
-            // txt_status
+            // txt_fOwnerTypeInIdHead
             // 
-            this.txt_status.Enabled = false;
-            this.txt_status.Location = new System.Drawing.Point(623, 17);
-            this.txt_status.Name = "txt_status";
-            this.txt_status.Properties.Caption = "";
-            this.txt_status.Size = new System.Drawing.Size(94, 24);
-            this.txt_status.TabIndex = 521;
+            this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(422, 96);
+            this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
+            this.txt_fOwnerTypeInIdHead.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fOwnerTypeInIdHead.Properties.Appearance.Options.UseFont = true;
+            this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(192, 28);
+            this.txt_fOwnerTypeInIdHead.TabIndex = 432;
+            this.txt_fOwnerTypeInIdHead.Tag = "readonly";
             // 
-            // txt_fType
+            // txt_fOwnerTypeIdHead
             // 
-            this.txt_fType.Location = new System.Drawing.Point(415, 17);
-            this.txt_fType.Name = "txt_fType";
-            this.txt_fType.Properties.Caption = "";
-            this.txt_fType.Size = new System.Drawing.Size(94, 24);
-            this.txt_fType.TabIndex = 520;
+            this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(422, 64);
+            this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
+            this.txt_fOwnerTypeIdHead.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fOwnerTypeIdHead.Properties.Appearance.Options.UseFont = true;
+            this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(192, 28);
+            this.txt_fOwnerTypeIdHead.TabIndex = 431;
+            this.txt_fOwnerTypeIdHead.Tag = "readonly";
             // 
-            // txt_fmrmode
+            // txt_ftranstype
             // 
-            this.txt_fmrmode.Location = new System.Drawing.Point(415, 49);
-            this.txt_fmrmode.Name = "txt_fmrmode";
-            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_fmrmode.Properties.Items.AddRange(new object[] {
-            "閫�鏂欒ˉ鏂�",
-            "閫�鏂欏苟鎵f"});
-            this.txt_fmrmode.Size = new System.Drawing.Size(125, 24);
-            this.txt_fmrmode.TabIndex = 519;
+            this.txt_ftranstype.Location = new System.Drawing.Point(393, 35);
+            this.txt_ftranstype.Name = "txt_ftranstype";
+            this.txt_ftranstype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_ftranstype.Properties.Appearance.Options.UseFont = true;
+            this.txt_ftranstype.Size = new System.Drawing.Size(221, 28);
+            this.txt_ftranstype.TabIndex = 430;
+            this.txt_ftranstype.Tag = "readonly";
             // 
-            // txt_reason
+            // txt_fBillTypeID
             // 
-            this.txt_reason.Location = new System.Drawing.Point(415, 82);
-            this.txt_reason.Name = "txt_reason";
-            this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_reason.Properties.Items.AddRange(new object[] {
-            "鏉ユ枡涓嶈壇",
-            "渚涘簲鍟嗗閫�",
-            "浣滀笟涓嶈壇",
-            "渚涘簲鍟嗙墿鍝佸彿閿欒",
-            "閲囪喘鏂欏彿鍙樻洿"});
-            this.txt_reason.Size = new System.Drawing.Size(125, 24);
-            this.txt_reason.TabIndex = 518;
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(86, 35);
+            this.txt_fBillTypeID.Name = "txt_fBillTypeID";
+            this.txt_fBillTypeID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fBillTypeID.Properties.Appearance.Options.UseFont = true;
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(227, 28);
+            this.txt_fBillTypeID.TabIndex = 429;
+            this.txt_fBillTypeID.Tag = "readonly";
+            // 
+            // txt_fapporgid
+            // 
+            this.txt_fapporgid.Location = new System.Drawing.Point(393, 4);
+            this.txt_fapporgid.Name = "txt_fapporgid";
+            this.txt_fapporgid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fapporgid.Properties.Appearance.Options.UseFont = true;
+            this.txt_fapporgid.Size = new System.Drawing.Size(221, 28);
+            this.txt_fapporgid.TabIndex = 428;
+            this.txt_fapporgid.Tag = "readonly";
+            // 
+            // labelControl12
+            // 
+            this.labelControl12.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl12.Appearance.Options.UseFont = true;
+            this.labelControl12.Location = new System.Drawing.Point(869, 39);
+            this.labelControl12.Name = "labelControl12";
+            this.labelControl12.Size = new System.Drawing.Size(68, 21);
+            this.labelControl12.TabIndex = 426;
+            this.labelControl12.Text = "鍒涘缓鏃堕棿";
+            // 
+            // txt_djcreateDate
+            // 
+            this.txt_djcreateDate.Location = new System.Drawing.Point(941, 35);
+            this.txt_djcreateDate.Name = "txt_djcreateDate";
+            this.txt_djcreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_djcreateDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_djcreateDate.Size = new System.Drawing.Size(166, 28);
+            this.txt_djcreateDate.TabIndex = 427;
+            this.txt_djcreateDate.Tag = "readonly";
+            // 
+            // labelControl13
+            // 
+            this.labelControl13.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl13.Appearance.Options.UseFont = true;
+            this.labelControl13.Location = new System.Drawing.Point(886, 7);
+            this.labelControl13.Name = "labelControl13";
+            this.labelControl13.Size = new System.Drawing.Size(51, 21);
+            this.labelControl13.TabIndex = 424;
+            this.labelControl13.Text = "鍒涘缓浜�";
+            // 
+            // txt_djcreateUser
+            // 
+            this.txt_djcreateUser.Location = new System.Drawing.Point(941, 3);
+            this.txt_djcreateUser.Name = "txt_djcreateUser";
+            this.txt_djcreateUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_djcreateUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_djcreateUser.Size = new System.Drawing.Size(166, 28);
+            this.txt_djcreateUser.TabIndex = 425;
+            this.txt_djcreateUser.Tag = "readonly";
+            // 
+            // labelControl11
+            // 
+            this.labelControl11.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl11.Appearance.Options.UseFont = true;
+            this.labelControl11.Location = new System.Drawing.Point(694, 167);
+            this.labelControl11.Name = "labelControl11";
+            this.labelControl11.Size = new System.Drawing.Size(68, 21);
+            this.labelControl11.TabIndex = 423;
+            this.labelControl11.Text = "绉诲嚭瀛愬簱";
+            // 
+            // textEdit3
+            // 
+            this.textEdit3.Location = new System.Drawing.Point(767, 163);
+            this.textEdit3.Name = "textEdit3";
+            this.textEdit3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit3.Properties.Appearance.Options.UseFont = true;
+            this.textEdit3.Size = new System.Drawing.Size(227, 28);
+            this.textEdit3.TabIndex = 422;
+            this.textEdit3.Tag = "readonly";
+            // 
+            // labelControl10
+            // 
+            this.labelControl10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl10.Appearance.Options.UseFont = true;
+            this.labelControl10.Location = new System.Drawing.Point(378, 167);
+            this.labelControl10.Name = "labelControl10";
+            this.labelControl10.Size = new System.Drawing.Size(68, 21);
+            this.labelControl10.TabIndex = 421;
+            this.labelControl10.Text = "绉诲叆瀛愬簱";
+            // 
+            // textEdit2
+            // 
+            this.textEdit2.Location = new System.Drawing.Point(451, 163);
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit2.Properties.Appearance.Options.UseFont = true;
+            this.textEdit2.Size = new System.Drawing.Size(227, 28);
+            this.textEdit2.TabIndex = 420;
+            this.textEdit2.Tag = "readonly";
+            // 
+            // labelControl9
+            // 
+            this.labelControl9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl9.Appearance.Options.UseFont = true;
+            this.labelControl9.Location = new System.Drawing.Point(11, 8);
+            this.labelControl9.Name = "labelControl9";
+            this.labelControl9.Size = new System.Drawing.Size(68, 21);
+            this.labelControl9.TabIndex = 419;
+            this.labelControl9.Text = "璋冩嫧鍗曞彿";
+            // 
+            // txt_djbillNo
+            // 
+            this.txt_djbillNo.Location = new System.Drawing.Point(86, 4);
+            this.txt_djbillNo.Name = "txt_djbillNo";
+            this.txt_djbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_djbillNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_djbillNo.Size = new System.Drawing.Size(227, 28);
+            this.txt_djbillNo.TabIndex = 418;
+            this.txt_djbillNo.Tag = "readonly";
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl7.Appearance.Options.UseFont = true;
+            this.labelControl7.Location = new System.Drawing.Point(622, 39);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(68, 21);
+            this.labelControl7.TabIndex = 416;
+            this.labelControl7.Text = "鐢宠鏃堕棿";
+            // 
+            // txt_fCreateDate
+            // 
+            this.txt_fCreateDate.Location = new System.Drawing.Point(694, 35);
+            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(166, 28);
+            this.txt_fCreateDate.TabIndex = 417;
+            this.txt_fCreateDate.Tag = "readonly";
+            // 
+            // labelControl8
+            // 
+            this.labelControl8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl8.Appearance.Options.UseFont = true;
+            this.labelControl8.Location = new System.Drawing.Point(639, 8);
+            this.labelControl8.Name = "labelControl8";
+            this.labelControl8.Size = new System.Drawing.Size(51, 21);
+            this.labelControl8.TabIndex = 414;
+            this.labelControl8.Text = "鐢宠浜�";
+            // 
+            // txt_fCreatorId
+            // 
+            this.txt_fCreatorId.Location = new System.Drawing.Point(694, 4);
+            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(166, 28);
+            this.txt_fCreatorId.TabIndex = 415;
+            this.txt_fCreatorId.Tag = "readonly";
+            // 
+            // labelControl6
+            // 
+            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl6.Appearance.Options.UseFont = true;
+            this.labelControl6.Location = new System.Drawing.Point(319, 100);
+            this.labelControl6.Name = "labelControl6";
+            this.labelControl6.Size = new System.Drawing.Size(107, 21);
+            this.labelControl6.TabIndex = 412;
+            this.labelControl6.Text = "璋冨叆璐т富绫诲瀷 ";
+            // 
+            // labelControl5
+            // 
+            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl5.Appearance.Options.UseFont = true;
+            this.labelControl5.Location = new System.Drawing.Point(319, 68);
+            this.labelControl5.Name = "labelControl5";
+            this.labelControl5.Size = new System.Drawing.Size(107, 21);
+            this.labelControl5.TabIndex = 410;
+            this.labelControl5.Text = "璋冨嚭璐т富绫诲瀷 ";
+            // 
+            // labelControl4
+            // 
+            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl4.Appearance.Options.UseFont = true;
+            this.labelControl4.Location = new System.Drawing.Point(319, 39);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(73, 21);
+            this.labelControl4.TabIndex = 408;
+            this.labelControl4.Text = "璋冩嫧绫诲瀷 ";
             // 
             // labelControl3
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(565, 51);
+            this.labelControl3.Location = new System.Drawing.Point(319, 8);
             this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(51, 21);
-            this.labelControl3.TabIndex = 512;
-            this.labelControl3.Text = "瀹℃牳浜�";
+            this.labelControl3.Size = new System.Drawing.Size(68, 21);
+            this.labelControl3.TabIndex = 406;
+            this.labelControl3.Text = "鐢宠缁勭粐";
             // 
-            // txt_checkUser
+            // labelControl2
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(623, 47);
-            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(158, 28);
-            this.txt_checkUser.TabIndex = 513;
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(11, 68);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(68, 21);
+            this.labelControl2.TabIndex = 404;
+            this.labelControl2.Text = "涓氬姟绫诲瀷";
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl1.Appearance.Options.UseFont = true;
+            this.labelControl1.Location = new System.Drawing.Point(44, 129);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(34, 21);
+            this.labelControl1.TabIndex = 403;
+            this.labelControl1.Text = "澶囨敞";
+            // 
+            // txt_fRemarks
+            // 
+            this.txt_fRemarks.Location = new System.Drawing.Point(86, 126);
+            this.txt_fRemarks.Name = "txt_fRemarks";
+            this.txt_fRemarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
+            this.txt_fRemarks.Size = new System.Drawing.Size(528, 28);
+            this.txt_fRemarks.TabIndex = 402;
+            // 
+            // txt_djwjStatus
+            // 
+            this.txt_djwjStatus.Enabled = false;
+            this.txt_djwjStatus.Location = new System.Drawing.Point(808, 128);
+            this.txt_djwjStatus.Name = "txt_djwjStatus";
+            this.txt_djwjStatus.Properties.Caption = "";
+            this.txt_djwjStatus.Size = new System.Drawing.Size(39, 24);
+            this.txt_djwjStatus.TabIndex = 401;
+            // 
+            // txt_djchkStatus
+            // 
+            this.txt_djchkStatus.Enabled = false;
+            this.txt_djchkStatus.Location = new System.Drawing.Point(694, 128);
+            this.txt_djchkStatus.Name = "txt_djchkStatus";
+            this.txt_djchkStatus.Properties.Caption = "";
+            this.txt_djchkStatus.Size = new System.Drawing.Size(29, 24);
+            this.txt_djchkStatus.TabIndex = 400;
+            // 
+            // lb_isWc
+            // 
+            this.lb_isWc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_isWc.Appearance.Options.UseFont = true;
+            this.lb_isWc.Location = new System.Drawing.Point(732, 130);
+            this.lb_isWc.Name = "lb_isWc";
+            this.lb_isWc.Size = new System.Drawing.Size(73, 21);
+            this.lb_isWc.TabIndex = 397;
+            this.lb_isWc.Text = "瀹岀粨鏍囪瘑 ";
+            // 
+            // lb_billno
+            // 
+            this.lb_billno.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_billno.Appearance.Options.UseFont = true;
+            this.lb_billno.Location = new System.Drawing.Point(11, 167);
+            this.lb_billno.Name = "lb_billno";
+            this.lb_billno.Size = new System.Drawing.Size(68, 21);
+            this.lb_billno.TabIndex = 396;
+            this.lb_billno.Text = "鐢宠鍗曞彿";
+            // 
+            // txt_fBillNo
+            // 
+            this.txt_fBillNo.Location = new System.Drawing.Point(86, 163);
+            this.txt_fBillNo.Name = "txt_fBillNo";
+            this.txt_fBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_fBillNo.Size = new System.Drawing.Size(227, 28);
+            this.txt_fBillNo.TabIndex = 395;
+            this.txt_fBillNo.Tag = "readonly";
+            // 
+            // lb_shState
+            // 
+            this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_shState.Appearance.Options.UseFont = true;
+            this.lb_shState.Location = new System.Drawing.Point(622, 130);
+            this.lb_shState.Name = "lb_shState";
+            this.lb_shState.Size = new System.Drawing.Size(68, 21);
+            this.lb_shState.TabIndex = 394;
+            this.lb_shState.Text = "瀹℃牳鐘舵��";
+            // 
+            // lb_shDate
+            // 
+            this.lb_shDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_shDate.Appearance.Options.UseFont = true;
+            this.lb_shDate.Location = new System.Drawing.Point(622, 100);
+            this.lb_shDate.Name = "lb_shDate";
+            this.lb_shDate.Size = new System.Drawing.Size(68, 21);
+            this.lb_shDate.TabIndex = 393;
+            this.lb_shDate.Text = "瀹℃牳鏃堕棿";
+            // 
+            // txt_djcheckdate
+            // 
+            this.txt_djcheckdate.Location = new System.Drawing.Point(694, 96);
+            this.txt_djcheckdate.Name = "txt_djcheckdate";
+            this.txt_djcheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_djcheckdate.Properties.Appearance.Options.UseFont = true;
+            this.txt_djcheckdate.Size = new System.Drawing.Size(166, 28);
+            this.txt_djcheckdate.TabIndex = 392;
+            this.txt_djcheckdate.Tag = "readonly";
+            // 
+            // lb_shBy
+            // 
+            this.lb_shBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_shBy.Appearance.Options.UseFont = true;
+            this.lb_shBy.Location = new System.Drawing.Point(639, 68);
+            this.lb_shBy.Name = "lb_shBy";
+            this.lb_shBy.Size = new System.Drawing.Size(51, 21);
+            this.lb_shBy.TabIndex = 391;
+            this.lb_shBy.Text = "瀹℃牳浜�";
+            // 
+            // txt_djcheckuser
+            // 
+            this.txt_djcheckuser.Location = new System.Drawing.Point(694, 64);
+            this.txt_djcheckuser.Name = "txt_djcheckuser";
+            this.txt_djcheckuser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_djcheckuser.Properties.Appearance.Options.UseFont = true;
+            this.txt_djcheckuser.Size = new System.Drawing.Size(166, 28);
+            this.txt_djcheckuser.TabIndex = 390;
+            this.txt_djcheckuser.Tag = "readonly";
+            // 
+            // lb_ftransferdirect
+            // 
+            this.lb_ftransferdirect.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_ftransferdirect.Appearance.Options.UseFont = true;
+            this.lb_ftransferdirect.Location = new System.Drawing.Point(11, 100);
+            this.lb_ftransferdirect.Name = "lb_ftransferdirect";
+            this.lb_ftransferdirect.Size = new System.Drawing.Size(68, 21);
+            this.lb_ftransferdirect.TabIndex = 389;
+            this.lb_ftransferdirect.Text = "璋冩嫧鏂瑰悜";
+            // 
+            // lb_fbilltypeid
+            // 
+            this.lb_fbilltypeid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_fbilltypeid.Appearance.Options.UseFont = true;
+            this.lb_fbilltypeid.Location = new System.Drawing.Point(11, 39);
+            this.lb_fbilltypeid.Name = "lb_fbilltypeid";
+            this.lb_fbilltypeid.Size = new System.Drawing.Size(68, 21);
+            this.lb_fbilltypeid.TabIndex = 388;
+            this.lb_fbilltypeid.Text = "鍗曟嵁绫诲瀷";
+            // 
+            // lb_id
+            // 
+            this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_id.Appearance.Options.UseFont = true;
+            this.lb_id.Location = new System.Drawing.Point(10, 8);
+            this.lb_id.Name = "lb_id";
+            this.lb_id.Size = new System.Drawing.Size(5, 21);
+            this.lb_id.TabIndex = 387;
+            this.lb_id.Text = " ";
             // 
             // lbGuid
             // 
@@ -1059,7 +1377,27 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // Frm_MesCgthSqDj
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鍒涘缓浜�";
+            this.gridColumn5.FieldName = "createBy";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 8;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "鍒涘缓鏃ユ湡";
+            this.gridColumn6.FieldName = "createDate";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 9;
+            this.gridColumn6.Width = 94;
+            // 
+            // Frm_MesDbckDj
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -1067,14 +1405,11 @@
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesCgthSqDj";
-            this.Text = "閲囪喘閫�璐у崟";
+            this.Name = "Frm_MesDbckDj";
+            this.Text = "璋冩嫧鍗�";
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.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();
@@ -1088,13 +1423,26 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fTransferDirect.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeInIdHead.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeIdHead.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fapporgid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcreateDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcreateUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djbillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fRemarks.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djwjStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djchkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcheckdate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_djcheckuser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -1110,61 +1458,17 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-
-        //BQCreateConrolObejct
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-
-        private DevExpress.XtraEditors.LabelControl lb_fmrmode;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
-
-        private DevExpress.XtraEditors.LabelControl lb_suppNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
-
-        private DevExpress.XtraEditors.LabelControl lb_fType;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
-
-        private DevExpress.XtraEditors.LabelControl lb_depotCode;
         private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
-
-        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.LabelControl lb_reason;
-        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.XtraGrid.Columns.GridColumn gv_createDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-
-        private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
-        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1174,20 +1478,81 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
-        private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
-        private DevExpress.XtraEditors.CheckEdit txt_fType;
-        private DevExpress.XtraEditors.CheckEdit txt_status;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraEditors.TextEdit txt_fCreateDate;
+        private DevExpress.XtraEditors.LabelControl labelControl8;
+        private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
+        private DevExpress.XtraEditors.LabelControl labelControl6;
+        private DevExpress.XtraEditors.LabelControl labelControl5;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private DevExpress.XtraEditors.LabelControl labelControl3;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.TextEdit txt_fRemarks;
+        private DevExpress.XtraEditors.CheckEdit txt_djwjStatus;
+        private DevExpress.XtraEditors.CheckEdit txt_djchkStatus;
+        private DevExpress.XtraEditors.LabelControl lb_isWc;
+        private DevExpress.XtraEditors.LabelControl lb_billno;
+        private DevExpress.XtraEditors.TextEdit txt_fBillNo;
+        private DevExpress.XtraEditors.LabelControl lb_shState;
+        private DevExpress.XtraEditors.LabelControl lb_shDate;
+        private DevExpress.XtraEditors.TextEdit txt_djcheckdate;
+        private DevExpress.XtraEditors.LabelControl lb_shBy;
+        private DevExpress.XtraEditors.TextEdit txt_djcheckuser;
+        private DevExpress.XtraEditors.LabelControl lb_ftransferdirect;
+        private DevExpress.XtraEditors.LabelControl lb_fbilltypeid;
+        private DevExpress.XtraEditors.LabelControl lb_id;
+        private DevExpress.XtraEditors.LabelControl labelControl12;
+        private DevExpress.XtraEditors.TextEdit txt_djcreateDate;
+        private DevExpress.XtraEditors.LabelControl labelControl13;
+        private DevExpress.XtraEditors.TextEdit txt_djcreateUser;
+        private DevExpress.XtraEditors.LabelControl labelControl11;
+        private DevExpress.XtraEditors.TextEdit textEdit3;
+        private DevExpress.XtraEditors.LabelControl labelControl10;
+        private DevExpress.XtraEditors.TextEdit textEdit2;
+        private DevExpress.XtraEditors.LabelControl labelControl9;
+        private DevExpress.XtraEditors.TextEdit txt_djbillNo;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld002;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld003;
+        private DevExpress.XtraGrid.Columns.GridColumn itemModel;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld007;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld010;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld008;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraEditors.TextEdit txt_suppName;
-        private DevExpress.XtraEditors.TextEdit txt_depotName;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraEditors.TextEdit txt_fTransferDirect;
+        private DevExpress.XtraEditors.TextEdit txt_fBusinessType;
+        private DevExpress.XtraEditors.TextEdit txt_fOwnerTypeInIdHead;
+        private DevExpress.XtraEditors.TextEdit txt_fOwnerTypeIdHead;
+        private DevExpress.XtraEditors.TextEdit txt_ftranstype;
+        private DevExpress.XtraEditors.TextEdit txt_fBillTypeID;
+        private DevExpress.XtraEditors.TextEdit txt_fapporgid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
index d6dc174..f28b234 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs
@@ -14,14 +14,12 @@
 {
     public partial class Frm_MesDbckDj : DevExpress.XtraEditors.XtraForm
     {
-
-        string _webServiceName = "MesCgthSqDjManager/";
+        string _webServiceName = "MesInvItemMovesDjManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         public Frm_MesDbckDj()
         {
             InitializeComponent();
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
@@ -105,16 +103,6 @@
             _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>
@@ -124,7 +112,7 @@
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_itemOutNo, gridView1);
+                lbGuid, txt_djbillNo, gridView1);
             toolBarMenu1.guidKey = rowGuid;
         }
         /// <summary>
@@ -284,7 +272,7 @@
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_djbillNo, gridView1, "itemOutNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
index 59b6838..684151a 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -29,8 +29,11 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            this.tabControl1 = new System.Windows.Forms.TabControl();
-            this.tabPage1 = new System.Windows.Forms.TabPage();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -70,26 +73,24 @@
             this.gv_saleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_receiveId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_receiveContact = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
             this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
             this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
-            this.dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
-            this.dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
-            this.dockPanel2 = new DevExpress.XtraBars.Docking.DockPanel();
-            this.dockPanel2_Container = new DevExpress.XtraBars.Docking.ControlContainer();
-            this.tabControl1.SuspendLayout();
-            this.tabPage1.SuspendLayout();
+            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            this.tabPage2.SuspendLayout();
+            this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
             this.splitContainerControl1.Panel1.SuspendLayout();
@@ -101,43 +102,51 @@
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
             this.panelControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit();
-            this.dockPanel1.SuspendLayout();
-            this.dockPanel2.SuspendLayout();
+            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
             this.SuspendLayout();
             // 
-            // tabControl1
+            // xtraTabControl1
             // 
-            this.tabControl1.Controls.Add(this.tabPage1);
-            this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Controls.Add(this.tabPage3);
-            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabControl1.Location = new System.Drawing.Point(0, 0);
-            this.tabControl1.Name = "tabControl1";
-            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(1057, 660);
-            this.tabControl1.TabIndex = 0;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+            this.xtraTabControl1.CustomHeaderButtons.AddRange(new DevExpress.XtraTab.Buttons.CustomHeaderButton[] {
+            new DevExpress.XtraTab.Buttons.CustomHeaderButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, editorButtonImageOptions1, serializableAppearanceObject1, "", null, null)});
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1057, 660);
+            this.xtraTabControl1.TabIndex = 1;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
             // 
-            // tabPage1
+            // xtraTabPage1
             // 
-            this.tabPage1.Controls.Add(this.gcMain);
-            this.tabPage1.Location = new System.Drawing.Point(4, 27);
-            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(1049, 629);
-            this.tabPage1.TabIndex = 0;
-            this.tabPage1.Text = "tabPage1";
-            this.tabPage1.UseVisualStyleBackColor = true;
+            this.xtraTabPage1.Controls.Add(this.toolStrip1);
+            this.xtraTabPage1.Controls.Add(this.gcMain);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1055, 628);
+            this.xtraTabPage1.Text = "xtraTabPage1";
+            // 
+            // toolStrip1
+            // 
+            this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+            this.toolStrip1.Name = "toolStrip1";
+            this.toolStrip1.Size = new System.Drawing.Size(1055, 25);
+            this.toolStrip1.TabIndex = 7;
+            this.toolStrip1.Text = "toolStrip1";
             // 
             // 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(3, 3);
+            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(1043, 623);
-            this.gcMain.TabIndex = 5;
+            this.gcMain.Size = new System.Drawing.Size(1055, 628);
+            this.gcMain.TabIndex = 6;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
             // 
@@ -708,29 +717,25 @@
             this.gv_receiveContact.VisibleIndex = 36;
             this.gv_receiveContact.Width = 94;
             // 
-            // tabPage2
+            // xtraTabPage2
             // 
-            this.tabPage2.Controls.Add(this.splitContainerControl1);
-            this.tabPage2.Location = new System.Drawing.Point(4, 27);
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(1049, 629);
-            this.tabPage2.TabIndex = 1;
-            this.tabPage2.Text = "tabPage2";
-            this.tabPage2.UseVisualStyleBackColor = true;
+            this.xtraTabPage2.Controls.Add(this.splitContainerControl1);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1055, 628);
+            this.xtraTabPage2.Text = "xtraTabPage2";
             // 
             // splitContainerControl1
             // 
             this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitContainerControl1.Horizontal = false;
-            this.splitContainerControl1.Location = new System.Drawing.Point(3, 3);
+            this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
             this.splitContainerControl1.Name = "splitContainerControl1";
             // 
             // splitContainerControl1.Panel1
             // 
             this.splitContainerControl1.Panel1.Appearance.BackColor = System.Drawing.Color.White;
             this.splitContainerControl1.Panel1.Appearance.Options.UseBackColor = true;
-            this.splitContainerControl1.Panel1.Controls.Add(this.labelControl2);
+            this.splitContainerControl1.Panel1.Controls.Add(this.panel1);
             this.splitContainerControl1.Panel1.Controls.Add(this.panelControl2);
             this.splitContainerControl1.Panel1.Controls.Add(this.panelControl1);
             this.splitContainerControl1.Panel1.Text = "Panel1";
@@ -738,20 +743,14 @@
             // splitContainerControl1.Panel2
             // 
             this.splitContainerControl1.Panel2.Text = "Panel2";
-            this.splitContainerControl1.Size = new System.Drawing.Size(1043, 623);
+            this.splitContainerControl1.Size = new System.Drawing.Size(1055, 628);
             this.splitContainerControl1.SplitterPosition = 189;
-            this.splitContainerControl1.TabIndex = 1;
-            // 
-            // labelControl2
-            // 
-            this.labelControl2.Location = new System.Drawing.Point(567, 42);
-            this.labelControl2.Name = "labelControl2";
-            this.labelControl2.Size = new System.Drawing.Size(81, 18);
-            this.labelControl2.TabIndex = 0;
-            this.labelControl2.Text = "labelControl2";
+            this.splitContainerControl1.TabIndex = 2;
             // 
             // panelControl2
             // 
+            this.panelControl2.Appearance.BackColor = System.Drawing.Color.White;
+            this.panelControl2.Appearance.Options.UseBackColor = true;
             this.panelControl2.Controls.Add(this.labelControl3);
             this.panelControl2.Controls.Add(this.textEdit2);
             this.panelControl2.Location = new System.Drawing.Point(189, 76);
@@ -806,97 +805,52 @@
             this.textEdit1.Size = new System.Drawing.Size(155, 28);
             this.textEdit1.TabIndex = 215;
             // 
-            // tabPage3
+            // panel1
             // 
-            this.tabPage3.Location = new System.Drawing.Point(4, 27);
-            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage3.Size = new System.Drawing.Size(1049, 629);
-            this.tabPage3.TabIndex = 2;
-            this.tabPage3.Text = "tabPage3";
-            this.tabPage3.UseVisualStyleBackColor = true;
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.textEdit4);
+            this.panel1.Location = new System.Drawing.Point(494, 31);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(271, 100);
+            this.panel1.TabIndex = 2;
             // 
-            // dockManager1
+            // labelControl2
             // 
-            this.dockManager1.Form = this;
-            this.dockManager1.HiddenPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
-            this.dockPanel1});
-            this.dockManager1.RootPanels.AddRange(new DevExpress.XtraBars.Docking.DockPanel[] {
-            this.dockPanel2});
-            this.dockManager1.TopZIndexControls.AddRange(new string[] {
-            "DevExpress.XtraBars.BarDockControl",
-            "DevExpress.XtraBars.StandaloneBarDockControl",
-            "System.Windows.Forms.MenuStrip",
-            "System.Windows.Forms.StatusStrip",
-            "System.Windows.Forms.StatusBar",
-            "DevExpress.XtraBars.Ribbon.RibbonStatusBar",
-            "DevExpress.XtraBars.Ribbon.RibbonControl",
-            "DevExpress.XtraBars.Navigation.OfficeNavigationBar",
-            "DevExpress.XtraBars.Navigation.TileNavPane",
-            "DevExpress.XtraBars.TabFormControl",
-            "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
-            "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(34, 40);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(73, 21);
+            this.labelControl2.TabIndex = 219;
+            this.labelControl2.Text = "鍗曟嵁绫诲瀷 ";
             // 
-            // dockPanel1
+            // textEdit4
             // 
-            this.dockPanel1.Appearance.BorderColor = System.Drawing.Color.Black;
-            this.dockPanel1.Appearance.Options.UseBorderColor = true;
-            this.dockPanel1.Controls.Add(this.dockPanel1_Container);
-            this.dockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
-            this.dockPanel1.FloatLocation = new System.Drawing.Point(1668, 111);
-            this.dockPanel1.FloatSize = new System.Drawing.Size(200, 327);
-            this.dockPanel1.ID = new System.Guid("726e2754-293f-4051-82ef-5a55b66fff3b");
-            this.dockPanel1.Location = new System.Drawing.Point(-32768, -32768);
-            this.dockPanel1.Name = "dockPanel1";
-            this.dockPanel1.OriginalSize = new System.Drawing.Size(200, 200);
-            this.dockPanel1.SavedIndex = 0;
-            this.dockPanel1.Size = new System.Drawing.Size(200, 327);
-            this.dockPanel1.Text = "dockPanel1";
-            this.dockPanel1.Visibility = DevExpress.XtraBars.Docking.DockVisibility.Hidden;
-            // 
-            // dockPanel1_Container
-            // 
-            this.dockPanel1_Container.Location = new System.Drawing.Point(5, 32);
-            this.dockPanel1_Container.Name = "dockPanel1_Container";
-            this.dockPanel1_Container.Size = new System.Drawing.Size(190, 291);
-            this.dockPanel1_Container.TabIndex = 0;
-            // 
-            // dockPanel2
-            // 
-            this.dockPanel2.Controls.Add(this.dockPanel2_Container);
-            this.dockPanel2.Dock = DevExpress.XtraBars.Docking.DockingStyle.Float;
-            this.dockPanel2.FloatLocation = new System.Drawing.Point(576, 403);
-            this.dockPanel2.ID = new System.Guid("40a1e9c8-dcf0-4757-93cc-fd8ff633d140");
-            this.dockPanel2.Location = new System.Drawing.Point(0, 0);
-            this.dockPanel2.Name = "dockPanel2";
-            this.dockPanel2.OriginalSize = new System.Drawing.Size(200, 200);
-            this.dockPanel2.Size = new System.Drawing.Size(200, 200);
-            this.dockPanel2.Text = "dockPanel2";
-            // 
-            // dockPanel2_Container
-            // 
-            this.dockPanel2_Container.Location = new System.Drawing.Point(5, 32);
-            this.dockPanel2_Container.Name = "dockPanel2_Container";
-            this.dockPanel2_Container.Size = new System.Drawing.Size(190, 164);
-            this.dockPanel2_Container.TabIndex = 0;
+            this.textEdit4.Location = new System.Drawing.Point(113, 33);
+            this.textEdit4.Name = "textEdit4";
+            this.textEdit4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit4.Properties.Appearance.Options.UseFont = true;
+            this.textEdit4.Size = new System.Drawing.Size(155, 28);
+            this.textEdit4.TabIndex = 220;
             // 
             // XtraForm1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1057, 660);
-            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.xtraTabControl1);
             this.Name = "XtraForm1";
             this.Text = "XtraForm1";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-            this.tabControl1.ResumeLayout(false);
-            this.tabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            this.xtraTabPage1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            this.tabPage2.ResumeLayout(false);
+            this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
             this.splitContainerControl1.Panel1.ResumeLayout(false);
-            this.splitContainerControl1.Panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
             this.splitContainerControl1.ResumeLayout(false);
@@ -908,19 +862,17 @@
             this.panelControl1.ResumeLayout(false);
             this.panelControl1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
-            this.dockPanel1.ResumeLayout(false);
-            this.dockPanel2.ResumeLayout(false);
+            this.panel1.ResumeLayout(false);
+            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
 
-        private System.Windows.Forms.TabControl tabControl1;
-        private System.Windows.Forms.TabPage tabPage1;
-        private System.Windows.Forms.TabPage tabPage2;
-        private System.Windows.Forms.TabPage tabPage3;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_id;
@@ -960,18 +912,18 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrgId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_receiveId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_receiveContact;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
-        private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraEditors.PanelControl panelControl2;
         private DevExpress.XtraEditors.LabelControl labelControl3;
         private DevExpress.XtraEditors.TextEdit textEdit2;
         private DevExpress.XtraEditors.PanelControl panelControl1;
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private DevExpress.XtraEditors.TextEdit textEdit1;
-        private DevExpress.XtraBars.Docking.DockManager dockManager1;
-        private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
-        private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
-        private DevExpress.XtraBars.Docking.DockPanel dockPanel2;
-        private DevExpress.XtraBars.Docking.ControlContainer dockPanel2_Container;
+        private System.Windows.Forms.ToolStrip toolStrip1;
+        private System.Windows.Forms.ToolTip toolTip1;
+        private System.Windows.Forms.Panel panel1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.TextEdit textEdit4;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
index ddd3a07..a43388d 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.cs
@@ -19,13 +19,17 @@
         public XtraForm1()
         {
             InitializeComponent();
-           // this.xtraTabControl1.CustomHeaderButtonClick += new DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventHandler(this.xtraTabControl1_CustomHeaderButtonClick);
-            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1, labelControl2);
+           
+            _drapHelp = new DragResizeHelp(this, splitContainerControl1.Panel1);
+            this.xtraTabControl1.CustomHeaderButtonClick += XtraTabControl1_CustomHeaderButtonClick;
         }
 
-        private void xtraTabControl1_CustomHeaderButtonClick(object sender, DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventArgs e)
+        private void XtraTabControl1_CustomHeaderButtonClick(object sender, DevExpress.XtraTab.ViewInfo.CustomHeaderButtonEventArgs e)
         {
             _drapHelp.Show();
         }
+
+     
+    
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
index 8eb0253..468543d 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.resx
@@ -117,7 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>139, 17</value>
+  </metadata>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 331435c..24bbe0e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -725,6 +725,12 @@
     <Compile Include="ToolBox\DragResizeHelp.cs" />
     <Compile Include="ToolBox\LogHelper.cs" />
     <Compile Include="ToolBox\MsgHelper.cs" />
+    <Compile Include="ToolBox\SetDrag.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ToolBox\SetDrag.Designer.cs">
+      <DependentUpon>SetDrag.cs</DependentUpon>
+    </Compile>
     <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
     <Compile Include="ToolBox\UtilityHelper.cs" />
     <Compile Include="UserControl\SelectCgMx.cs">
@@ -1229,6 +1235,9 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="ToolBox\SetDrag.resx">
+      <DependentUpon>SetDrag.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="UserControl\SelectCgMx.resx">
       <DependentUpon>SelectCgMx.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
index 3e9f1f1..f622ba7 100644
--- a/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
+++ b/DevApp/Gs.DevApp/ToolBox/DragResizeHelp.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing DevExpress.XtraBars.Docking;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 
@@ -13,14 +14,14 @@
         private const int MinHeight = 30;
         private EnumMousePointPosition m_MousePointPosition;
         private Point p, p1;
-        private DevExpress.XtraEditors.LabelControl sbMsg;
         private Control dragBox1;//瀹瑰櫒1
-        private string dragCurrent_Name = "";//褰撳墠瀹瑰櫒鐨勫悕绉�
-
+        private string dragBoxCurrentName = "";//褰撳墠瀹瑰櫒鐨勫悕绉�
+        private Control ctrlCurrentObj;//褰撳墠鎷栨嫋鍔ㄧ殑瀵瑰儚
         private DevExpress.XtraBars.Docking.DockManager dockManager1;
         private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
         private DevExpress.XtraBars.Docking.ControlContainer dockPanel1_Container;
         private System.ComponentModel.IContainer components = null;
+        private ToolTip toolTip;
         #endregion
         #region Inner Object
         private enum EnumMousePointPosition
@@ -37,11 +38,11 @@
             MouseDrag = 9   // '榧犳爣鎷栧姩
         }
         #endregion
-        public DragResizeHelp(DevExpress.XtraEditors.XtraForm frm, Control regBox, DevExpress.XtraEditors.LabelControl regMsg)
+        public DragResizeHelp(DevExpress.XtraEditors.XtraForm frm, Control regBox)
         {
+            toolTip = new ToolTip();
             this.components = new System.ComponentModel.Container();
             dragBox1 = regBox;
-            sbMsg = regMsg;
             this.components = new System.ComponentModel.Container();
             this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
             dockManager1.BeginUpdate();
@@ -81,7 +82,7 @@
             this.dockPanel1.Name = "dockPanel1";
             this.dockPanel1.OriginalSize = new System.Drawing.Size(200, 200);
             this.dockPanel1.Size = new System.Drawing.Size(306, 459);
-            this.dockPanel1.Text = "dockPanel1";
+            this.dockPanel1.Text = "缁勪欢绠�";
             dockPanel1.Options.AllowDockBottom = false;
             dockPanel1.Options.AllowDockFill = false;
             dockPanel1.Options.AllowDockLeft = false;
@@ -103,7 +104,7 @@
             frm.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             frm.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             frm.ClientSize = new System.Drawing.Size(1057, 660);
-           
+
             ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
             this.dockPanel1.ResumeLayout(false);
             frm.ResumeLayout(false);
@@ -117,7 +118,6 @@
                 {
                     if (control != null)
                     {
-
                         control.MouseDown -= new MouseEventHandler(control_MouseDown);
                         control.MouseLeave -= new EventHandler(control_MouseLeave);
                         control.MouseMove -= new MouseEventHandler(control_MouseMove);
@@ -129,19 +129,25 @@
         }
         public void Show()
         {
+            if (dockPanel1.Visibility == DockVisibility.Visible)
+                return;
             foreach (Control control in dragBox1.Controls)
             {
                 if (control != null)
                 {
-                    dragCurrent_Name = dragBox1.Name;
+                    dragBoxCurrentName = dragBox1.Name;
                     control.MouseDown += new MouseEventHandler(control_MouseDown);
                     control.MouseLeave += new EventHandler(control_MouseLeave);
                     control.MouseMove += new MouseEventHandler(control_MouseMove);
                     control.MouseUp += Control_MouseUp;
                     control.Resize += myPanel_Resize;
+                    control.ContextMenuStrip = new ContextMenuStrip();
+
                 }
             }
             dockPanel1.Show();
+            isDragging = true;
+           
         }
         public void Hide(Control control)
         {
@@ -150,16 +156,20 @@
                 control.MouseDown -= new MouseEventHandler(control_MouseDown);
                 control.MouseLeave -= new EventHandler(control_MouseLeave);
                 control.MouseMove -= new MouseEventHandler(control_MouseMove);
+                control.MouseUp -= Control_MouseUp;
+                control.Resize -= myPanel_Resize;
             }
             dockPanel1.Hide();
+            isDragging = false;
         }
         #region Public Method
         private void Control_MouseUp(object sender, MouseEventArgs e)
         {
             Control lCtrl = (sender as Control);
+            ctrlCurrentObj = lCtrl;
             (sender as Control).Refresh();
-            dragCurrent_Name = (sender as Control).Parent.Name;
-            if (dragBox1.Name == dragCurrent_Name)
+            dragBoxCurrentName = (sender as Control).Parent.Name;
+            if (dragBox1.Name == dragBoxCurrentName)
             {
                 if (IsOutsideBounds(lCtrl, dragBox1))
                 {
@@ -168,11 +178,11 @@
                     lCtrl.Left = 0;
                     lCtrl.Top = 10;
                     //   isDragging = false;
-                    dragCurrent_Name = dockPanel1_Container.Name;
+                    dragBoxCurrentName = dockPanel1_Container.Name;
                 }
                 reloadLoaction(null);
             }
-            else if (dockPanel1_Container.Name == dragCurrent_Name)
+            else if (dockPanel1_Container.Name == dragBoxCurrentName)
             {
                 if (IsOutsideBounds(lCtrl, dockPanel1_Container))
                 {
@@ -181,7 +191,7 @@
                     lCtrl.Left = 0;
                     lCtrl.Top = 10;
                     // isDragging = false;
-                    dragCurrent_Name = dragBox1.Name;
+                    dragBoxCurrentName = dragBox1.Name;
                 }
                 reloadLoaction(lCtrl);
             }
@@ -194,7 +204,34 @@
             p1.X = e.X;
             p1.Y = e.Y;
             isDragging = true;
-            dragCurrent_Name = (sender as Control).Parent.Name;
+            dragBoxCurrentName = (sender as Control).Parent.Name;
+            ctrlCurrentObj = (sender as Control);
+
+            if (e.Button == MouseButtons.Right)
+            {
+                Control control = (sender as Control);
+                var menu = control.ContextMenuStrip;
+                menu.Items.Clear();
+                SetDrag frm = new SetDrag();
+                menu.Items.Add($"璁剧疆鍧愭爣", null, (ss, ee) =>
+                {
+                    frm.ShowDialog();
+                });
+                menu.Items.Add($"璁剧疆澶у皬", null, (ss, ee) =>
+                {
+                    frm.ShowDialog();
+                });
+                menu.Items.Add($"楂樼骇璁剧疆", null, (ss, ee) =>
+                {
+                    frm.ShowDialog();
+                });
+                menu.Items.Add($"涓�閿噸鎺�", null, (ss, ee) =>
+                {
+                    frm.ShowDialog();
+                });
+                menu.Show(control, e.Location);
+            }
+
         }
         private void myPanel_Resize(object sender, EventArgs e)
         {
@@ -216,11 +253,13 @@
             m_MousePointPosition = EnumMousePointPosition.MouseSizeNone;
             Control control = sender as Control;
             control.Cursor = Cursors.Arrow;
+            ctrlCurrentObj = control;
         }
         private void control_MouseMove(object sender, MouseEventArgs e)
         {
             if (!isDragging) { return; }
             Control lCtrl = (sender as Control);
+            ctrlCurrentObj = lCtrl;
             if (e.Button == MouseButtons.Left)
             {
                 switch (m_MousePointPosition)
@@ -331,6 +370,8 @@
             }
             //  reloadLoaction();
             reloadMsg(lCtrl);
+ 
+           
         }
         private EnumMousePointPosition MousePointPosition(Size size, System.Windows.Forms.MouseEventArgs e)
         {
@@ -435,7 +476,7 @@
         private void reloadLoaction(Control cocccc)
         {
             int _top = 0;
-            if (dockPanel1_Container.Name == dragCurrent_Name)
+            if (dockPanel1_Container.Name == dragBoxCurrentName)
             {
                 foreach (Control col in dockPanel1_Container.Controls)
                 {
@@ -466,9 +507,15 @@
             return;
         }
 
-        private void reloadMsg(Control cocccc) {
-
-            sbMsg.Text = "鍧愭爣:" + cocccc.Location.ToString() + ",澶у皬锛�" + cocccc.Size.ToString();
+        private void reloadMsg(Control cocccc)
+        {
+            System.Text.StringBuilder sb = new System.Text.StringBuilder();
+            if (ctrlCurrentObj != null)
+                sb.Append(ctrlCurrentObj.Name + "鍦�");
+            sb.Append(string.IsNullOrEmpty(dragBoxCurrentName) ? "琛ㄥ崟涓�" : "缁勪欢绠变腑");
+            sb.Append("锛屽潗鏍�:" + cocccc.Location.ToString());
+            sb.Append(",澶у皬锛�" + cocccc.Size.ToString());
+            toolTip.SetToolTip(ctrlCurrentObj, sb.ToString());
         }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/SetDrag.Designer.cs b/DevApp/Gs.DevApp/ToolBox/SetDrag.Designer.cs
new file mode 100644
index 0000000..4e56975
--- /dev/null
+++ b/DevApp/Gs.DevApp/ToolBox/SetDrag.Designer.cs
@@ -0,0 +1,194 @@
+锘縩amespace Gs.DevApp.ToolBox
+{
+    partial class SetDrag
+    {
+        /// <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()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SetDrag));
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
+            this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
+            this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
+            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(58, 23);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(54, 18);
+            this.labelControl1.TabIndex = 0;
+            this.labelControl1.Text = "X鍧愭爣锛�";
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Location = new System.Drawing.Point(57, 53);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(55, 18);
+            this.labelControl2.TabIndex = 1;
+            this.labelControl2.Text = "Y鍧愭爣锛�";
+            // 
+            // labelControl3
+            // 
+            this.labelControl3.Location = new System.Drawing.Point(68, 84);
+            this.labelControl3.Name = "labelControl3";
+            this.labelControl3.Size = new System.Drawing.Size(44, 18);
+            this.labelControl3.TabIndex = 2;
+            this.labelControl3.Text = "W闀匡細";
+            // 
+            // labelControl4
+            // 
+            this.labelControl4.Location = new System.Drawing.Point(72, 114);
+            this.labelControl4.Name = "labelControl4";
+            this.labelControl4.Size = new System.Drawing.Size(40, 18);
+            this.labelControl4.TabIndex = 3;
+            this.labelControl4.Text = "H楂橈細";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(116, 20);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Size = new System.Drawing.Size(125, 24);
+            this.textEdit1.TabIndex = 4;
+            // 
+            // textEdit2
+            // 
+            this.textEdit2.Location = new System.Drawing.Point(116, 50);
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.Size = new System.Drawing.Size(125, 24);
+            this.textEdit2.TabIndex = 5;
+            // 
+            // textEdit3
+            // 
+            this.textEdit3.Location = new System.Drawing.Point(116, 81);
+            this.textEdit3.Name = "textEdit3";
+            this.textEdit3.Size = new System.Drawing.Size(125, 24);
+            this.textEdit3.TabIndex = 6;
+            // 
+            // textEdit4
+            // 
+            this.textEdit4.Location = new System.Drawing.Point(116, 111);
+            this.textEdit4.Name = "textEdit4";
+            this.textEdit4.Size = new System.Drawing.Size(125, 24);
+            this.textEdit4.TabIndex = 7;
+            // 
+            // radioGroup1
+            // 
+            this.radioGroup1.Location = new System.Drawing.Point(115, 141);
+            this.radioGroup1.Name = "radioGroup1";
+            this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鏄剧ず"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "绉诲嚭")});
+            this.radioGroup1.Size = new System.Drawing.Size(126, 33);
+            this.radioGroup1.TabIndex = 8;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnCancel.Appearance.Options.UseFont = true;
+            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
+            this.btnCancel.Location = new System.Drawing.Point(154, 200);
+            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(87, 37);
+            this.btnCancel.TabIndex = 240;
+            this.btnCancel.Text = "鍙栨秷 (&C)";
+            // 
+            // btnSave
+            // 
+            this.btnSave.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.btnSave.Appearance.Options.UseFont = true;
+            this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
+            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
+            this.btnSave.Location = new System.Drawing.Point(33, 200);
+            this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.btnSave.Name = "btnSave";
+            this.btnSave.Size = new System.Drawing.Size(87, 37);
+            this.btnSave.TabIndex = 239;
+            this.btnSave.Text = "纭畾 (&L)";
+            // 
+            // SetDrag
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(291, 267);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.btnSave);
+            this.Controls.Add(this.radioGroup1);
+            this.Controls.Add(this.textEdit4);
+            this.Controls.Add(this.textEdit3);
+            this.Controls.Add(this.textEdit2);
+            this.Controls.Add(this.textEdit1);
+            this.Controls.Add(this.labelControl4);
+            this.Controls.Add(this.labelControl3);
+            this.Controls.Add(this.labelControl2);
+            this.Controls.Add(this.labelControl1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "SetDrag";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "璁剧疆鍧愭爣";
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.LabelControl labelControl3;
+        private DevExpress.XtraEditors.LabelControl labelControl4;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.TextEdit textEdit2;
+        private DevExpress.XtraEditors.TextEdit textEdit3;
+        private DevExpress.XtraEditors.TextEdit textEdit4;
+        private DevExpress.XtraEditors.RadioGroup radioGroup1;
+        private DevExpress.XtraEditors.SimpleButton btnCancel;
+        private DevExpress.XtraEditors.SimpleButton btnSave;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/SetDrag.cs b/DevApp/Gs.DevApp/ToolBox/SetDrag.cs
new file mode 100644
index 0000000..caa1d1c
--- /dev/null
+++ b/DevApp/Gs.DevApp/ToolBox/SetDrag.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.ToolBox
+{
+    public partial class SetDrag : DevExpress.XtraEditors.XtraForm
+    {
+        public SetDrag()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/SetDrag.resx b/DevApp/Gs.DevApp/ToolBox/SetDrag.resx
new file mode 100644
index 0000000..c0dfd5d
--- /dev/null
+++ b/DevApp/Gs.DevApp/ToolBox/SetDrag.resx
@@ -0,0 +1,140 @@
+锘�<?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>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
+        bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE
+        tP1LHGl1WoZVg2+DYrqYZrYys6/cPvVibk38teBUkkUFNcbYuGyFCXYuyxYcMYSyPlSi4fY9m+KMsECW
+        aEF5D2m4gzUeZ6MC8SXZYflU4K8taZ2nc1GBH+4i3eStJFdwwABpWNf268xwQVggW4zgd1aJnnbvsrBA
+        9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="btnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
+        bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq
+        PRWJJaktgFLUOjsQ0egURKEgaj/NOEfuyJl5E4/iy8y5c7+Tyc6LruI0O+cKUbEVnUkhxhd4ycOcDUdL
+        cgVjULKcK1AxyCbwJBPLuYKiH/iCm+VkgZf0VJlcKJNUgRZ9sshkRpkEBRr8AmiCJ/Ay75z9XED64GQM
+        bPZGnSDYAsUjqFgmZXAAPWZ1goDHBngAfnsDqqAGtjbjW12duGBui9+YqhMXnKPlFCd14oJ9tJxip05c
+        0AFrcLdlhbMVaKsTFPyPy16LX4vunIH/egAAAABJRU5ErkJggg==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 54f32a5..0f3d47a 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -641,7 +641,17 @@
                                 txt.Enabled = false;
                             continue;
                         }
-
+                        //鑷畾閿�鍞�
+                        if (colType is UcLookSales)
+                        {
+                            var txt = colType as UcLookSales;
+                            txt.SetIdOrCode(strVal);
+                            if (txt.IsReadly == false)
+                                txt.Enabled = !isEdt;
+                            else
+                                txt.Enabled = false;
+                            continue;
+                        }
                         if (colType is SimpleButton)
                         {
                             var txt = colType as SimpleButton;
@@ -909,7 +919,14 @@
                     txt.Enabled = !isEdt;
                     continue;
                 }
-
+                //鑷畾閿�鍞�
+                if (ctrl is UcLookSales)
+                {
+                    var txt = ctrl as UcLookSales;
+                    txt.SetIdOrCode("-1");
+                    txt.Enabled = !isEdt;
+                    continue;
+                }
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;
@@ -1161,6 +1178,16 @@
                         txt.Enabled = false;
                     continue;
                 }
+                //鑷畾閿�鍞�
+                if (ctrl is UcLookSales)
+                {
+                    var txt = ctrl as UcLookSales;
+                    if (txt.IsReadly == false)
+                        txt.Enabled = !isEdt;
+                    else
+                        txt.Enabled = false;
+                    continue;
+                }
                 if (ctrl is SimpleButton)
                 {
                     var txt = ctrl as SimpleButton;

--
Gitblit v1.9.3