From 9b7bc5872818f11125dda5b07da1762ec31db9e7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 06:32:43 +0800
Subject: [PATCH] 销售无源单

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs                               |    5 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs                    |  267 ++
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs              |  108 +
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs          |  293 +--
 DevApp/Gs.DevApp/Gs.DevApp.csproj                                         |   15 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs |  221 +++
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs                  |   12 
 DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json                       |    2 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs                |  622 ++++----
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs                         |   13 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs          |  115 +
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs                  |  863 ++++++------
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs           |  830 +++++------
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.resx            |  120 +
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs                                 |    6 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs     |  372 +++++
 DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs                        |  330 ++-
 17 files changed, 2,602 insertions(+), 1,592 deletions(-)

diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
index 82166e0..8331f88 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:\\git_qs\\GsMesClient\\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_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemsShow.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemsShow.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.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\\BasicData\\Frm_SupplierSrm.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_SupplierSrm.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesSctkSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesSctkSq.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\\Frm_MesSctkSqDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesSctkSqDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesYanTui.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesYanTui.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\SelectSctk.cs"},{"SourceFile":"DevFrm\\Ck\\SelectSctk.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\\Ck\\UcBlclSelect.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclSelect.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_Fqc.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_Fqc.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_FqcDetect01.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_FqcDetect01.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\MesFqcExceptional.cs"},{"SourceFile":"DevFrm\\FQC\\MesFqcExceptional.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcBox.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcBox.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcDaa.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcDaa.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\UcChouJianList.cs"},{"SourceFile":"DevFrm\\FQC\\UcChouJianList.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01H5.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01H5.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01Show.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01Show.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJian.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJian.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJian.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJian.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesAttanCon.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesAttanCon.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesDeToLine.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesDeToLine.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MESJJERRORJS.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MESJJERRORJS.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJjgzSchedule.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJjgzSchedule.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJJSalary.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJJSalary.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJSSalary.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJSSalary.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesTimeType.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesTimeType.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\KQCX.cs"},{"SourceFile":"DevFrm\\JJGZ\\KQCX.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\SelectSTAFF.cs"},{"SourceFile":"DevFrm\\JJGZ\\SelectSTAFF.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\SetLB.cs"},{"SourceFile":"DevFrm\\JJGZ\\SetLB.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_AreaBind.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_AreaBind.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_UserBind.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_UserBind.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectCk.cs"},{"SourceFile":"DevFrm\\PDA\\SelectCk.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectItem.cs"},{"SourceFile":"DevFrm\\PDA\\SelectItem.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPage.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPage.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectUser.cs"},{"SourceFile":"DevFrm\\PDA\\SelectUser.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCode.cs"},{"SourceFile":"DevFrm\\QC\\DefectCode.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeCk.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeCk.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeQc.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeQc.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeRk.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeRk.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeDaa.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeDaa.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeShouJian.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeShouJian.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeXianChang.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeXianChang.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCodeShow.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCodeShow.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Input.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Input.Designer.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShowCopy.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShowCopy.Designer.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShow.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShow.Designer.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptionalShow.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptionalShow.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\\Jyxm.cs"},{"SourceFile":"DevFrm\\QC\\Jyxm.Designer.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptional.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptional.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesDefectCode.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\\QC\\Xls.cs"},{"SourceFile":"DevFrm\\QC\\Xls.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqfa.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqfa.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqfaItems.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqfaItems.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqsq.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqsq.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_QtrkDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_QtrkDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_SctlDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_SctlDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_WwrkDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_WwrkDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_XsthDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_XsthDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\RkDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\RkDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\SelectCqsq.cs"},{"SourceFile":"DevFrm\\RkQC\\SelectCqsq.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\HistoryDhmxcs.cs"},{"SourceFile":"DevFrm\\Rk\\HistoryDhmxcs.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\Ckcgmx.cs"},{"SourceFile":"DevFrm\\Rpt\\Ckcgmx.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\CKTmkc.cs"},{"SourceFile":"DevFrm\\Rpt\\CKTmkc.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\CkYtmx.cs"},{"SourceFile":"DevFrm\\Rpt\\CkYtmx.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\Frm_MesQL.cs"},{"SourceFile":"DevFrm\\Rpt\\Frm_MesQL.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\QLCX.cs"},{"SourceFile":"DevFrm\\Rpt\\QLCX.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjh.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjh.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjhShow.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjhShow.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesDeliverDj.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesDeliverDj.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_SalesReturnNotice.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNotice.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNoticeDj.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNoticeDj.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdt.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdt.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdtShow.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdtShow.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_Config.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_Config.Designer.cs"},{"SourceFile":"DevFrm\\User\\ViewRole.cs"},{"SourceFile":"DevFrm\\User\\ViewRole.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTui.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTui.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_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\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.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\\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_MesShouTuoDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuoDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuo.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuo.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuiDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuiDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\WOM\\FrmBackFlash.cs"},{"SourceFile":"DevFrm\\WOM\\FrmBackFlash.Designer.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\\WOM\\Frm_WomdaaNbz.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_WomdaaNbz.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_WomFanGong.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_WomFanGong.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\ShowGx.cs"},{"SourceFile":"DevFrm\\WOM\\ShowGx.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\ShowJieAn.cs"},{"SourceFile":"DevFrm\\WOM\\ShowJieAn.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Repair.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Repair.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work01.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work01.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work09.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work09.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkProcesses.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkProcesses.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkStart.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkStart.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechnique.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechnique.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechniqueShow.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechniqueShow.Designer.cs"},{"SourceFile":"DevFrm\\WW\\showWwZhongTai.cs"},{"SourceFile":"DevFrm\\WW\\showWwZhongTai.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.Designer.cs"},{"SourceFile":"UserControl\\SelectDaa.cs"},{"SourceFile":"UserControl\\SelectDaa.Designer.cs"},{"SourceFile":"UserControl\\SelectDeleteBar.cs"},{"SourceFile":"UserControl\\SelectDeleteBar.Designer.cs"},{"SourceFile":"UserControl\\SelectMesCgthSqLink.cs"},{"SourceFile":"UserControl\\SelectMesCgthSqLink.Designer.cs"},{"SourceFile":"UserControl\\SelectSrm.cs"},{"SourceFile":"UserControl\\SelectSrm.Designer.cs"},{"SourceFile":"UserControl\\UcDictionaryComBox.cs"},{"SourceFile":"UserControl\\UcDictionaryComBox.Designer.cs"},{"SourceFile":"UserControl\\UcDictionarySelect.cs"},{"SourceFile":"UserControl\\UcDictionarySelect.Designer.cs"},{"SourceFile":"DevFrm\\Work\\SelectProcess.cs"},{"SourceFile":"DevFrm\\Work\\SelectProcess.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_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":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.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\\SelectCw.cs"},{"SourceFile":"UserControl\\SelectCw.Designer.cs"},{"SourceFile":"UserControl\\SelectFont.cs"},{"SourceFile":"UserControl\\SelectFont.Designer.cs"},{"SourceFile":"UserControl\\SelectHz.cs"},{"SourceFile":"UserControl\\SelectHz.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\SelectItemTbl.cs"},{"SourceFile":"DevFrm\\Rk\\SelectItemTbl.Designer.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.Designer.cs"},{"SourceFile":"UserControl\\SelectOrg.cs"},{"SourceFile":"UserControl\\SelectOrg.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\SelectShuoTuiSq.cs"},{"SourceFile":"DevFrm\\Warehouse\\SelectShuoTuiSq.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\SelectWompba.cs"},{"SourceFile":"DevFrm\\WOM\\SelectWompba.Designer.cs"},{"SourceFile":"DevFrm\\WW\\SelectWwPc.cs"},{"SourceFile":"DevFrm\\WW\\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":"DevFrm\\WOM\\showZhongTai.cs"},{"SourceFile":"DevFrm\\WOM\\showZhongTai.Designer.cs"},{"SourceFile":"UserControl\\UcBtnPrint.cs"},{"SourceFile":"UserControl\\UcBtnPrint.Designer.cs"},{"SourceFile":"UserControl\\UcDictionary.cs"},{"SourceFile":"UserControl\\UcDictionary.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\\UcLookDepartment.cs"},{"SourceFile":"UserControl\\UcLookDepartment.Designer.cs"},{"SourceFile":"UserControl\\UcLookGx.cs"},{"SourceFile":"UserControl\\UcLookGx.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":"UserControl\\Toast.cs"},{"SourceFile":"UserControl\\Toast.Designer.cs"},{"SourceFile":"UserControl\\UCUpFileList.cs"},{"SourceFile":"UserControl\\UCUpFileList.Designer.cs"},{"SourceFile":"XtraForm1.cs"},{"SourceFile":"XtraForm1.Designer.cs"},{"SourceFile":"XtraForm2.cs"},{"SourceFile":"XtraForm2.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Accessibility.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\DevApp\\packages\\CefSharp.Common.109.1.110\\lib\\net452\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\DevApp\\packages\\CefSharp.Common.109.1.110\\lib\\net452\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\DevApp\\packages\\CefSharp.WinForms.109.1.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataVisualization.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Spreadsheet.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraRichEdit.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraSpreadsheet.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeMap.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\DevApp\\packages\\NModbus.3.0.81\\lib\\net46\\NModbus.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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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.Data.Linq.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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.Formatters.Soap.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"F:\\git_qs\\GsMesClient\\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_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemsShow.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemsShow.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.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\\BasicData\\Frm_SupplierSrm.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_SupplierSrm.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesSctkSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesSctkSq.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\\Frm_MesSctkSqDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesSctkSqDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesYanTui.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesYanTui.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\SelectSctk.cs"},{"SourceFile":"DevFrm\\Ck\\SelectSctk.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\\Ck\\UcBlclSelect.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclSelect.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_Fqc.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_Fqc.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_FqcDetect01.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_FqcDetect01.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\MesFqcExceptional.cs"},{"SourceFile":"DevFrm\\FQC\\MesFqcExceptional.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcBox.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcBox.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcDaa.cs"},{"SourceFile":"DevFrm\\FQC\\SelectFqcDaa.Designer.cs"},{"SourceFile":"DevFrm\\FQC\\UcChouJianList.cs"},{"SourceFile":"DevFrm\\FQC\\UcChouJianList.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01H5.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01H5.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01Show.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01Show.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJian.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJian.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_ShouJianDetect01.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJian.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJian.Designer.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01.cs"},{"SourceFile":"DevFrm\\IPQC\\Frm_XunJianDetect01.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesAttanCon.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesAttanCon.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesDeToLine.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesDeToLine.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MESJJERRORJS.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MESJJERRORJS.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJjgzSchedule.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJjgzSchedule.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJJSalary.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJJSalary.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJSSalary.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesJSSalary.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesTimeType.cs"},{"SourceFile":"DevFrm\\JJGZ\\Frm_MesTimeType.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\KQCX.cs"},{"SourceFile":"DevFrm\\JJGZ\\KQCX.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\SelectSTAFF.cs"},{"SourceFile":"DevFrm\\JJGZ\\SelectSTAFF.Designer.cs"},{"SourceFile":"DevFrm\\JJGZ\\SetLB.cs"},{"SourceFile":"DevFrm\\JJGZ\\SetLB.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_AreaBind.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_AreaBind.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_UserBind.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_UserBind.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectCk.cs"},{"SourceFile":"DevFrm\\PDA\\SelectCk.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectItem.cs"},{"SourceFile":"DevFrm\\PDA\\SelectItem.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPage.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPage.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectUser.cs"},{"SourceFile":"DevFrm\\PDA\\SelectUser.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCode.cs"},{"SourceFile":"DevFrm\\QC\\DefectCode.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeCk.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeCk.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeQc.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeQc.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeRk.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeRk.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeDaa.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeDaa.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeShouJian.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeShouJian.Designer.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeXianChang.cs"},{"SourceFile":"DevFrm\\QC\\DefectCodeXianChang.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCodeShow.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCodeShow.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Input.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Input.Designer.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShowCopy.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShowCopy.Designer.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShow.cs"},{"SourceFile":"DevFrm\\QC\\JyxmShow.Designer.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptionalShow.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptionalShow.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\\Jyxm.cs"},{"SourceFile":"DevFrm\\QC\\Jyxm.Designer.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptional.cs"},{"SourceFile":"DevFrm\\QC\\MesQcExceptional.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesDefectCode.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\\QC\\Xls.cs"},{"SourceFile":"DevFrm\\QC\\Xls.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqfa.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqfa.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqfaItems.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_CqfaItems.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqsq.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_Cqsq.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_QtrkDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_QtrkDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_ShouTuoDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_ShouTuoDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_WwrkDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\Frm_WwrkDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\RkDetect01.cs"},{"SourceFile":"DevFrm\\RkQC\\RkDetect01.Designer.cs"},{"SourceFile":"DevFrm\\RkQC\\SelectCqsq.cs"},{"SourceFile":"DevFrm\\RkQC\\SelectCqsq.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemIns.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemQtrkDj.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\HistoryDhmxcs.cs"},{"SourceFile":"DevFrm\\Rk\\HistoryDhmxcs.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\Ckcgmx.cs"},{"SourceFile":"DevFrm\\Rpt\\Ckcgmx.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\CKTmkc.cs"},{"SourceFile":"DevFrm\\Rpt\\CKTmkc.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\CkYtmx.cs"},{"SourceFile":"DevFrm\\Rpt\\CkYtmx.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\Frm_MesQL.cs"},{"SourceFile":"DevFrm\\Rpt\\Frm_MesQL.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\QLCX.cs"},{"SourceFile":"DevFrm\\Rpt\\QLCX.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjh.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjh.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjhShow.cs"},{"SourceFile":"DevFrm\\Rpt\\WomShjhShow.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesDeliverDj.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesDeliverDj.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_SalesReturnNotice.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNotice.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNoticeDj.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNoticeDj.Designer.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNoticeSelect.cs"},{"SourceFile":"DevFrm\\Sales\\Frm_SalesReturnNoticeSelect.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdt.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdt.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdtShow.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptEdtShow.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_Config.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_Config.Designer.cs"},{"SourceFile":"DevFrm\\User\\ViewRole.cs"},{"SourceFile":"DevFrm\\User\\ViewRole.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTui.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTui.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_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\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.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\\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_MesShouTuoDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuoDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuo.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuo.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuiDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesShouTuiDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\WOM\\FrmBackFlash.cs"},{"SourceFile":"DevFrm\\WOM\\FrmBackFlash.Designer.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\\WOM\\Frm_WomdaaNbz.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_WomdaaNbz.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_WomFanGong.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_WomFanGong.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\ShowGx.cs"},{"SourceFile":"DevFrm\\WOM\\ShowGx.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\ShowJieAn.cs"},{"SourceFile":"DevFrm\\WOM\\ShowJieAn.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Repair.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Repair.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work01.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work01.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work09.cs"},{"SourceFile":"DevFrm\\Work\\Frm_Work09.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkProcesses.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkProcesses.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkStart.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkStart.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechnique.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechnique.Designer.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechniqueShow.cs"},{"SourceFile":"DevFrm\\Work\\Frm_WorkTechniqueShow.Designer.cs"},{"SourceFile":"DevFrm\\WW\\showWwZhongTai.cs"},{"SourceFile":"DevFrm\\WW\\showWwZhongTai.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.Designer.cs"},{"SourceFile":"UserControl\\SelectDaa.cs"},{"SourceFile":"UserControl\\SelectDaa.Designer.cs"},{"SourceFile":"UserControl\\SelectDeleteBar.cs"},{"SourceFile":"UserControl\\SelectDeleteBar.Designer.cs"},{"SourceFile":"UserControl\\SelectMesCgthSqLink.cs"},{"SourceFile":"UserControl\\SelectMesCgthSqLink.Designer.cs"},{"SourceFile":"UserControl\\SelectSrm.cs"},{"SourceFile":"UserControl\\SelectSrm.Designer.cs"},{"SourceFile":"UserControl\\UcDictionaryComBox.cs"},{"SourceFile":"UserControl\\UcDictionaryComBox.Designer.cs"},{"SourceFile":"UserControl\\UcDictionarySelect.cs"},{"SourceFile":"UserControl\\UcDictionarySelect.Designer.cs"},{"SourceFile":"DevFrm\\Work\\SelectProcess.cs"},{"SourceFile":"DevFrm\\Work\\SelectProcess.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_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":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.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\\SelectCw.cs"},{"SourceFile":"UserControl\\SelectCw.Designer.cs"},{"SourceFile":"UserControl\\SelectFont.cs"},{"SourceFile":"UserControl\\SelectFont.Designer.cs"},{"SourceFile":"UserControl\\SelectHz.cs"},{"SourceFile":"UserControl\\SelectHz.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\SelectItemTbl.cs"},{"SourceFile":"DevFrm\\Rk\\SelectItemTbl.Designer.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.cs"},{"SourceFile":"UserControl\\SelectMesCgthSq.Designer.cs"},{"SourceFile":"UserControl\\SelectOrg.cs"},{"SourceFile":"UserControl\\SelectOrg.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\SelectShuoTuiSq.cs"},{"SourceFile":"DevFrm\\Warehouse\\SelectShuoTuiSq.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\SelectWompba.cs"},{"SourceFile":"DevFrm\\WOM\\SelectWompba.Designer.cs"},{"SourceFile":"DevFrm\\WW\\SelectWwPc.cs"},{"SourceFile":"DevFrm\\WW\\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":"DevFrm\\WOM\\showZhongTai.cs"},{"SourceFile":"DevFrm\\WOM\\showZhongTai.Designer.cs"},{"SourceFile":"UserControl\\UcBtnPrint.cs"},{"SourceFile":"UserControl\\UcBtnPrint.Designer.cs"},{"SourceFile":"UserControl\\UcDictionary.cs"},{"SourceFile":"UserControl\\UcDictionary.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\\UcLookDepartment.cs"},{"SourceFile":"UserControl\\UcLookDepartment.Designer.cs"},{"SourceFile":"UserControl\\UcLookGx.cs"},{"SourceFile":"UserControl\\UcLookGx.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":"UserControl\\Toast.cs"},{"SourceFile":"UserControl\\Toast.Designer.cs"},{"SourceFile":"UserControl\\UCUpFileList.cs"},{"SourceFile":"UserControl\\UCUpFileList.Designer.cs"},{"SourceFile":"XtraForm1.cs"},{"SourceFile":"XtraForm1.Designer.cs"},{"SourceFile":"XtraForm2.cs"},{"SourceFile":"XtraForm2.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Accessibility.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\DevApp\\packages\\CefSharp.Common.109.1.110\\lib\\net452\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\DevApp\\packages\\CefSharp.Common.109.1.110\\lib\\net452\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\DevApp\\packages\\CefSharp.WinForms.109.1.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataVisualization.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Spreadsheet.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraRichEdit.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraSpreadsheet.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeMap.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\solftInstall\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\DevApp\\packages\\NModbus.3.0.81\\lib\\net46\\NModbus.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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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.Data.Linq.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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.Formatters.Soap.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Transactions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\git_qs\\GsMesClient\\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:\\git_qs\\GsMesClient\\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/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 5d449b8..30a2823 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -150,10 +150,7 @@
             };
             //婧愬崟浜嬩欢
             txt_fHasLinkRad.SelectedIndex = 0;
-            layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            //layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            setSrm();
             txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
             {
                 setSrm();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index c887aa3..0283eae 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -1169,7 +1169,7 @@
             this.gvMx1subQty.OptionsColumn.ReadOnly = true;
             this.gvMx1subQty.Tag = "query_a.sub_qty";
             this.gvMx1subQty.Visible = true;
-            this.gvMx1subQty.VisibleIndex = 11;
+            this.gvMx1subQty.VisibleIndex = 8;
             this.gvMx1subQty.Width = 64;
             // 
             // gvMx1quantity
@@ -1185,7 +1185,7 @@
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "yz_quantity_0_edit";
             this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 12;
+            this.gvMx1quantity.VisibleIndex = 9;
             this.gvMx1quantity.Width = 64;
             // 
             // gvMx1memo
@@ -1202,7 +1202,7 @@
             this.gvMx1memo.OptionsColumn.ReadOnly = true;
             this.gvMx1memo.Tag = "edit";
             this.gvMx1memo.Visible = true;
-            this.gvMx1memo.VisibleIndex = 13;
+            this.gvMx1memo.VisibleIndex = 10;
             this.gvMx1memo.Width = 110;
             // 
             // gvMx1okRkqty
@@ -1215,7 +1215,7 @@
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
-            this.gvMx1okRkqty.VisibleIndex = 8;
+            this.gvMx1okRkqty.VisibleIndex = 11;
             this.gvMx1okRkqty.Width = 64;
             // 
             // gvMx1checkDate
@@ -1402,7 +1402,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 9;
+            this.gridColumn19.VisibleIndex = 12;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn20
@@ -1412,7 +1412,7 @@
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 10;
+            this.gridColumn20.VisibleIndex = 13;
             this.gridColumn20.Width = 94;
             // 
             // picCheckBox
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 166624b..5f7eb43 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -66,6 +66,9 @@
             this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -87,21 +90,30 @@
             this.txt_shf = new DevExpress.XtraEditors.TextEdit();
             this.txt_shName = new DevExpress.XtraEditors.TextEdit();
             this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_qt031 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -152,16 +164,6 @@
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_qt031 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -196,21 +198,30 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -222,15 +233,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -244,7 +246,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1362, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -255,7 +257,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1362, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -265,7 +267,7 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1360, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -286,7 +288,7 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.Size = new System.Drawing.Size(1360, 570);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
@@ -296,7 +298,7 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1360, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -321,7 +323,9 @@
             this.gridColumn34,
             this.gridColumn35,
             this.gridColumn36,
-            this.gridColumn38});
+            this.gridColumn38,
+            this.gridColumn39,
+            this.gridColumn40});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -355,7 +359,7 @@
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
-            this.gv_billNo.Caption = "鍗曟嵁缂栧彿 ";
+            this.gv_billNo.Caption = "鐢宠鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
             this.gv_billNo.MinWidth = 50;
             this.gv_billNo.Name = "gv_billNo";
@@ -375,7 +379,7 @@
             this.gv_fBillTypeID.OptionsColumn.AllowEdit = false;
             this.gv_fBillTypeID.Tag = "query_a.FBillTypeID";
             this.gv_fBillTypeID.Visible = true;
-            this.gv_fBillTypeID.VisibleIndex = 4;
+            this.gv_fBillTypeID.VisibleIndex = 14;
             this.gv_fBillTypeID.Width = 94;
             // 
             // gv_fSaleOrgId
@@ -388,7 +392,7 @@
             this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false;
             this.gv_fSaleOrgId.Tag = "query_a.FSaleOrgId";
             this.gv_fSaleOrgId.Visible = true;
-            this.gv_fSaleOrgId.VisibleIndex = 5;
+            this.gv_fSaleOrgId.VisibleIndex = 15;
             this.gv_fSaleOrgId.Width = 94;
             // 
             // gv_fCreatorId
@@ -401,7 +405,7 @@
             this.gv_fCreatorId.OptionsColumn.AllowEdit = false;
             this.gv_fCreatorId.Tag = "query_a.FCreatorId";
             this.gv_fCreatorId.Visible = true;
-            this.gv_fCreatorId.VisibleIndex = 6;
+            this.gv_fCreatorId.VisibleIndex = 7;
             this.gv_fCreatorId.Width = 94;
             // 
             // gv_fApproverID
@@ -414,7 +418,7 @@
             this.gv_fApproverID.OptionsColumn.AllowEdit = false;
             this.gv_fApproverID.Tag = "query_a.FApproverID";
             this.gv_fApproverID.Visible = true;
-            this.gv_fApproverID.VisibleIndex = 7;
+            this.gv_fApproverID.VisibleIndex = 9;
             this.gv_fApproverID.Width = 94;
             // 
             // gv_fCreateDate
@@ -440,7 +444,7 @@
             this.gv_fApproveDate.OptionsColumn.AllowEdit = false;
             this.gv_fApproveDate.Tag = "query_a.FApproveDate";
             this.gv_fApproveDate.Visible = true;
-            this.gv_fApproveDate.VisibleIndex = 9;
+            this.gv_fApproveDate.VisibleIndex = 10;
             this.gv_fApproveDate.Width = 94;
             // 
             // gv_fSalesManID
@@ -475,7 +479,7 @@
             this.gv_fNote.OptionsColumn.AllowEdit = false;
             this.gv_fNote.Tag = "query_a.FNote";
             this.gv_fNote.Visible = true;
-            this.gv_fNote.VisibleIndex = 10;
+            this.gv_fNote.VisibleIndex = 11;
             this.gv_fNote.Width = 94;
             // 
             // gridColumn33
@@ -485,7 +489,7 @@
             this.gridColumn33.MinWidth = 25;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 11;
+            this.gridColumn33.VisibleIndex = 6;
             this.gridColumn33.Width = 94;
             // 
             // gridColumn34
@@ -495,7 +499,7 @@
             this.gridColumn34.MinWidth = 25;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 12;
+            this.gridColumn34.VisibleIndex = 5;
             this.gridColumn34.Width = 94;
             // 
             // gridColumn35
@@ -505,7 +509,7 @@
             this.gridColumn35.MinWidth = 25;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 13;
+            this.gridColumn35.VisibleIndex = 4;
             this.gridColumn35.Width = 94;
             // 
             // gridColumn36
@@ -516,6 +520,36 @@
             this.gridColumn36.Name = "gridColumn36";
             this.gridColumn36.Width = 94;
             // 
+            // gridColumn38
+            // 
+            this.gridColumn38.Caption = "璐㈠姟瀹℃牳";
+            this.gridColumn38.FieldName = "isCwChk";
+            this.gridColumn38.MinWidth = 25;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 1;
+            this.gridColumn38.Width = 94;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.Caption = "璐㈠姟瀹℃牳浜�";
+            this.gridColumn39.FieldName = "qt031";
+            this.gridColumn39.MinWidth = 25;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Visible = true;
+            this.gridColumn39.VisibleIndex = 12;
+            this.gridColumn39.Width = 94;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.Caption = "璐㈠姟瀹℃牳鏃ユ湡";
+            this.gridColumn40.FieldName = "qt030";
+            this.gridColumn40.MinWidth = 25;
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 13;
+            this.gridColumn40.Width = 94;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -524,7 +558,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1360, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -532,7 +566,7 @@
             // 
             this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1360, 570);
             this.xtraTabPage3.Text = "鏁版嵁璇︾粏";
             // 
             // splitContainerControl1
@@ -551,8 +585,8 @@
             // 
             this.splitContainerControl1.Panel2.Controls.Add(this.tabMx);
             this.splitContainerControl1.Panel2.Text = "Panel2";
-            this.splitContainerControl1.Size = new System.Drawing.Size(1126, 570);
-            this.splitContainerControl1.SplitterPosition = 167;
+            this.splitContainerControl1.Size = new System.Drawing.Size(1360, 570);
+            this.splitContainerControl1.SplitterPosition = 174;
             this.splitContainerControl1.TabIndex = 0;
             // 
             // layoutMx1
@@ -585,7 +619,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 472, 812, 500);
             this.layoutMx1.Root = this.layoutControlGroup1;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 167);
+            this.layoutMx1.Size = new System.Drawing.Size(1360, 174);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -599,10 +633,10 @@
             // 
             // txt_chkStatus
             // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(840, 70);
+            this.txt_chkStatus.Location = new System.Drawing.Point(682, 73);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
+            this.txt_chkStatus.Size = new System.Drawing.Size(331, 24);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 376;
             this.txt_chkStatus.Tag = "readonly";
@@ -622,7 +656,7 @@
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(229, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
@@ -630,23 +664,23 @@
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 41);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 42);
             this.txt_fBillTypeID.Name = "txt_fBillTypeID";
             this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 24);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(229, 24);
             this.txt_fBillTypeID.StyleController = this.layoutMx1;
             this.txt_fBillTypeID.TabIndex = 362;
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(942, 12);
+            this.txt_fApproverID.Location = new System.Drawing.Point(784, 12);
             this.txt_fApproverID.Name = "txt_fApproverID";
             this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproverID.Size = new System.Drawing.Size(172, 24);
+            this.txt_fApproverID.Size = new System.Drawing.Size(229, 24);
             this.txt_fApproverID.StyleController = this.layoutMx1;
             this.txt_fApproverID.TabIndex = 222;
             this.txt_fApproverID.Tag = "readonly";
@@ -654,107 +688,138 @@
             // txt_salesId
             // 
             this.txt_salesId.IsReadly = false;
-            this.txt_salesId.Location = new System.Drawing.Point(114, 70);
+            this.txt_salesId.Location = new System.Drawing.Point(114, 73);
             this.txt_salesId.Name = "txt_salesId";
-            this.txt_salesId.Size = new System.Drawing.Size(170, 24);
+            this.txt_salesId.Size = new System.Drawing.Size(229, 24);
             this.txt_salesId.TabIndex = 367;
             // 
             // txt_fSaleOrgIdTxt
             // 
-            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(390, 12);
+            this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(449, 12);
             this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
             this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(170, 24);
+            this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(229, 24);
             this.txt_fSaleOrgIdTxt.StyleController = this.layoutMx1;
             this.txt_fSaleOrgIdTxt.TabIndex = 365;
             this.txt_fSaleOrgIdTxt.Tag = "readonly";
             // 
             // txt_fCreatorId
             // 
-            this.txt_fCreatorId.Location = new System.Drawing.Point(666, 12);
+            this.txt_fCreatorId.Location = new System.Drawing.Point(784, 104);
             this.txt_fCreatorId.Name = "txt_fCreatorId";
             this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreatorId.Size = new System.Drawing.Size(170, 24);
+            this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
             this.txt_fCreatorId.StyleController = this.layoutMx1;
             this.txt_fCreatorId.TabIndex = 219;
             this.txt_fCreatorId.Tag = "readonly";
             // 
             // txt_fApproveDate
             // 
-            this.txt_fApproveDate.Location = new System.Drawing.Point(942, 41);
+            this.txt_fApproveDate.Location = new System.Drawing.Point(784, 42);
             this.txt_fApproveDate.Name = "txt_fApproveDate";
             this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fApproveDate.Size = new System.Drawing.Size(172, 24);
+            this.txt_fApproveDate.Size = new System.Drawing.Size(229, 24);
             this.txt_fApproveDate.StyleController = this.layoutMx1;
             this.txt_fApproveDate.TabIndex = 228;
             this.txt_fApproveDate.Tag = "readonly";
             // 
             // txt_fNote
             // 
-            this.txt_fNote.Location = new System.Drawing.Point(114, 99);
+            this.txt_fNote.Location = new System.Drawing.Point(114, 104);
             this.txt_fNote.Name = "txt_fNote";
             this.txt_fNote.Properties.Appearance.Options.UseFont = true;
-            this.txt_fNote.Size = new System.Drawing.Size(446, 24);
+            this.txt_fNote.Size = new System.Drawing.Size(564, 24);
             this.txt_fNote.StyleController = this.layoutMx1;
             this.txt_fNote.TabIndex = 243;
             // 
             // txt_fSalesManIDTxt
             // 
-            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(114, 128);
+            this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(114, 135);
             this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
             this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(170, 24);
+            this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
             this.txt_fSalesManIDTxt.StyleController = this.layoutMx1;
             this.txt_fSalesManIDTxt.TabIndex = 231;
             this.txt_fSalesManIDTxt.Tag = "readonly";
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(666, 41);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(784, 135);
             this.txt_fCreateDate.Name = "txt_fCreateDate";
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(170, 24);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
             this.txt_fCreateDate.StyleController = this.layoutMx1;
             this.txt_fCreateDate.TabIndex = 226;
             this.txt_fCreateDate.Tag = "readonly";
             // 
             // txt_fCustomerIDTxt
             // 
-            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(390, 41);
+            this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(449, 42);
             this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
             this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(170, 24);
+            this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(229, 24);
             this.txt_fCustomerIDTxt.StyleController = this.layoutMx1;
             this.txt_fCustomerIDTxt.TabIndex = 368;
             this.txt_fCustomerIDTxt.Tag = "readonly";
             // 
             // txt_shf
             // 
-            this.txt_shf.Location = new System.Drawing.Point(390, 70);
+            this.txt_shf.Location = new System.Drawing.Point(449, 73);
             this.txt_shf.Name = "txt_shf";
-            this.txt_shf.Size = new System.Drawing.Size(170, 24);
+            this.txt_shf.Size = new System.Drawing.Size(229, 24);
             this.txt_shf.StyleController = this.layoutMx1;
             this.txt_shf.TabIndex = 373;
             this.txt_shf.Tag = "readonly";
             // 
             // txt_shName
             // 
-            this.txt_shName.Location = new System.Drawing.Point(390, 128);
+            this.txt_shName.Location = new System.Drawing.Point(449, 135);
             this.txt_shName.Name = "txt_shName";
-            this.txt_shName.Size = new System.Drawing.Size(170, 24);
+            this.txt_shName.Size = new System.Drawing.Size(229, 24);
             this.txt_shName.StyleController = this.layoutMx1;
             this.txt_shName.TabIndex = 374;
             this.txt_shName.Tag = "readonly";
             // 
             // txt_wjStatus
             // 
-            this.txt_wjStatus.Location = new System.Drawing.Point(840, 99);
+            this.txt_wjStatus.Location = new System.Drawing.Point(1017, 104);
             this.txt_wjStatus.Name = "txt_wjStatus";
             this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��";
-            this.txt_wjStatus.Size = new System.Drawing.Size(274, 24);
+            this.txt_wjStatus.Size = new System.Drawing.Size(331, 24);
             this.txt_wjStatus.StyleController = this.layoutMx1;
             this.txt_wjStatus.TabIndex = 372;
             this.txt_wjStatus.Tag = "readonly";
+            // 
+            // txt_qt031
+            // 
+            this.txt_qt031.Location = new System.Drawing.Point(1119, 12);
+            this.txt_qt031.Name = "txt_qt031";
+            this.txt_qt031.Properties.ReadOnly = true;
+            this.txt_qt031.Size = new System.Drawing.Size(229, 24);
+            this.txt_qt031.StyleController = this.layoutMx1;
+            this.txt_qt031.TabIndex = 378;
+            this.txt_qt031.Tag = "readonly";
+            // 
+            // txt_qt030
+            // 
+            this.txt_qt030.Location = new System.Drawing.Point(1119, 42);
+            this.txt_qt030.Name = "txt_qt030";
+            this.txt_qt030.Properties.ReadOnly = true;
+            this.txt_qt030.Size = new System.Drawing.Size(229, 24);
+            this.txt_qt030.StyleController = this.layoutMx1;
+            this.txt_qt030.TabIndex = 379;
+            this.txt_qt030.Tag = "readonly";
+            // 
+            // txt_qt029
+            // 
+            this.txt_qt029.Location = new System.Drawing.Point(1017, 73);
+            this.txt_qt029.Name = "txt_qt029";
+            this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
+            this.txt_qt029.Properties.ReadOnly = true;
+            this.txt_qt029.Size = new System.Drawing.Size(331, 24);
+            this.txt_qt029.StyleController = this.layoutMx1;
+            this.txt_qt029.TabIndex = 380;
+            this.txt_qt029.Tag = "readonly";
             // 
             // layoutControlItem1
             // 
@@ -787,11 +852,6 @@
             this.layoutControlGroup1.GroupBordersVisible = false;
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem2,
-            this.layoutControlItem10,
-            this.layoutControlItem11,
-            this.layoutControlItem15,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
             this.layoutControlItem13,
             this.layoutControlItem5,
             this.layoutControlItem14,
@@ -801,8 +861,13 @@
             this.layoutControlItem12,
             this.layoutControlItem9,
             this.layoutControlItem17,
+            this.layoutControlItem10,
+            this.layoutControlItem11,
+            this.layoutControlItem15,
             this.layoutControlItem18,
+            this.layoutControlItem6,
             this.layoutControlItem19,
+            this.layoutControlItem7,
             this.layoutControlItem20});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
@@ -835,7 +900,7 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 167);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 174);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem2
@@ -845,82 +910,20 @@
             this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem2.Size = new System.Drawing.Size(335, 30);
             this.layoutControlItem2.Text = "鐢宠缂栧彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_fApproverID;
-            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
-            this.layoutControlItem10.Location = new System.Drawing.Point(828, 0);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(278, 29);
-            this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_fApproveDate;
-            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem11.Location = new System.Drawing.Point(828, 29);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
-            this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_chkStatus;
-            this.layoutControlItem15.Location = new System.Drawing.Point(828, 58);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(278, 29);
-            this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem15.TextVisible = false;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_fCreatorId;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
-            this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
-            this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_fCreateDate;
-            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem7.Location = new System.Drawing.Point(552, 29);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
-            this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_fCustomerIDTxt;
             this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem13.CustomizationFormText = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem13.Location = new System.Drawing.Point(276, 29);
+            this.layoutControlItem13.Location = new System.Drawing.Point(335, 30);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem13.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -929,10 +932,10 @@
             this.layoutControlItem5.Control = this.txt_fSaleOrgIdTxt;
             this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem5.CustomizationFormText = "閿�鍞粍缁�";
-            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem5.Size = new System.Drawing.Size(335, 30);
             this.layoutControlItem5.Text = "閿�鍞粍缁�";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -941,11 +944,11 @@
             this.layoutControlItem14.Control = this.txt_shf;
             this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�";
-            this.layoutControlItem14.Location = new System.Drawing.Point(276, 58);
+            this.layoutControlItem14.Location = new System.Drawing.Point(335, 61);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem14.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem14.Text = "鏀惰揣鏂�";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -954,11 +957,11 @@
             this.layoutControlItem8.Control = this.txt_fNote;
             this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem8.CustomizationFormText = "鐢宠澶囨敞";
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 87);
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(552, 29);
+            this.layoutControlItem8.Size = new System.Drawing.Size(670, 31);
             this.layoutControlItem8.Text = "鐢宠澶囨敞";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -967,10 +970,10 @@
             this.layoutControlItem4.Control = this.txt_salesId;
             this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem4.CustomizationFormText = "閿�鍞鍗�";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 58);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 61);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem4.Text = "閿�鍞鍗�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -979,12 +982,147 @@
             this.layoutControlItem3.Control = this.txt_fBillTypeID;
             this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 29);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
             this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_wjStatus;
+            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
+            this.layoutControlItem12.Location = new System.Drawing.Point(1005, 92);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem12.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem12.TextVisible = false;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
+            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 123);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem9.Text = "閿�鍞汉鍛�";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_shName;
+            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
+            this.layoutControlItem17.Location = new System.Drawing.Point(335, 123);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_fApproverID;
+            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem10.CustomizationFormText = "瀹℃牳浜�";
+            this.layoutControlItem10.Location = new System.Drawing.Point(670, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(335, 30);
+            this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_fApproveDate;
+            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem11.CustomizationFormText = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem11.Location = new System.Drawing.Point(670, 30);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_chkStatus;
+            this.layoutControlItem15.Location = new System.Drawing.Point(670, 61);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem15.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem15.TextVisible = false;
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_qt031;
+            this.layoutControlItem18.Location = new System.Drawing.Point(1005, 0);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem18.Size = new System.Drawing.Size(335, 30);
+            this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fCreatorId;
+            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
+            this.layoutControlItem6.Location = new System.Drawing.Point(670, 92);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_qt030;
+            this.layoutControlItem19.Location = new System.Drawing.Point(1005, 30);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_fCreateDate;
+            this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
+            this.layoutControlItem7.Location = new System.Drawing.Point(670, 123);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_qt029;
+            this.layoutControlItem20.Location = new System.Drawing.Point(1005, 61);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem20.Size = new System.Drawing.Size(335, 31);
+            this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem20.TextVisible = false;
             // 
             // tabMx
             // 
@@ -992,7 +1130,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 391);
+            this.tabMx.Size = new System.Drawing.Size(1360, 384);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1001,7 +1139,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 359);
+            this.tabMxPage1.Size = new System.Drawing.Size(1358, 352);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
@@ -1014,7 +1152,7 @@
             this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1,
             this.repositoryItemDateEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 359);
+            this.gcMx1.Size = new System.Drawing.Size(1358, 352);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1515,125 +1653,11 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gridColumn38
-            // 
-            this.gridColumn38.Caption = "璐㈠姟瀹℃牳";
-            this.gridColumn38.FieldName = "isCwChk";
-            this.gridColumn38.MinWidth = 25;
-            this.gridColumn38.Name = "gridColumn38";
-            this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 1;
-            this.gridColumn38.Width = 94;
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_wjStatus;
-            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
-            this.layoutControlItem12.Location = new System.Drawing.Point(828, 87);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(278, 29);
-            this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem12.TextVisible = false;
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
-            this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 116);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem9.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem9.Text = "閿�鍞汉鍛�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_shName;
-            this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
-            this.layoutControlItem17.Location = new System.Drawing.Point(276, 116);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // txt_qt031
-            // 
-            this.txt_qt031.Location = new System.Drawing.Point(666, 70);
-            this.txt_qt031.Name = "txt_qt031";
-            this.txt_qt031.Properties.ReadOnly = true;
-            this.txt_qt031.Size = new System.Drawing.Size(170, 24);
-            this.txt_qt031.StyleController = this.layoutMx1;
-            this.txt_qt031.TabIndex = 378;
-            this.txt_qt031.Tag = "readonly";
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_qt031;
-            this.layoutControlItem18.Location = new System.Drawing.Point(552, 58);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
-            this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // txt_qt030
-            // 
-            this.txt_qt030.Location = new System.Drawing.Point(666, 99);
-            this.txt_qt030.Name = "txt_qt030";
-            this.txt_qt030.Properties.ReadOnly = true;
-            this.txt_qt030.Size = new System.Drawing.Size(170, 24);
-            this.txt_qt030.StyleController = this.layoutMx1;
-            this.txt_qt030.TabIndex = 379;
-            this.txt_qt030.Tag = "readonly";
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_qt030;
-            this.layoutControlItem19.Location = new System.Drawing.Point(552, 87);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
-            this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // txt_qt029
-            // 
-            this.txt_qt029.Location = new System.Drawing.Point(564, 128);
-            this.txt_qt029.Name = "txt_qt029";
-            this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
-            this.txt_qt029.Properties.ReadOnly = true;
-            this.txt_qt029.Size = new System.Drawing.Size(272, 24);
-            this.txt_qt029.StyleController = this.layoutMx1;
-            this.txt_qt029.TabIndex = 380;
-            this.txt_qt029.Tag = "readonly";
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_qt029;
-            this.layoutControlItem20.Location = new System.Drawing.Point(552, 116);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem20.TextVisible = false;
-            // 
             // Frm_SalesDeliver
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1362, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
@@ -1673,21 +1697,30 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_shf.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_shName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1699,15 +1732,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1804,11 +1828,6 @@
         private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
@@ -1825,10 +1844,17 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraEditors.TextEdit txt_qt030;
         private DevExpress.XtraEditors.CheckEdit txt_qt029;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
     }
 }
\ 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 f8e0091..17d4aed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -73,7 +73,7 @@
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             };
         }
@@ -530,9 +530,14 @@
                     {
                         getModel(lbGuid.Text.Trim());
                     }
-                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
-                    gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, _inFieldValue.ToString());
+                    else
+                    {
+                        //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+                        getPageList(this.pageBar1.CurrentPage);
+                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+                        gridView1.FocusedRowHandle = rowHandle;
+                    }
+                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, (_inFieldValue > 0 ? 1 : _inFieldValue).ToString());
                 }
                 else
                     MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
index ff9d6d1..cceceda 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs
@@ -30,19 +30,18 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -79,7 +78,6 @@
             this.gv_changeDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cancellerId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_versionNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_changerId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_entryNote = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fbilltype = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -144,19 +142,12 @@
             this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -164,20 +155,9 @@
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -226,6 +206,24 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.lab_saleDeptName = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -293,19 +291,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
@@ -313,25 +304,32 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+            this.tabMx.SuspendLayout();
+            this.tabMxPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
-            this.tabMx.SuspendLayout();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -436,7 +434,6 @@
             this.gv_changeDate,
             this.gv_cancelStatus,
             this.gv_cancellerId,
-            this.gv_versionNo,
             this.gv_changerId,
             this.gv_entryNote,
             this.gv_fbilltype,
@@ -825,19 +822,6 @@
             this.gv_cancellerId.VisibleIndex = 20;
             this.gv_cancellerId.Width = 94;
             // 
-            // gv_versionNo
-            // 
-            this.gv_versionNo.AppearanceCell.Options.UseFont = true;
-            this.gv_versionNo.Caption = "鐗堟湰鍙� ";
-            this.gv_versionNo.FieldName = "versionNo";
-            this.gv_versionNo.MinWidth = 50;
-            this.gv_versionNo.Name = "gv_versionNo";
-            this.gv_versionNo.OptionsColumn.AllowEdit = false;
-            this.gv_versionNo.Tag = "query_a.version_no";
-            this.gv_versionNo.Visible = true;
-            this.gv_versionNo.VisibleIndex = 21;
-            this.gv_versionNo.Width = 94;
-            // 
             // gv_changerId
             // 
             this.gv_changerId.AppearanceCell.Options.UseFont = true;
@@ -859,7 +843,7 @@
             this.gv_entryNote.OptionsColumn.AllowEdit = false;
             this.gv_entryNote.Tag = "query_a.entry_note";
             this.gv_entryNote.Visible = true;
-            this.gv_entryNote.VisibleIndex = 22;
+            this.gv_entryNote.VisibleIndex = 21;
             this.gv_entryNote.Width = 94;
             // 
             // gv_fbilltype
@@ -923,7 +907,7 @@
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 23;
+            this.gridColumn2.VisibleIndex = 22;
             this.gridColumn2.Width = 94;
             // 
             // gridColumn3
@@ -933,7 +917,7 @@
             this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 24;
+            this.gridColumn3.VisibleIndex = 23;
             this.gridColumn3.Width = 94;
             // 
             // gridColumn4
@@ -943,7 +927,7 @@
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 25;
+            this.gridColumn4.VisibleIndex = 24;
             this.gridColumn4.Width = 94;
             // 
             // gridColumn14
@@ -953,7 +937,7 @@
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 26;
+            this.gridColumn14.VisibleIndex = 25;
             this.gridColumn14.Width = 94;
             // 
             // pageBar1
@@ -993,7 +977,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1568, 570);
-            this.splitMx1.SplitterPosition = 267;
+            this.splitMx1.SplitterPosition = 243;
             this.splitMx1.TabIndex = 4;
             // 
             // layoutMx1
@@ -1047,12 +1031,14 @@
             this.layoutControlItem12,
             this.layoutControlItem13,
             this.layoutControlItem35,
-            this.layoutControlItem34});
+            this.layoutControlItem34,
+            this.layoutControlItem2,
+            this.layoutControlItem31});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(667, 301, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1568, 267);
+            this.layoutMx1.Size = new System.Drawing.Size(1568, 243);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -1066,19 +1052,19 @@
             // 
             // txt_receiveContact
             // 
-            this.txt_receiveContact.Location = new System.Drawing.Point(1260, 152);
+            this.txt_receiveContact.Location = new System.Drawing.Point(1244, 152);
             this.txt_receiveContact.Name = "txt_receiveContact";
             this.txt_receiveContact.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiveContact.Size = new System.Drawing.Size(296, 24);
+            this.txt_receiveContact.Size = new System.Drawing.Size(291, 24);
             this.txt_receiveContact.StyleController = this.layoutMx1;
             this.txt_receiveContact.TabIndex = 427;
             // 
             // txt_receiveId
             // 
-            this.txt_receiveId.Location = new System.Drawing.Point(1260, 68);
+            this.txt_receiveId.Location = new System.Drawing.Point(1244, 68);
             this.txt_receiveId.Name = "txt_receiveId";
             this.txt_receiveId.Properties.Appearance.Options.UseFont = true;
-            this.txt_receiveId.Size = new System.Drawing.Size(296, 24);
+            this.txt_receiveId.Size = new System.Drawing.Size(291, 24);
             this.txt_receiveId.StyleController = this.layoutMx1;
             this.txt_receiveId.TabIndex = 425;
             // 
@@ -1102,154 +1088,154 @@
             // 
             // txt_changerId
             // 
-            this.txt_changerId.Location = new System.Drawing.Point(1260, 180);
+            this.txt_changerId.Location = new System.Drawing.Point(1244, 180);
             this.txt_changerId.Name = "txt_changerId";
             this.txt_changerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_changerId.Size = new System.Drawing.Size(296, 24);
+            this.txt_changerId.Size = new System.Drawing.Size(291, 24);
             this.txt_changerId.StyleController = this.layoutMx1;
             this.txt_changerId.TabIndex = 378;
             // 
             // txt_versionNo
             // 
-            this.txt_versionNo.Location = new System.Drawing.Point(99, 180);
+            this.txt_versionNo.Location = new System.Drawing.Point(99, 175);
             this.txt_versionNo.Name = "txt_versionNo";
             this.txt_versionNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_versionNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_versionNo.Size = new System.Drawing.Size(290, 24);
             this.txt_versionNo.StyleController = this.layoutMx1;
             this.txt_versionNo.TabIndex = 376;
             // 
             // txt_cancellerId
             // 
-            this.txt_cancellerId.Location = new System.Drawing.Point(486, 180);
+            this.txt_cancellerId.Location = new System.Drawing.Point(480, 124);
             this.txt_cancellerId.Name = "txt_cancellerId";
             this.txt_cancellerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancellerId.Size = new System.Drawing.Size(296, 24);
+            this.txt_cancellerId.Size = new System.Drawing.Size(291, 24);
             this.txt_cancellerId.StyleController = this.layoutMx1;
             this.txt_cancellerId.TabIndex = 374;
             // 
             // txt_cancelStatusTxt
             // 
-            this.txt_cancelStatusTxt.Location = new System.Drawing.Point(486, 208);
+            this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 152);
             this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt";
             this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_cancelStatusTxt.Size = new System.Drawing.Size(296, 24);
+            this.txt_cancelStatusTxt.Size = new System.Drawing.Size(291, 24);
             this.txt_cancelStatusTxt.StyleController = this.layoutMx1;
             this.txt_cancelStatusTxt.TabIndex = 372;
             // 
             // txt_changeDate
             // 
-            this.txt_changeDate.Location = new System.Drawing.Point(1260, 208);
+            this.txt_changeDate.Location = new System.Drawing.Point(862, 208);
             this.txt_changeDate.Name = "txt_changeDate";
             this.txt_changeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_changeDate.Size = new System.Drawing.Size(296, 24);
+            this.txt_changeDate.Size = new System.Drawing.Size(291, 24);
             this.txt_changeDate.StyleController = this.layoutMx1;
             this.txt_changeDate.TabIndex = 344;
             // 
             // txt_closeDate
             // 
-            this.txt_closeDate.Location = new System.Drawing.Point(873, 236);
+            this.txt_closeDate.Location = new System.Drawing.Point(480, 208);
             this.txt_closeDate.Name = "txt_closeDate";
             this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeDate.Size = new System.Drawing.Size(296, 24);
+            this.txt_closeDate.Size = new System.Drawing.Size(291, 24);
             this.txt_closeDate.StyleController = this.layoutMx1;
             this.txt_closeDate.TabIndex = 342;
             // 
             // txt_closerId
             // 
-            this.txt_closerId.Location = new System.Drawing.Point(873, 208);
+            this.txt_closerId.Location = new System.Drawing.Point(480, 180);
             this.txt_closerId.Name = "txt_closerId";
             this.txt_closerId.Properties.Appearance.Options.UseFont = true;
-            this.txt_closerId.Size = new System.Drawing.Size(296, 24);
+            this.txt_closerId.Size = new System.Drawing.Size(291, 24);
             this.txt_closerId.StyleController = this.layoutMx1;
             this.txt_closerId.TabIndex = 340;
             // 
             // txt_approveDate
             // 
-            this.txt_approveDate.Location = new System.Drawing.Point(486, 96);
+            this.txt_approveDate.Location = new System.Drawing.Point(480, 40);
             this.txt_approveDate.Name = "txt_approveDate";
             this.txt_approveDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_approveDate.Size = new System.Drawing.Size(296, 24);
+            this.txt_approveDate.Size = new System.Drawing.Size(291, 24);
             this.txt_approveDate.StyleController = this.layoutMx1;
             this.txt_approveDate.TabIndex = 338;
             // 
             // txt_modifyDate
             // 
-            this.txt_modifyDate.Location = new System.Drawing.Point(873, 152);
+            this.txt_modifyDate.Location = new System.Drawing.Point(862, 152);
             this.txt_modifyDate.Name = "txt_modifyDate";
             this.txt_modifyDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifyDate.Size = new System.Drawing.Size(296, 24);
+            this.txt_modifyDate.Size = new System.Drawing.Size(291, 24);
             this.txt_modifyDate.StyleController = this.layoutMx1;
             this.txt_modifyDate.TabIndex = 314;
             // 
             // txt_modifierId
             // 
-            this.txt_modifierId.Location = new System.Drawing.Point(873, 124);
+            this.txt_modifierId.Location = new System.Drawing.Point(862, 124);
             this.txt_modifierId.Name = "txt_modifierId";
             this.txt_modifierId.Properties.Appearance.Options.UseFont = true;
-            this.txt_modifierId.Size = new System.Drawing.Size(296, 24);
+            this.txt_modifierId.Size = new System.Drawing.Size(291, 24);
             this.txt_modifierId.StyleController = this.layoutMx1;
             this.txt_modifierId.TabIndex = 312;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(486, 152);
+            this.txt_createDate.Location = new System.Drawing.Point(480, 96);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(296, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(291, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 310;
             // 
             // txt_creatorId
             // 
-            this.txt_creatorId.Location = new System.Drawing.Point(486, 124);
+            this.txt_creatorId.Location = new System.Drawing.Point(480, 68);
             this.txt_creatorId.Name = "txt_creatorId";
             this.txt_creatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_creatorId.Size = new System.Drawing.Size(296, 24);
+            this.txt_creatorId.Size = new System.Drawing.Size(291, 24);
             this.txt_creatorId.StyleController = this.layoutMx1;
             this.txt_creatorId.TabIndex = 308;
             // 
             // txt_linkPhone
             // 
-            this.txt_linkPhone.Location = new System.Drawing.Point(1260, 124);
+            this.txt_linkPhone.Location = new System.Drawing.Point(1244, 124);
             this.txt_linkPhone.Name = "txt_linkPhone";
             this.txt_linkPhone.Properties.Appearance.Options.UseFont = true;
-            this.txt_linkPhone.Size = new System.Drawing.Size(296, 24);
+            this.txt_linkPhone.Size = new System.Drawing.Size(291, 24);
             this.txt_linkPhone.StyleController = this.layoutMx1;
             this.txt_linkPhone.TabIndex = 288;
             // 
             // txt_chargeId
             // 
-            this.txt_chargeId.Location = new System.Drawing.Point(873, 68);
+            this.txt_chargeId.Location = new System.Drawing.Point(862, 68);
             this.txt_chargeId.Name = "txt_chargeId";
             this.txt_chargeId.Properties.Appearance.Options.UseFont = true;
-            this.txt_chargeId.Size = new System.Drawing.Size(296, 24);
+            this.txt_chargeId.Size = new System.Drawing.Size(291, 24);
             this.txt_chargeId.StyleController = this.layoutMx1;
             this.txt_chargeId.TabIndex = 286;
             // 
             // txt_linkMan
             // 
-            this.txt_linkMan.Location = new System.Drawing.Point(1260, 96);
+            this.txt_linkMan.Location = new System.Drawing.Point(1244, 96);
             this.txt_linkMan.Name = "txt_linkMan";
             this.txt_linkMan.Properties.Appearance.Options.UseFont = true;
-            this.txt_linkMan.Size = new System.Drawing.Size(296, 24);
+            this.txt_linkMan.Size = new System.Drawing.Size(291, 24);
             this.txt_linkMan.StyleController = this.layoutMx1;
             this.txt_linkMan.TabIndex = 284;
             // 
             // txt_approverId
             // 
-            this.txt_approverId.Location = new System.Drawing.Point(486, 68);
+            this.txt_approverId.Location = new System.Drawing.Point(480, 12);
             this.txt_approverId.Name = "txt_approverId";
             this.txt_approverId.Properties.Appearance.Options.UseFont = true;
-            this.txt_approverId.Size = new System.Drawing.Size(296, 24);
+            this.txt_approverId.Size = new System.Drawing.Size(291, 24);
             this.txt_approverId.StyleController = this.layoutMx1;
             this.txt_approverId.TabIndex = 282;
             // 
             // txt_settleId
             // 
-            this.txt_settleId.Location = new System.Drawing.Point(873, 96);
+            this.txt_settleId.Location = new System.Drawing.Point(862, 96);
             this.txt_settleId.Name = "txt_settleId";
             this.txt_settleId.Properties.Appearance.Options.UseFont = true;
-            this.txt_settleId.Size = new System.Drawing.Size(296, 24);
+            this.txt_settleId.Size = new System.Drawing.Size(291, 24);
             this.txt_settleId.StyleController = this.layoutMx1;
             this.txt_settleId.TabIndex = 265;
             // 
@@ -1258,16 +1244,16 @@
             this.txt_note.Location = new System.Drawing.Point(99, 208);
             this.txt_note.Name = "txt_note";
             this.txt_note.Properties.Appearance.Options.UseFont = true;
-            this.txt_note.Size = new System.Drawing.Size(296, 24);
+            this.txt_note.Size = new System.Drawing.Size(290, 24);
             this.txt_note.StyleController = this.layoutMx1;
             this.txt_note.TabIndex = 263;
             // 
             // txt_changeReason
             // 
-            this.txt_changeReason.Location = new System.Drawing.Point(1260, 236);
+            this.txt_changeReason.Location = new System.Drawing.Point(1244, 208);
             this.txt_changeReason.Name = "txt_changeReason";
             this.txt_changeReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_changeReason.Size = new System.Drawing.Size(296, 24);
+            this.txt_changeReason.Size = new System.Drawing.Size(291, 24);
             this.txt_changeReason.StyleController = this.layoutMx1;
             this.txt_changeReason.TabIndex = 261;
             // 
@@ -1291,10 +1277,10 @@
             // 
             // txt_closeStatusTxt
             // 
-            this.txt_closeStatusTxt.Location = new System.Drawing.Point(873, 180);
+            this.txt_closeStatusTxt.Location = new System.Drawing.Point(862, 180);
             this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
             this.txt_closeStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_closeStatusTxt.Size = new System.Drawing.Size(296, 24);
+            this.txt_closeStatusTxt.Size = new System.Drawing.Size(291, 24);
             this.txt_closeStatusTxt.StyleController = this.layoutMx1;
             this.txt_closeStatusTxt.TabIndex = 247;
             // 
@@ -1309,73 +1295,73 @@
             // 
             // txt_headLocId
             // 
-            this.txt_headLocId.Location = new System.Drawing.Point(1260, 40);
+            this.txt_headLocId.Location = new System.Drawing.Point(1244, 40);
             this.txt_headLocId.Name = "txt_headLocId";
             this.txt_headLocId.Properties.Appearance.Options.UseFont = true;
-            this.txt_headLocId.Size = new System.Drawing.Size(296, 24);
+            this.txt_headLocId.Size = new System.Drawing.Size(291, 24);
             this.txt_headLocId.StyleController = this.layoutMx1;
             this.txt_headLocId.TabIndex = 243;
             // 
             // txt_headDeliveryWay
             // 
-            this.txt_headDeliveryWay.Location = new System.Drawing.Point(1260, 12);
+            this.txt_headDeliveryWay.Location = new System.Drawing.Point(1244, 12);
             this.txt_headDeliveryWay.Name = "txt_headDeliveryWay";
             this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true;
-            this.txt_headDeliveryWay.Size = new System.Drawing.Size(296, 24);
+            this.txt_headDeliveryWay.Size = new System.Drawing.Size(291, 24);
             this.txt_headDeliveryWay.StyleController = this.layoutMx1;
             this.txt_headDeliveryWay.TabIndex = 235;
             // 
             // txt_businessTypeTxt
             // 
-            this.txt_businessTypeTxt.Location = new System.Drawing.Point(873, 40);
+            this.txt_businessTypeTxt.Location = new System.Drawing.Point(862, 40);
             this.txt_businessTypeTxt.Name = "txt_businessTypeTxt";
             this.txt_businessTypeTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_businessTypeTxt.Size = new System.Drawing.Size(296, 24);
+            this.txt_businessTypeTxt.Size = new System.Drawing.Size(291, 24);
             this.txt_businessTypeTxt.StyleController = this.layoutMx1;
             this.txt_businessTypeTxt.TabIndex = 233;
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(486, 40);
+            this.txt_fDate.Location = new System.Drawing.Point(99, 40);
             this.txt_fDate.Name = "txt_fDate";
             this.txt_fDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fDate.Size = new System.Drawing.Size(296, 24);
+            this.txt_fDate.Size = new System.Drawing.Size(290, 24);
             this.txt_fDate.StyleController = this.layoutMx1;
             this.txt_fDate.TabIndex = 231;
             // 
             // txt_billTypeId
             // 
-            this.txt_billTypeId.Location = new System.Drawing.Point(873, 12);
+            this.txt_billTypeId.Location = new System.Drawing.Point(862, 12);
             this.txt_billTypeId.Name = "txt_billTypeId";
             this.txt_billTypeId.Properties.Appearance.Options.UseFont = true;
-            this.txt_billTypeId.Size = new System.Drawing.Size(296, 24);
+            this.txt_billTypeId.Size = new System.Drawing.Size(291, 24);
             this.txt_billTypeId.StyleController = this.layoutMx1;
             this.txt_billTypeId.TabIndex = 219;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(486, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(290, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 216;
             // 
             // txt_documentStatusTxt
             // 
-            this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 40);
+            this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 68);
             this.txt_documentStatusTxt.Name = "txt_documentStatusTxt";
             this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true;
-            this.txt_documentStatusTxt.Size = new System.Drawing.Size(296, 24);
+            this.txt_documentStatusTxt.Size = new System.Drawing.Size(290, 24);
             this.txt_documentStatusTxt.StyleController = this.layoutMx1;
             this.txt_documentStatusTxt.TabIndex = 229;
             // 
             // txt_erpId
             // 
-            this.txt_erpId.Location = new System.Drawing.Point(99, 12);
+            this.txt_erpId.Location = new System.Drawing.Point(99, 7);
             this.txt_erpId.Name = "txt_erpId";
             this.txt_erpId.Properties.Appearance.Options.UseFont = true;
-            this.txt_erpId.Size = new System.Drawing.Size(296, 24);
+            this.txt_erpId.Size = new System.Drawing.Size(290, 24);
             this.txt_erpId.StyleController = this.layoutMx1;
             this.txt_erpId.TabIndex = 214;
             // 
@@ -1391,33 +1377,33 @@
             // 
             // txt_xsOrgName
             // 
-            this.txt_xsOrgName.Location = new System.Drawing.Point(99, 96);
+            this.txt_xsOrgName.Location = new System.Drawing.Point(99, 124);
             this.txt_xsOrgName.Name = "txt_xsOrgName";
-            this.txt_xsOrgName.Size = new System.Drawing.Size(296, 24);
+            this.txt_xsOrgName.Size = new System.Drawing.Size(290, 24);
             this.txt_xsOrgName.StyleController = this.layoutMx1;
             this.txt_xsOrgName.TabIndex = 429;
             // 
             // txt_salerName
             // 
-            this.txt_salerName.Location = new System.Drawing.Point(99, 152);
+            this.txt_salerName.Location = new System.Drawing.Point(99, 180);
             this.txt_salerName.Name = "txt_salerName";
-            this.txt_salerName.Size = new System.Drawing.Size(296, 24);
+            this.txt_salerName.Size = new System.Drawing.Size(290, 24);
             this.txt_salerName.StyleController = this.layoutMx1;
             this.txt_salerName.TabIndex = 430;
             // 
             // txt_custName
             // 
-            this.txt_custName.Location = new System.Drawing.Point(99, 124);
+            this.txt_custName.Location = new System.Drawing.Point(99, 152);
             this.txt_custName.Name = "txt_custName";
-            this.txt_custName.Size = new System.Drawing.Size(296, 24);
+            this.txt_custName.Size = new System.Drawing.Size(290, 24);
             this.txt_custName.StyleController = this.layoutMx1;
             this.txt_custName.TabIndex = 431;
             // 
             // txt_saleDeptName
             // 
-            this.txt_saleDeptName.Location = new System.Drawing.Point(99, 68);
+            this.txt_saleDeptName.Location = new System.Drawing.Point(99, 96);
             this.txt_saleDeptName.Name = "txt_saleDeptName";
-            this.txt_saleDeptName.Size = new System.Drawing.Size(296, 24);
+            this.txt_saleDeptName.Size = new System.Drawing.Size(290, 24);
             this.txt_saleDeptName.StyleController = this.layoutMx1;
             this.txt_saleDeptName.TabIndex = 432;
             // 
@@ -1501,19 +1487,11 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem3,
-            this.layoutControlItem6,
             this.layoutControlItem7,
             this.layoutControlItem20,
-            this.layoutControlItem2,
-            this.layoutControlItem4,
             this.layoutControlItem5,
             this.layoutControlItem8,
             this.layoutControlItem37,
-            this.layoutControlItem41,
-            this.lab_saleDeptName,
-            this.layoutControlItem39,
-            this.layoutControlItem40,
             this.layoutControlItem9,
             this.layoutControlItem36,
             this.layoutControlItem18,
@@ -1521,106 +1499,88 @@
             this.layoutControlItem16,
             this.layoutControlItem23,
             this.layoutControlItem24,
-            this.layoutControlItem27,
-            this.layoutControlItem26,
             this.layoutControlItem11,
-            this.layoutControlItem31,
             this.layoutControlItem32,
-            this.layoutControlItem28,
-            this.layoutControlItem14,
+            this.layoutControlItem4,
             this.layoutControlItem15,
+            this.layoutControlItem40,
+            this.layoutControlItem41,
+            this.layoutControlItem39,
+            this.lab_saleDeptName,
+            this.layoutControlItem3,
+            this.layoutControlItem6,
             this.layoutControlItem17,
             this.layoutControlItem25,
             this.layoutControlItem21,
             this.layoutControlItem22,
             this.layoutControlItem30,
-            this.layoutControlItem29});
+            this.layoutControlItem29,
+            this.layoutControlItem26,
+            this.layoutControlItem27,
+            this.layoutControlItem28,
+            this.layoutControlItem14});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16,
-            rowDefinition17,
-            rowDefinition18});
-            this.Root.Size = new System.Drawing.Size(1568, 272);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
+            this.Root.Size = new System.Drawing.Size(1547, 244);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_documentStatusTxt;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_fDate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(387, 28);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_businessTypeTxt;
-            this.layoutControlItem7.Location = new System.Drawing.Point(774, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(763, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_linkPhone;
-            this.layoutControlItem20.Location = new System.Drawing.Point(1161, 112);
+            this.layoutControlItem20.Location = new System.Drawing.Point(1145, 112);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem20.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -1629,198 +1589,126 @@
             this.layoutControlItem2.Control = this.txt_erpId;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem2.Text = "ERPID";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_billNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(387, 0);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_billTypeId;
-            this.layoutControlItem5.Location = new System.Drawing.Point(774, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(763, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_headDeliveryWay;
-            this.layoutControlItem8.Location = new System.Drawing.Point(1161, 0);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1145, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem8.Text = "浜よ揣鏂瑰紡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem37
             // 
             this.layoutControlItem37.Control = this.txt_receiveContact;
-            this.layoutControlItem37.Location = new System.Drawing.Point(1161, 140);
+            this.layoutControlItem37.Location = new System.Drawing.Point(1145, 140);
             this.layoutControlItem37.Name = "layoutControlItem37";
             this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem37.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem37.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem41
-            // 
-            this.layoutControlItem41.Control = this.txt_custName;
-            this.layoutControlItem41.Location = new System.Drawing.Point(0, 112);
-            this.layoutControlItem41.Name = "layoutControlItem41";
-            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem41.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // lab_saleDeptName
-            // 
-            this.lab_saleDeptName.Control = this.txt_saleDeptName;
-            this.lab_saleDeptName.Location = new System.Drawing.Point(0, 56);
-            this.lab_saleDeptName.Name = "lab_saleDeptName";
-            this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 2;
-            this.lab_saleDeptName.Size = new System.Drawing.Size(387, 28);
-            this.lab_saleDeptName.Text = "閿�鍞儴闂�";
-            this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem39
-            // 
-            this.layoutControlItem39.Control = this.txt_xsOrgName;
-            this.layoutControlItem39.Location = new System.Drawing.Point(0, 84);
-            this.layoutControlItem39.Name = "layoutControlItem39";
-            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem39.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem39.Text = "閿�鍞粍缁�";
-            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem40
-            // 
-            this.layoutControlItem40.Control = this.txt_salerName;
-            this.layoutControlItem40.Location = new System.Drawing.Point(0, 140);
-            this.layoutControlItem40.Name = "layoutControlItem40";
-            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem40.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem40.Text = "閿�鍞憳鍚�";
-            this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_headLocId;
-            this.layoutControlItem9.Location = new System.Drawing.Point(1161, 28);
+            this.layoutControlItem9.Location = new System.Drawing.Point(1145, 28);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem9.Text = "浜よ揣鍦扮偣";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem36
             // 
             this.layoutControlItem36.Control = this.txt_receiveId;
-            this.layoutControlItem36.Location = new System.Drawing.Point(1161, 56);
+            this.layoutControlItem36.Location = new System.Drawing.Point(1145, 56);
             this.layoutControlItem36.Name = "layoutControlItem36";
             this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem36.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem36.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem36.Text = "鏀惰揣鏂�";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_linkMan;
-            this.layoutControlItem18.Location = new System.Drawing.Point(1161, 84);
+            this.layoutControlItem18.Location = new System.Drawing.Point(1145, 84);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem18.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem18.Text = "鏀惰揣浜哄鍚�";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_chargeId;
-            this.layoutControlItem19.Location = new System.Drawing.Point(774, 56);
+            this.layoutControlItem19.Location = new System.Drawing.Point(763, 56);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem19.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem19.Text = "浠樻鏂�";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_settleId;
-            this.layoutControlItem16.Location = new System.Drawing.Point(774, 84);
+            this.layoutControlItem16.Location = new System.Drawing.Point(763, 84);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem16.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem16.Text = "缁撶畻鏂�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.txt_modifierId;
-            this.layoutControlItem23.Location = new System.Drawing.Point(774, 112);
+            this.layoutControlItem23.Location = new System.Drawing.Point(763, 112);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem23.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem23.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem23.Text = "淇敼浜哄憳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txt_modifyDate;
-            this.layoutControlItem24.Location = new System.Drawing.Point(774, 140);
+            this.layoutControlItem24.Location = new System.Drawing.Point(763, 140);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem24.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem24.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem24.Text = "淇敼鏃ユ湡";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_closeDate;
-            this.layoutControlItem27.Location = new System.Drawing.Point(774, 224);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem27.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_closerId;
-            this.layoutControlItem26.Location = new System.Drawing.Point(774, 196);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem26.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_closeStatusTxt;
-            this.layoutControlItem11.Location = new System.Drawing.Point(774, 168);
+            this.layoutControlItem11.Location = new System.Drawing.Point(763, 168);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem11.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem11.Text = "鍏抽棴鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -1830,118 +1718,20 @@
             this.layoutControlItem31.Location = new System.Drawing.Point(0, 168);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem31.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem31.Size = new System.Drawing.Size(381, 28);
             this.layoutControlItem31.Text = "鐗堟湰鍙�";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_changerId;
-            this.layoutControlItem32.Location = new System.Drawing.Point(1161, 168);
+            this.layoutControlItem32.Location = new System.Drawing.Point(1145, 168);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem32.Size = new System.Drawing.Size(387, 28);
+            this.layoutControlItem32.Size = new System.Drawing.Size(382, 28);
             this.layoutControlItem32.Text = "鍙樻洿浜哄憳";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_changeDate;
-            this.layoutControlItem28.Location = new System.Drawing.Point(1161, 196);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem28.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_changeReason;
-            this.layoutControlItem14.Location = new System.Drawing.Point(1161, 224);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
-            this.layoutControlItem14.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_note;
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 196);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem15.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_approverId;
-            this.layoutControlItem17.Location = new System.Drawing.Point(387, 56);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_approveDate;
-            this.layoutControlItem25.Location = new System.Drawing.Point(387, 84);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem25.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_creatorId;
-            this.layoutControlItem21.Location = new System.Drawing.Point(387, 112);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem21.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_createDate;
-            this.layoutControlItem22.Location = new System.Drawing.Point(387, 140);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem22.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txt_cancellerId;
-            this.layoutControlItem30.Location = new System.Drawing.Point(387, 168);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem30.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem30.Text = "浣滃簾浜哄憳";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem29
-            // 
-            this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
-            this.layoutControlItem29.Location = new System.Drawing.Point(387, 196);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem29.Size = new System.Drawing.Size(387, 28);
-            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -1949,7 +1739,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1568, 291);
+            this.tabMx.Size = new System.Drawing.Size(1568, 315);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1958,7 +1748,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1566, 259);
+            this.tabMxPage1.Size = new System.Drawing.Size(1566, 283);
             this.tabMxPage1.Text = "閿�鍞槑缁�";
             // 
             // gcMx1
@@ -1967,7 +1757,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1566, 259);
+            this.gcMx1.Size = new System.Drawing.Size(1566, 283);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -2496,6 +2286,194 @@
             this.gridColumn13.VisibleIndex = 29;
             this.gridColumn13.Width = 94;
             // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_billNo;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem4.Text = "鍗曟嵁缂栧彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_note;
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem15.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem15.Text = "鍗曟嵁澶囨敞";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.txt_salerName;
+            this.layoutControlItem40.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem40.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem40.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem41
+            // 
+            this.layoutControlItem41.Control = this.txt_custName;
+            this.layoutControlItem41.Location = new System.Drawing.Point(0, 140);
+            this.layoutControlItem41.Name = "layoutControlItem41";
+            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem41.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О";
+            this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem39
+            // 
+            this.layoutControlItem39.Control = this.txt_xsOrgName;
+            this.layoutControlItem39.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem39.Name = "layoutControlItem39";
+            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem39.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem39.Text = "閿�鍞粍缁�";
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // lab_saleDeptName
+            // 
+            this.lab_saleDeptName.Control = this.txt_saleDeptName;
+            this.lab_saleDeptName.Location = new System.Drawing.Point(0, 84);
+            this.lab_saleDeptName.Name = "lab_saleDeptName";
+            this.lab_saleDeptName.OptionsTableLayoutItem.RowIndex = 3;
+            this.lab_saleDeptName.Size = new System.Drawing.Size(381, 28);
+            this.lab_saleDeptName.Text = "閿�鍞儴闂�";
+            this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_documentStatusTxt;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem3.Text = "鍗曟嵁鐘舵��";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fDate;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(381, 28);
+            this.layoutControlItem6.Text = "鍗曟嵁鏃ユ湡";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_approverId;
+            this.layoutControlItem17.Location = new System.Drawing.Point(381, 0);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem17.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem17.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_approveDate;
+            this.layoutControlItem25.Location = new System.Drawing.Point(381, 28);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem25.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem25.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_creatorId;
+            this.layoutControlItem21.Location = new System.Drawing.Point(381, 56);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem21.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem21.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem22
+            // 
+            this.layoutControlItem22.Control = this.txt_createDate;
+            this.layoutControlItem22.Location = new System.Drawing.Point(381, 84);
+            this.layoutControlItem22.Name = "layoutControlItem22";
+            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem22.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem22.Text = "鍒涘缓鏃ユ湡";
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_cancellerId;
+            this.layoutControlItem30.Location = new System.Drawing.Point(381, 112);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem30.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem30.Text = "浣滃簾浜哄憳";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_cancelStatusTxt;
+            this.layoutControlItem29.Location = new System.Drawing.Point(381, 140);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem29.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem29.Text = "浣滃簾鐘舵��";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.txt_closerId;
+            this.layoutControlItem26.Location = new System.Drawing.Point(381, 168);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem26.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem26.Text = "鍏抽棴浜哄憳";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_closeDate;
+            this.layoutControlItem27.Location = new System.Drawing.Point(381, 196);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem27.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem27.Text = "鍏抽棴鏃ユ湡";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_changeDate;
+            this.layoutControlItem28.Location = new System.Drawing.Point(763, 196);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem28.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem28.Text = "鍙樻洿鏃ユ湡";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_changeReason;
+            this.layoutControlItem14.Location = new System.Drawing.Point(1145, 196);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem14.Size = new System.Drawing.Size(382, 28);
+            this.layoutControlItem14.Text = "鍙樻洿鍘熷洜";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            // 
             // Frm_SalesOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2572,19 +2550,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
@@ -2592,25 +2563,32 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+            this.tabMx.ResumeLayout(false);
+            this.tabMxPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.lab_saleDeptName)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
-            this.tabMx.ResumeLayout(false);
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2692,7 +2670,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_changeDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancellerId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_versionNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changerId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_entryNote;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fbilltype;
@@ -2706,10 +2683,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraEditors.TextEdit txt_documentStatusTxt;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraEditors.TextEdit txt_billTypeId;
         private DevExpress.XtraEditors.TextEdit txt_fDate;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraEditors.TextEdit txt_businessTypeTxt;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraEditors.TextEdit txt_headDeliveryWay;
@@ -2767,15 +2742,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraLayout.LayoutControlItem lab_saleDeptName;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
@@ -2783,20 +2753,27 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+        private DevExpress.XtraLayout.LayoutControlItem lab_saleDeptName;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 1d79e6b..54521a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -84,49 +84,55 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+            this.txt_returnCustomer = new Gs.DevApp.UserControl.UcLookCustomer();
+            this.txt_salesDept = new Gs.DevApp.UserControl.UcLookDepartment();
+            this.txt_inventoryOrg = new Gs.DevApp.UserControl.UcLookOrg();
+            this.txt_salesOrg = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_fHasLinkRad = new DevExpress.XtraEditors.RadioGroup();
             this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_salesOrderId = new Gs.DevApp.UserControl.UcLookSales();
             this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
             this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_xsOrgName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_inventoryOrg = new DevExpress.XtraEditors.TextEdit();
             this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_salerName = new DevExpress.XtraEditors.TextEdit();
             this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_custName = new DevExpress.XtraEditors.TextEdit();
             this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
             this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -161,18 +167,6 @@
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
-            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -237,39 +231,41 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -310,8 +306,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
@@ -707,69 +701,116 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1274, 570);
-            this.splitMx1.SplitterPosition = 144;
+            this.splitMx1.SplitterPosition = 149;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.btnSelect);
+            this.layoutMx1.Controls.Add(this.txt_returnCustomer);
+            this.layoutMx1.Controls.Add(this.txt_salesDept);
+            this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
+            this.layoutMx1.Controls.Add(this.txt_salesOrg);
             this.layoutMx1.Controls.Add(this.txt_fHasLinkRad);
             this.layoutMx1.Controls.Add(this.txt_fstockid);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_wjStatus);
             this.layoutMx1.Controls.Add(this.txt_chkStatus);
             this.layoutMx1.Controls.Add(this.txt_billType);
-            this.layoutMx1.Controls.Add(this.txt_salesOrderId);
             this.layoutMx1.Controls.Add(this.txt_approvedDate);
             this.layoutMx1.Controls.Add(this.txt_id);
             this.layoutMx1.Controls.Add(this.txt_approvedBy);
-            this.layoutMx1.Controls.Add(this.txt_xsOrgName);
-            this.layoutMx1.Controls.Add(this.txt_inventoryOrg);
             this.layoutMx1.Controls.Add(this.txt_modifiedDate);
             this.layoutMx1.Controls.Add(this.txt_billNo);
             this.layoutMx1.Controls.Add(this.txt_salerName);
             this.layoutMx1.Controls.Add(this.txt_modifiedBy);
             this.layoutMx1.Controls.Add(this.txt_saleDeptName);
-            this.layoutMx1.Controls.Add(this.txt_custName);
             this.layoutMx1.Controls.Add(this.txt_createdDate);
             this.layoutMx1.Controls.Add(this.txt_returnReason);
             this.layoutMx1.Controls.Add(this.txt_createdBy);
+            this.layoutMx1.Controls.Add(this.textEdit1);
+            this.layoutMx1.Controls.Add(this.textEdit2);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem19,
             this.layoutControlItem1,
             this.layoutControlItem12,
             this.layoutControlItem11,
-            this.layoutControlItem3,
-            this.layoutControlItem18});
+            this.layoutControlItem18,
+            this.layoutControlItem6,
+            this.layoutControlItem13,
+            this.layoutControlItem14});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(620, 530, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1274, 144);
+            this.layoutMx1.Size = new System.Drawing.Size(1274, 149);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            this.btnSelect.Location = new System.Drawing.Point(12, 108);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(126, 27);
+            this.btnSelect.StyleController = this.layoutMx1;
+            this.btnSelect.TabIndex = 541;
+            this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
+            // 
+            // txt_returnCustomer
+            // 
+            this.txt_returnCustomer.IsReadly = false;
+            this.txt_returnCustomer.Location = new System.Drawing.Point(397, 44);
+            this.txt_returnCustomer.Name = "txt_returnCustomer";
+            this.txt_returnCustomer.Size = new System.Drawing.Size(237, 24);
+            this.txt_returnCustomer.TabIndex = 539;
+            // 
+            // txt_salesDept
+            // 
+            this.txt_salesDept.IsReadly = false;
+            this.txt_salesDept.Location = new System.Drawing.Point(1023, 108);
+            this.txt_salesDept.Name = "txt_salesDept";
+            this.txt_salesDept.Size = new System.Drawing.Size(239, 24);
+            this.txt_salesDept.TabIndex = 538;
+            // 
+            // txt_inventoryOrg
+            // 
+            this.txt_inventoryOrg.IsReadly = false;
+            this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 108);
+            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
+            this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
+            this.txt_inventoryOrg.TabIndex = 537;
+            // 
+            // txt_salesOrg
+            // 
+            this.txt_salesOrg.IsReadly = false;
+            this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
+            this.txt_salesOrg.Name = "txt_salesOrg";
+            this.txt_salesOrg.Size = new System.Drawing.Size(237, 24);
+            this.txt_salesOrg.TabIndex = 535;
             // 
             // txt_fHasLinkRad
             // 
             this.txt_fHasLinkRad.EditValue = "1";
-            this.txt_fHasLinkRad.Location = new System.Drawing.Point(84, 42);
+            this.txt_fHasLinkRad.Location = new System.Drawing.Point(397, 106);
             this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
             this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
             new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
             this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.txt_fHasLinkRad.Size = new System.Drawing.Size(232, 32);
+            this.txt_fHasLinkRad.Size = new System.Drawing.Size(237, 33);
             this.txt_fHasLinkRad.StyleController = this.layoutMx1;
             this.txt_fHasLinkRad.TabIndex = 534;
             // 
             // txt_fstockid
             // 
             this.txt_fstockid.IsReadly = false;
-            this.txt_fstockid.Location = new System.Drawing.Point(392, 76);
+            this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
             this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fstockid.Name = "txt_fstockid";
-            this.txt_fstockid.Size = new System.Drawing.Size(232, 24);
+            this.txt_fstockid.Size = new System.Drawing.Size(237, 24);
             this.txt_fstockid.TabIndex = 454;
             // 
             // lbGuid
@@ -792,10 +833,10 @@
             // 
             // txt_chkStatus
             // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(628, 108);
+            this.txt_chkStatus.Location = new System.Drawing.Point(951, 76);
             this.txt_chkStatus.Name = "txt_chkStatus";
             this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_chkStatus.Size = new System.Drawing.Size(304, 24);
+            this.txt_chkStatus.Size = new System.Drawing.Size(311, 24);
             this.txt_chkStatus.StyleController = this.layoutMx1;
             this.txt_chkStatus.TabIndex = 452;
             this.txt_chkStatus.Tag = "readonly";
@@ -803,31 +844,23 @@
             // txt_billType
             // 
             this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
-            this.txt_billType.Location = new System.Drawing.Point(392, 44);
+            this.txt_billType.Location = new System.Drawing.Point(397, 12);
             this.txt_billType.Name = "txt_billType";
             this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_billType.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
             this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_billType.Size = new System.Drawing.Size(232, 24);
+            this.txt_billType.Size = new System.Drawing.Size(237, 24);
             this.txt_billType.StyleController = this.layoutMx1;
             this.txt_billType.TabIndex = 451;
             // 
-            // txt_salesOrderId
-            // 
-            this.txt_salesOrderId.IsReadly = false;
-            this.txt_salesOrderId.Location = new System.Drawing.Point(84, 76);
-            this.txt_salesOrderId.Name = "txt_salesOrderId";
-            this.txt_salesOrderId.Size = new System.Drawing.Size(232, 24);
-            this.txt_salesOrderId.TabIndex = 0;
-            // 
             // txt_approvedDate
             // 
-            this.txt_approvedDate.Location = new System.Drawing.Point(1008, 108);
+            this.txt_approvedDate.Location = new System.Drawing.Point(1023, 44);
             this.txt_approvedDate.Name = "txt_approvedDate";
             this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_approvedDate.Size = new System.Drawing.Size(233, 24);
+            this.txt_approvedDate.Size = new System.Drawing.Size(239, 24);
             this.txt_approvedDate.StyleController = this.layoutMx1;
             this.txt_approvedDate.TabIndex = 378;
             this.txt_approvedDate.Tag = "readonly";
@@ -844,37 +877,17 @@
             // 
             // txt_approvedBy
             // 
-            this.txt_approvedBy.Location = new System.Drawing.Point(1008, 76);
+            this.txt_approvedBy.Location = new System.Drawing.Point(1023, 12);
             this.txt_approvedBy.Name = "txt_approvedBy";
             this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_approvedBy.Size = new System.Drawing.Size(233, 24);
+            this.txt_approvedBy.Size = new System.Drawing.Size(239, 24);
             this.txt_approvedBy.StyleController = this.layoutMx1;
             this.txt_approvedBy.TabIndex = 370;
             this.txt_approvedBy.Tag = "readonly";
             // 
-            // txt_xsOrgName
-            // 
-            this.txt_xsOrgName.Location = new System.Drawing.Point(392, 12);
-            this.txt_xsOrgName.Name = "txt_xsOrgName";
-            this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
-            this.txt_xsOrgName.Size = new System.Drawing.Size(232, 24);
-            this.txt_xsOrgName.StyleController = this.layoutMx1;
-            this.txt_xsOrgName.TabIndex = 219;
-            this.txt_xsOrgName.Tag = "readonly";
-            // 
-            // txt_inventoryOrg
-            // 
-            this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12);
-            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
-            this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
-            this.txt_inventoryOrg.StyleController = this.layoutMx1;
-            this.txt_inventoryOrg.TabIndex = 243;
-            this.txt_inventoryOrg.Tag = "readonly";
-            // 
             // txt_modifiedDate
             // 
-            this.txt_modifiedDate.Location = new System.Drawing.Point(1008, 44);
+            this.txt_modifiedDate.Location = new System.Drawing.Point(1008, 42);
             this.txt_modifiedDate.Name = "txt_modifiedDate";
             this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
             this.txt_modifiedDate.Size = new System.Drawing.Size(233, 24);
@@ -887,7 +900,7 @@
             this.txt_billNo.Location = new System.Drawing.Point(84, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(232, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(237, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readonly";
@@ -904,7 +917,7 @@
             // 
             // txt_modifiedBy
             // 
-            this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 12);
+            this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 10);
             this.txt_modifiedBy.Name = "txt_modifiedBy";
             this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
             this.txt_modifiedBy.Size = new System.Drawing.Size(233, 24);
@@ -914,23 +927,13 @@
             // 
             // txt_saleDeptName
             // 
-            this.txt_saleDeptName.Location = new System.Drawing.Point(700, 76);
+            this.txt_saleDeptName.Location = new System.Drawing.Point(710, 76);
             this.txt_saleDeptName.Name = "txt_saleDeptName";
             this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleDeptName.Size = new System.Drawing.Size(232, 24);
+            this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24);
             this.txt_saleDeptName.StyleController = this.layoutMx1;
             this.txt_saleDeptName.TabIndex = 222;
             this.txt_saleDeptName.Tag = "readonly";
-            // 
-            // txt_custName
-            // 
-            this.txt_custName.Location = new System.Drawing.Point(700, 12);
-            this.txt_custName.Name = "txt_custName";
-            this.txt_custName.Properties.Appearance.Options.UseFont = true;
-            this.txt_custName.Size = new System.Drawing.Size(232, 24);
-            this.txt_custName.StyleController = this.layoutMx1;
-            this.txt_custName.TabIndex = 252;
-            this.txt_custName.Tag = "readonly";
             // 
             // txt_createdDate
             // 
@@ -944,10 +947,10 @@
             // 
             // txt_returnReason
             // 
-            this.txt_returnReason.Location = new System.Drawing.Point(84, 108);
+            this.txt_returnReason.Location = new System.Drawing.Point(397, 76);
             this.txt_returnReason.Name = "txt_returnReason";
             this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
-            this.txt_returnReason.Size = new System.Drawing.Size(540, 24);
+            this.txt_returnReason.Size = new System.Drawing.Size(237, 24);
             this.txt_returnReason.StyleController = this.layoutMx1;
             this.txt_returnReason.TabIndex = 235;
             // 
@@ -960,6 +963,24 @@
             this.txt_createdBy.StyleController = this.layoutMx1;
             this.txt_createdBy.TabIndex = 312;
             this.txt_createdBy.Tag = "readonly";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(710, 12);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Size = new System.Drawing.Size(237, 24);
+            this.textEdit1.StyleController = this.layoutMx1;
+            this.textEdit1.TabIndex = 542;
+            this.textEdit1.Tag = "readonly";
+            // 
+            // textEdit2
+            // 
+            this.textEdit2.Location = new System.Drawing.Point(710, 44);
+            this.textEdit2.Name = "textEdit2";
+            this.textEdit2.Size = new System.Drawing.Size(237, 24);
+            this.textEdit2.StyleController = this.layoutMx1;
+            this.textEdit2.TabIndex = 543;
+            this.textEdit2.Tag = "readonly";
             // 
             // layoutControlItem19
             // 
@@ -1004,16 +1025,6 @@
             this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_inventoryOrg;
-            this.layoutControlItem3.Location = new System.Drawing.Point(626, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(313, 32);
-            this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_wjStatus;
@@ -1026,26 +1037,59 @@
             this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem18.TextVisible = false;
             // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_salerName;
+            this.layoutControlItem6.Location = new System.Drawing.Point(616, 32);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem6.Text = "閿�鍞憳鍚�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_modifiedBy;
+            this.layoutControlItem13.Location = new System.Drawing.Point(924, 0);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(309, 32);
+            this.layoutControlItem13.Text = "淇敼浜哄憳";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_modifiedDate;
+            this.layoutControlItem14.Location = new System.Drawing.Point(924, 32);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(309, 32);
+            this.layoutControlItem14.Text = "淇敼鏃堕棿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem2,
-            this.layoutControlItem13,
-            this.layoutControlItem14,
+            this.layoutControlItem4,
             this.layoutControlItem15,
             this.layoutControlItem16,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem21,
-            this.layoutControlItem8,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem10,
+            this.layoutControlItem17,
             this.layoutControlItem20,
+            this.layItem1,
+            this.layoutControlItem3,
+            this.layoutControlItem21,
             this.layoutControlItem9,
-            this.layoutControlItem17});
+            this.layoutControlItem7,
+            this.layoutControlItem2,
+            this.layoutControlItem5,
+            this.layoutControlItem10,
+            this.layItem2,
+            this.layItem3,
+            this.layItem4});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1074,169 +1118,189 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1253, 148);
+            this.Root.Size = new System.Drawing.Size(1274, 149);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_xsOrgName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(308, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem2.Text = "閿�鍞粍缁�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_modifiedBy;
-            this.layoutControlItem13.Location = new System.Drawing.Point(924, 0);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(309, 32);
-            this.layoutControlItem13.Text = "淇敼浜哄憳";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_modifiedDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(924, 32);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(309, 32);
-            this.layoutControlItem14.Text = "淇敼鏃堕棿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_approvedBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(924, 64);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(309, 32);
-            this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_approvedDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(924, 96);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(309, 32);
-            this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_billNo;
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(313, 32);
             this.layoutControlItem4.Text = "鐢宠鍗曞彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem5
+            // layoutControlItem15
             // 
-            this.layoutControlItem5.Control = this.txt_salesOrderId;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem5.Text = "閿�鍞鍗�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem15.Control = this.txt_approvedBy;
+            this.layoutControlItem15.Location = new System.Drawing.Point(939, 0);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(315, 32);
+            this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem21
+            // layoutControlItem16
             // 
-            this.layoutControlItem21.Control = this.txt_fHasLinkRad;
-            this.layoutControlItem21.Location = new System.Drawing.Point(0, 32);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
-            this.layoutControlItem21.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem21.Text = "鏈夋棤婧愬崟";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem16.Control = this.txt_approvedDate;
+            this.layoutControlItem16.Location = new System.Drawing.Point(939, 32);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem16.Size = new System.Drawing.Size(315, 32);
+            this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem8
+            // layoutControlItem17
             // 
-            this.layoutControlItem8.Control = this.txt_custName;
-            this.layoutControlItem8.Location = new System.Drawing.Point(616, 0);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_salerName;
-            this.layoutControlItem6.Location = new System.Drawing.Point(616, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem6.Text = "閿�鍞憳鍚�";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_saleDeptName;
-            this.layoutControlItem7.Location = new System.Drawing.Point(616, 64);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem7.Text = "閿�鍞儴闂�";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_billType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(308, 32);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem17.Control = this.txt_chkStatus;
+            this.layoutControlItem17.Location = new System.Drawing.Point(939, 64);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem17.Size = new System.Drawing.Size(315, 32);
+            this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_fstockid;
-            this.layoutControlItem20.Location = new System.Drawing.Point(308, 64);
+            this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(308, 32);
+            this.layoutControlItem20.Size = new System.Drawing.Size(313, 32);
             this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layItem1
+            // 
+            this.layItem1.Control = this.txt_salesOrg;
+            this.layItem1.Location = new System.Drawing.Point(0, 32);
+            this.layItem1.Name = "layItem1";
+            this.layItem1.OptionsTableLayoutItem.RowIndex = 1;
+            this.layItem1.Size = new System.Drawing.Size(313, 32);
+            this.layItem1.Text = "閿�鍞粍缁�";
+            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.btnSelect;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);
+            this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem3.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layoutControlItem21.Control = this.txt_fHasLinkRad;
+            this.layoutControlItem21.Location = new System.Drawing.Point(313, 96);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
+            this.layoutControlItem21.Size = new System.Drawing.Size(313, 33);
+            this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_returnReason;
             this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem9.Location = new System.Drawing.Point(313, 64);
             this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(616, 32);
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(313, 32);
             this.layoutControlItem9.Text = "鐢宠鍘熷洜";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem17
+            // layoutControlItem7
             // 
-            this.layoutControlItem17.Control = this.txt_chkStatus;
-            this.layoutControlItem17.Location = new System.Drawing.Point(616, 96);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem17.Size = new System.Drawing.Size(308, 32);
-            this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem17.TextVisible = false;
+            this.layoutControlItem7.Control = this.txt_saleDeptName;
+            this.layoutControlItem7.Location = new System.Drawing.Point(626, 64);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem7.Text = "閿�鍞儴闂�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.textEdit1;
+            this.layoutControlItem2.Location = new System.Drawing.Point(626, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem2.Text = "淇敼浜哄憳";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.textEdit2;
+            this.layoutControlItem5.Location = new System.Drawing.Point(626, 32);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem5.Text = "淇敼鏃堕棿";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_billType;
+            this.layoutControlItem10.Location = new System.Drawing.Point(313, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(313, 32);
+            this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layItem2
+            // 
+            this.layItem2.Control = this.txt_returnCustomer;
+            this.layItem2.Location = new System.Drawing.Point(313, 32);
+            this.layItem2.Name = "layItem2";
+            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layItem2.Size = new System.Drawing.Size(313, 32);
+            this.layItem2.Text = "閫�璐у鎴�";
+            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layItem3
+            // 
+            this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layItem3.Control = this.txt_inventoryOrg;
+            this.layItem3.Location = new System.Drawing.Point(626, 96);
+            this.layItem3.Name = "layItem3";
+            this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
+            this.layItem3.Size = new System.Drawing.Size(313, 33);
+            this.layItem3.Text = "搴撳瓨缁勭粐";
+            this.layItem3.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layItem4
+            // 
+            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
+            this.layItem4.Control = this.txt_salesDept;
+            this.layItem4.Location = new System.Drawing.Point(939, 96);
+            this.layItem4.Name = "layItem4";
+            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
+            this.layItem4.Size = new System.Drawing.Size(315, 33);
+            this.layItem4.Text = "閿�鍞儴闂�";
+            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // tabMx
             // 
@@ -1244,7 +1308,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1274, 414);
+            this.tabMx.Size = new System.Drawing.Size(1274, 409);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1254,7 +1318,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.split99);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1272, 382);
+            this.tabMxPage1.Size = new System.Drawing.Size(1272, 377);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // split99
@@ -1274,8 +1338,8 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1272, 382);
-            this.split99.SplitterPosition = 137;
+            this.split99.Size = new System.Drawing.Size(1272, 377);
+            this.split99.SplitterPosition = 132;
             this.split99.TabIndex = 4;
             // 
             // layout99
@@ -1298,7 +1362,7 @@
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1272, 137);
+            this.layout99.Size = new System.Drawing.Size(1272, 132);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -1446,6 +1510,7 @@
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
             this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+            this.txtWlgg.StyleController = this.layout99;
             this.txtWlgg.TabIndex = 218;
             // 
             // txt_kQty
@@ -1657,7 +1722,6 @@
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1,
             this.repositoryItemDateEdit1});
@@ -1670,7 +1734,6 @@
             // 
             this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn2,
             this.gvMx1id,
             this.gvMx1materialId,
             this.gvMx1materialName,
@@ -1692,118 +1755,7 @@
             this.gvMx1.Name = "gvMx1";
             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;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
-            this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn2.Caption = "璇烽�夋嫨";
-            this.gridColumn2.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Tag = "edit";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 94;
-            // 
-            // repositoryItemSearchLookUpEdit1
-            // 
-            this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
-            this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
-            this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
-            this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
-            this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
-            // 
-            // gridView2
-            // 
-            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn4,
-            this.gridColumn5,
-            this.gridColumn6,
-            this.gridColumn7,
-            this.gridColumn8,
-            this.gridColumn9,
-            this.gridColumn10,
-            this.gridColumn11,
-            this.gridColumn23});
-            this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.gridView2.Name = "gridView2";
-            this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.gridView2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "閿�鍞崟鍙�";
-            this.gridColumn4.FieldName = "xsHno";
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 0;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
-            this.gridColumn5.FieldName = "fhNo";
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 1;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn6.FieldName = "itemNo";
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 2;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn7.FieldName = "itemName";
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 3;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn8.FieldName = "itemModel";
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 4;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
-            this.gridColumn9.FieldName = "fhSl";
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 5;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "宸查��鏁伴噺";
-            this.gridColumn10.FieldName = "ytSl";
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 6;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid";
-            this.gridColumn11.FieldName = "ckmxGuid";
-            this.gridColumn11.Name = "gridColumn11";
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "鐗╂枡ID";
-            this.gridColumn23.FieldName = "itemId";
-            this.gridColumn23.Name = "gridColumn23";
             // 
             // gvMx1id
             // 
@@ -1834,7 +1786,7 @@
             this.gvMx1materialName.Name = "gvMx1materialName";
             this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
             this.gvMx1materialName.Visible = true;
-            this.gvMx1materialName.VisibleIndex = 1;
+            this.gvMx1materialName.VisibleIndex = 0;
             this.gvMx1materialName.Width = 94;
             // 
             // gvMx1materialSpecification
@@ -1846,7 +1798,7 @@
             this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
             this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
             this.gvMx1materialSpecification.Visible = true;
-            this.gvMx1materialSpecification.VisibleIndex = 9;
+            this.gvMx1materialSpecification.VisibleIndex = 8;
             this.gvMx1materialSpecification.Width = 94;
             // 
             // gridColumn20
@@ -1856,7 +1808,7 @@
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 2;
+            this.gridColumn20.VisibleIndex = 1;
             this.gridColumn20.Width = 94;
             // 
             // gvMx1salesUnitId
@@ -1868,7 +1820,7 @@
             this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
             this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
             this.gvMx1salesUnitId.Visible = true;
-            this.gvMx1salesUnitId.VisibleIndex = 3;
+            this.gvMx1salesUnitId.VisibleIndex = 2;
             this.gvMx1salesUnitId.Width = 94;
             // 
             // gvMx1salesQuantity
@@ -1880,7 +1832,7 @@
             this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
             this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
             this.gvMx1salesQuantity.Visible = true;
-            this.gvMx1salesQuantity.VisibleIndex = 4;
+            this.gvMx1salesQuantity.VisibleIndex = 3;
             this.gvMx1salesQuantity.Width = 94;
             // 
             // gridColumn32
@@ -1890,7 +1842,7 @@
             this.gridColumn32.MinWidth = 25;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 13;
+            this.gridColumn32.VisibleIndex = 12;
             this.gridColumn32.Width = 94;
             // 
             // gvMx1note
@@ -1906,7 +1858,7 @@
             this.gvMx1note.Name = "gvMx1note";
             this.gvMx1note.Tag = "edit";
             this.gvMx1note.Visible = true;
-            this.gvMx1note.VisibleIndex = 6;
+            this.gvMx1note.VisibleIndex = 5;
             this.gvMx1note.Width = 94;
             // 
             // gridColumn13
@@ -1921,7 +1873,7 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "yz_quantity_0_edit";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 5;
+            this.gridColumn13.VisibleIndex = 4;
             this.gridColumn13.Width = 94;
             // 
             // gvMx1returnDate
@@ -1938,7 +1890,7 @@
             this.gvMx1returnDate.Name = "gvMx1returnDate";
             this.gvMx1returnDate.Tag = "edit";
             this.gvMx1returnDate.Visible = true;
-            this.gvMx1returnDate.VisibleIndex = 7;
+            this.gvMx1returnDate.VisibleIndex = 6;
             this.gvMx1returnDate.Width = 94;
             // 
             // repositoryItemDateEdit1
@@ -1959,7 +1911,7 @@
             this.gvMx1isFree.Name = "gvMx1isFree";
             this.gvMx1isFree.Tag = "query_a.IS_FREE";
             this.gvMx1isFree.Visible = true;
-            this.gvMx1isFree.VisibleIndex = 10;
+            this.gvMx1isFree.VisibleIndex = 9;
             this.gvMx1isFree.Width = 94;
             // 
             // gvMx1returnType
@@ -1976,7 +1928,7 @@
             this.gvMx1returnType.Name = "gvMx1returnType";
             this.gvMx1returnType.Tag = "edit";
             this.gvMx1returnType.Visible = true;
-            this.gvMx1returnType.VisibleIndex = 8;
+            this.gvMx1returnType.VisibleIndex = 7;
             this.gvMx1returnType.Width = 94;
             // 
             // repositoryItemComboBox1
@@ -2007,7 +1959,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 11;
+            this.gridColumn21.VisibleIndex = 10;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -2017,7 +1969,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 12;
+            this.gridColumn22.VisibleIndex = 11;
             this.gridColumn22.Width = 94;
             // 
             // gvMxDel
@@ -2027,7 +1979,7 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 14;
+            this.gvMxDel.VisibleIndex = 13;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -2045,7 +1997,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1272, 382);
+            this.tabMxPage2.Size = new System.Drawing.Size(1272, 377);
             this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
             // 
             // gcMx2
@@ -2054,7 +2006,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(1272, 382);
+            this.gcMx2.Size = new System.Drawing.Size(1272, 377);
             this.gcMx2.TabIndex = 3;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2267,39 +2219,41 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_xsOrgName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2340,8 +2294,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
@@ -2384,7 +2336,6 @@
         private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
         private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
         private DevExpress.XtraEditors.ComboBoxEdit txt_billType;
-        private UserControl.UcLookSales txt_salesOrderId;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_approvedDate;
         private DevExpress.XtraEditors.TextEdit txt_approvedBy;
@@ -2393,40 +2344,22 @@
         private DevExpress.XtraEditors.TextEdit txt_createdDate;
         private DevExpress.XtraEditors.TextEdit txt_createdBy;
         private DevExpress.XtraEditors.TextEdit txt_salerName;
-        private DevExpress.XtraEditors.TextEdit txt_custName;
-        private DevExpress.XtraEditors.TextEdit txt_inventoryOrg;
         private DevExpress.XtraEditors.TextEdit txt_returnReason;
         private DevExpress.XtraEditors.TextEdit txt_saleDeptName;
-        private DevExpress.XtraEditors.TextEdit txt_xsOrgName;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraEditors.TextEdit txt_id;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialName;
@@ -2457,7 +2390,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private UserControl.UcLookCk txt_fstockid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
@@ -2465,9 +2397,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -2505,12 +2434,29 @@
         private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private UserControl.UcLookOrg txt_salesOrg;
+        private UserControl.UcLookDepartment txt_salesDept;
+        private UserControl.UcLookOrg txt_inventoryOrg;
+        private UserControl.UcLookCustomer txt_returnCustomer;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraEditors.SimpleButton btnSelect;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.TextEdit textEdit2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layItem4;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index bee37e3..2ecf0bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,5 +1,6 @@
 using DevExpress.XtraEditors;
 using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sales;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -17,7 +18,9 @@
     {
         string _webServiceName = "SalesReturnManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
-        string _ucCk = "";//鍙戞枡浠撳簱
+        string _ucCk = "";//浠撳簱
+        string _ucKh = "";//瀹㈡埛
+        string _ucBm = "";//閮ㄩ棬
         public Frm_SalesReturnNotice()
         {
             InitializeComponent();
@@ -47,35 +50,6 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            // 璁剧疆閿�鍞崟
-            txt_salesOrderId.getSuppler("", "");
-            this.txt_salesOrderId.EditChanged += (s, e) =>
-            {
-                //鏈夋病鏈夐攢鍞鍗�
-                string _sqGuid = txt_salesOrderId.GetId();
-                if (string.IsNullOrEmpty(_sqGuid))
-                    return;
-                txt_custName.Text = txt_salesOrderId.GetSalesCusName();
-                txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
-                string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
-                txt_fstockid.getSuppler(_xsOrgFid, _ucCk);
-                System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
-                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
-                var json = JsonConvert.SerializeObject(_obj);
-                try
-                {
-                    var strReturn = UtilityHelper.HttpPost("",
-                        "SalesManager/SelectFormFhMx", json);
-                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
-                    var dt = rtn.rtnData.list;
-                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
-                    repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
-                }
-            };
             //鎵撳嵃浜嬩欢
             this.ucBtnPrint1.btnPrintClick += (s, e) =>
             {
@@ -160,8 +134,125 @@
             {
                 Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
             };
+            //閿�鍞粍缁�
+            txt_salesOrg.EditChanged += (s, e) =>
+            {
+                var orgId = txt_salesOrg.GetId();
+                if (string.IsNullOrEmpty(orgId))
+                    return;
+                txt_fstockid.getSuppler(orgId, _ucCk);
+                txt_inventoryOrg.SetIdOrCode(orgId);
+                txt_salesDept.getSuppler(orgId,_ucBm);
+                txt_returnCustomer.getSuppler(orgId,_ucKh);
+            };
+            //閿�鍞儴闂�
+            txt_salesDept.EditChanged += (s, e) =>
+            {
+                var dptId = txt_salesDept.GetId();
+                if (string.IsNullOrEmpty(dptId))
+                    return;
+                txt_saleDeptName.Text=(txt_salesDept.GetName());
+            };
+            //閫夋嫨闇�瑕佺殑鏄庣粏
+            btnSelect.Click += (s, e) =>
+            {
+                if (string.IsNullOrEmpty(this.txt_salesOrg.GetId()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨閿�鍞粍缁囷紒");
+                    return;
+                }
+                if (string.IsNullOrEmpty(this.txt_returnCustomer.GetId()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨瀹㈡埛锛�");
+                    return;
+                }
+                if (txt_fHasLinkRad.SelectedIndex == 0)
+                {
+                    var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
+                    //璧嬪�肩粰鏄庣粏琛�
+                    frm.UpdateParent += (ss, ee) =>
+                    {
+                        try
+                        {
+                            var lst = new List<string>();
+                            lst = ee.StringList;
+                            var _obj = lst;
+                            var strReturn = UtilityHelper.HttpPost("",
+                                _webServiceName + "SelectFormTo",
+                                JsonConvert.SerializeObject(_obj));
+                            var dt = UtilityHelper.ReturnToList(strReturn);
+                            DataTable _newTable = dt.rtnData;
+                            DataTable _oldTable = (DataTable)gcMx1.DataSource;
+                            DataRow[] sourceRows = _newTable.Select();
+                            for (int i = 0; i < sourceRows.Length; i++)
+                            {
+                                _oldTable.ImportRow(sourceRows[i]);
+                            }
+                            gcMx1.BindingContext = new BindingContext();
+                            gcMx1.DataSource = _oldTable;
+                            gcMx1.ForceInitialize();
+                            gvMx1.BestFitColumns();
+                            Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(ex.Message);
+                        }
+                    };
+                    frm.ShowDialog();
+                    return;
+                }
+                if (txt_fHasLinkRad.SelectedIndex == 1)
+                {
+                    var frm2 = new Frm_SalesReturnNoticeSelectLink(this.txt_salesOrg.GetId());
+                    frm2.UpdateParent += (ss, ee) =>
+                    {
+                        try
+                        {
+                            var lst = ee.DynamicList;
+                            DataTable _Table = (DataTable)gcMx1.DataSource;
+                            foreach (dynamic dym in lst)
+                            {
+                                DataRow _row = _Table.NewRow();
+                                _row["guid"] = dym.guid;
+                                _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+                                _row["itemId"] = dym.itemId;
+                                _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+                                _row["itemName"] = dym.itemName;  //鐗╂枡鍚嶇О,
+                                _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+                                _row["xxDw"] = dym.xxDw;
+                                _row["salesQuantity"] = dym.salesQuantity;
+                                _row["isFreeChk"]=dym.isFreeChk;
+                                _row["fhQuantity"] = dym.fhQuantity;
+                                gvMx1.UpdateCurrentRow();
+                                _Table.Rows.Add(_row);
+                            }
+                            gcMx1.BindingContext = new BindingContext();
+                            gcMx1.DataSource = _Table;
+                            gcMx1.ForceInitialize();
+                            gvMx1.CloseEditor();
+                            gvMx1.PostEditor();
+                            gvMx1.UpdateCurrentRow();
+                            gvMx1.BestFitColumns();
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(ex.Message);
+                        }
+                    };
+                    frm2.ShowDialog();
+                    return;
+                }
+            };
+            //婧愬崟浜嬩欢
+            txt_fHasLinkRad.SelectedIndex = 0;
+            setSrm();
+            txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
+            {
+                setSrm();
+            };
         }
-
+      
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -308,9 +399,10 @@
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
             //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
-          
+            setSrm();
+            txt_salesOrg.IsReadly = true;
+            txt_inventoryOrg.IsReadly = true;
             txt_fHasLinkRad.ReadOnly = true;
-            txt_salesOrderId.IsReadly = true;
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -327,7 +419,10 @@
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
-
+            //澧炲姞鏃讹紝榛樿缁勭粐
+            string deftOrg = UtilityHelper.GetFirstOrg(txt_salesOrg);
+            string deftXqOrg = UtilityHelper.GetFirstOrg(txt_inventoryOrg);
+            setSrm();
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -337,36 +432,75 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string djlx = txt_billType.Text.ToString();
-            string FNote = txt_returnReason.Text.ToString();
-            string _sqGuid = txt_salesOrderId.GetId();
-            string ckId = txt_fstockid.GetId();
-            if (string.IsNullOrEmpty(_sqGuid))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞鍗曪紒");
-                txt_salesOrderId.Focus();
-                return;
-            }
+            string _djlx = txt_billType.Text.ToString();
+            string _FNote = txt_returnReason.Text.ToString();
+            string _ckId = txt_fstockid.GetId();
+            int _FIsLink = txt_fHasLinkRad.SelectedIndex;
+            //涓嬮潰鏄棤婧愬崟鐢ㄥ埌鐨�
+            string _salesOrg = txt_salesOrg.GetId();
+            string _inventoryOrg = txt_inventoryOrg.GetId();
+            string _returnCustomer = txt_returnCustomer.GetId().ToString();
+            string _salesDept = txt_salesDept.GetId();
             if (txt_billType.SelectedIndex < 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
                 txt_billType.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(ckId))
+            if (_FIsLink < 0)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨婧愬崟绫诲瀷锛�");
+                txt_fHasLinkRad.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_salesOrg))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞粍缁囷紒");
+                txt_salesOrg.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_returnCustomer))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀹㈡埛锛�");
+                txt_returnCustomer.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_ckId))
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
                 txt_fstockid.Focus();
                 return;
             }
+            //杩欐棤婧愮被鍨嬬殑妫�楠宐eg
+             if (_FIsLink == 1)
+            {
+              
+                if (string.IsNullOrEmpty(_inventoryOrg))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀛樼粍缁囷紒");
+                    txt_inventoryOrg.Focus();
+                    return;
+                }
+              
+                if (string.IsNullOrEmpty(_salesDept))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閮ㄩ棬锛�");
+                    txt_salesDept.Focus();
+                    return;
+                }
+            }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                djlx = djlx,//鍗曟嵁绫诲瀷
-                salesId = _sqGuid,//閿�鍞崟鍙�
-                inRemark = FNote.Trim(),//澶囨敞
-                ckId = ckId,
+                djlx = _djlx,//鍗曟嵁绫诲瀷
+                inRemark = _FNote.Trim(),//澶囨敞
+                ckId = _ckId,
                 FIsLink = txt_fHasLinkRad.SelectedIndex,
+                //涓嬮潰鏄棤婧愮殑
+                salesOrg = _salesOrg,
+                inventoryOrg = _inventoryOrg,
+                returnCustomer = _returnCustomer,
+                salesDept = _salesDept,
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -409,6 +543,7 @@
                         Bz = (row["note"].ToString()),
                         Thlx = (row["returnType"].ToString()),
                         Thrq = (row["returnDate"].ToString()),
+                        ItemId = (row["ItemId"].ToString()),
                     });
                 }
             }
@@ -652,21 +787,7 @@
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
-        private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
-        {
-            SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
-            DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
-            gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
-            gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
-            gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
-            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString());
-            //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
-            gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString());
-            gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
-            gvMx1.CloseEditor();
-            gvMx1.PostEditor();
-            gvMx1.UpdateCurrentRow();
-        }
+       
         /// <summary>
         /// 绉诲嚭鏄庣粏
         /// </summary>
@@ -742,5 +863,23 @@
                 txt_iCount_1.Text = "";
             }
         }
+
+
+        private void setSrm()
+        {
+            int ddd = txt_fHasLinkRad.SelectedIndex;
+            if (ddd == 0)
+            {
+                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            }
+            else
+            {
+                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+
+               
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
new file mode 100644
index 0000000..271309f
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
@@ -0,0 +1,372 @@
+锘縩amespace Gs.DevApp.DevFrm.Sales
+{
+    partial class Frm_SalesReturnNoticeSelect
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+            this.panelControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            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(1128, 639);
+            this.gcMain.TabIndex = 8;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.colChkInt,
+            this.gv_guid,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gv_billNo,
+            this.gv_supplierItemCode,
+            this.gv_supplierItemName,
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn9,
+            this.gv_purchaseUnit,
+            this.gridColumn10,
+            this.gridColumn2,
+            this.gridColumn1,
+            this.gridColumn8,
+            this.gridColumn11,
+            this.gridColumn12});
+            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;
+            // 
+            // colChkInt
+            // 
+            this.colChkInt.Caption = ".";
+            this.colChkInt.FieldName = "chkInt";
+            this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.colChkInt.MinWidth = 25;
+            this.colChkInt.Name = "colChkInt";
+            this.colChkInt.Visible = true;
+            this.colChkInt.VisibleIndex = 0;
+            this.colChkInt.Width = 94;
+            // 
+            // gv_guid
+            // 
+            this.gv_guid.AppearanceCell.Options.UseFont = true;
+            this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+            this.gv_guid.FieldName = "rkmxGuid";
+            this.gv_guid.MinWidth = 50;
+            this.gv_guid.Name = "gv_guid";
+            this.gv_guid.OptionsColumn.AllowEdit = false;
+            this.gv_guid.OptionsColumn.ReadOnly = true;
+            this.gv_guid.Tag = "query_a.guid";
+            this.gv_guid.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "濮斿鏍囪瘑";
+            this.gridColumn3.FieldName = "isWw";
+            this.gridColumn3.MaxWidth = 50;
+            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.ReadOnly = true;
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 11;
+            this.gridColumn3.Width = 50;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鍏ュ簱鍗曞彿";
+            this.gridColumn4.FieldName = "invBillNo";
+            this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 1;
+            this.gridColumn4.Width = 94;
+            // 
+            // gv_billNo
+            // 
+            this.gv_billNo.AppearanceCell.Options.UseFont = true;
+            this.gv_billNo.Caption = "閲囪喘鍗曞彿";
+            this.gv_billNo.FieldName = "cgdh";
+            this.gv_billNo.Name = "gv_billNo";
+            this.gv_billNo.OptionsColumn.AllowEdit = false;
+            this.gv_billNo.OptionsColumn.ReadOnly = true;
+            this.gv_billNo.Tag = "query_a.BILL_NO";
+            this.gv_billNo.Visible = true;
+            this.gv_billNo.VisibleIndex = 10;
+            this.gv_billNo.Width = 110;
+            // 
+            // gv_supplierItemCode
+            // 
+            this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+            this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+            this.gv_supplierItemCode.FieldName = "wlbm";
+            this.gv_supplierItemCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+            this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+            this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+            this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+            this.gv_supplierItemCode.Visible = true;
+            this.gv_supplierItemCode.VisibleIndex = 2;
+            this.gv_supplierItemCode.Width = 100;
+            // 
+            // gv_supplierItemName
+            // 
+            this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+            this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+            this.gv_supplierItemName.FieldName = "wlmc";
+            this.gv_supplierItemName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.gv_supplierItemName.Name = "gv_supplierItemName";
+            this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+            this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+            this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+            this.gv_supplierItemName.Visible = true;
+            this.gv_supplierItemName.VisibleIndex = 3;
+            this.gv_supplierItemName.Width = 120;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn5.FieldName = "wlgg";
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.ReadOnly = true;
+            this.gridColumn5.Width = 250;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
+            this.gridColumn6.FieldName = "rksl";
+            this.gridColumn6.MaxWidth = 50;
+            this.gridColumn6.MinWidth = 50;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.OptionsColumn.ReadOnly = true;
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 50;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鍗曚綅";
+            this.gridColumn7.FieldName = "dwName";
+            this.gridColumn7.MaxWidth = 50;
+            this.gridColumn7.MinWidth = 50;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.ReadOnly = true;
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 50;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "宸查��鏁伴噺";
+            this.gridColumn9.FieldName = "ytsl";
+            this.gridColumn9.MaxWidth = 50;
+            this.gridColumn9.MinWidth = 50;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.OptionsColumn.ReadOnly = true;
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.Width = 50;
+            // 
+            // gv_purchaseUnit
+            // 
+            this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
+            this.gv_purchaseUnit.Caption = "鍙��鏁伴噺";
+            this.gv_purchaseUnit.FieldName = "kt";
+            this.gv_purchaseUnit.MaxWidth = 50;
+            this.gv_purchaseUnit.MinWidth = 50;
+            this.gv_purchaseUnit.Name = "gv_purchaseUnit";
+            this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
+            this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
+            this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
+            this.gv_purchaseUnit.Width = 50;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "渚涘簲鍟�";
+            this.gridColumn10.FieldName = "gysName";
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 9;
+            this.gridColumn10.Width = 125;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鏀舵枡缁勭粐";
+            this.gridColumn2.FieldName = "receivingOrg";
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 12;
+            this.gridColumn2.Width = 250;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鐗╂枡ID";
+            this.gridColumn1.FieldName = "itemId";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.ReadOnly = true;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn8.FieldName = "inType";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 13;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn11.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn11.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn11.Caption = "鍙��鏁伴噺";
+            this.gridColumn11.FieldName = "ktsl";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 7;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "褰撳墠搴撳瓨";
+            this.gridColumn12.FieldName = "kcQty";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 8;
+            this.gridColumn12.Width = 94;
+            // 
+            // panelControl1
+            // 
+            this.panelControl1.Controls.Add(this.btnIn);
+            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelControl1.Location = new System.Drawing.Point(0, 639);
+            this.panelControl1.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(1128, 43);
+            this.panelControl1.TabIndex = 9;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+            this.btnIn.Appearance.Options.UseBackColor = true;
+            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+            this.btnIn.Location = new System.Drawing.Point(1032, 2);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(94, 39);
+            this.btnIn.TabIndex = 4;
+            this.btnIn.Text = "纭畾瀵煎叆";
+            // 
+            // Frm_SalesReturnNoticeSelect
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.Controls.Add(this.gcMain);
+            this.Controls.Add(this.panelControl1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "Frm_SalesReturnNoticeSelect";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "閫夋嫨閫�璐ф槑缁嗭紝鍙樉绀哄彲閫�鏁伴噺澶т簬0鐨�";
+            this.TopMost = true;
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraEditors.PanelControl panelControl1;
+        private DevExpress.XtraEditors.SimpleButton btnIn;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs
new file mode 100644
index 0000000..5d8b687
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs
@@ -0,0 +1,108 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+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.DevFrm.Sales
+{
+    public partial class Frm_SalesReturnNoticeSelect : DevExpress.XtraEditors.XtraForm
+    {
+        private string cusId = "";
+        private string receiveOrgId = "";
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="_suppId">渚涘簲鍟嗙紪鍙� </param>
+        /// <param name="_receiveOrgId">缁勭粐缂栧彿</param>
+        /// <param name="_isWw">2涓哄澶栵紝1涓洪噰璐�</param>
+        public Frm_SalesReturnNoticeSelect(string _cusId, string _receiveOrgId)
+        {
+            InitializeComponent();
+            this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+            this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+            this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+            this.colChkInt.OptionsFilter.AllowFilter = false;
+            this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+            this.cusId = _cusId;
+            this.receiveOrgId = _receiveOrgId;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+            getPageList(1);
+            btnIn.Click += (s, e) =>
+            {
+                gridView1.PostEditor();
+                gridView1.UpdateCurrentRow();
+                var list = new List<string>();
+                DataTable dt = this.gcMain.DataSource as DataTable;
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        string checkBox = dr["chkInt"].ToString();
+                        string _guid = dr["guid"].ToString();
+                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+                        {
+                            list.Add(_guid);
+                        }
+                    }
+                }
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
+            };
+        }
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+        /// <summary>
+        ///     鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage)
+        {
+            getPageList(curPage);
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            var _obj = new
+            {
+                currentPage = curPage,
+                everyPageSize = 999999,
+                sortName = "",
+                keyWhere = "",
+                inCusId = this.cusId,
+                inReceiveOrgId = this.receiveOrgId,
+            };
+            var json = JsonConvert.SerializeObject(_obj);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    "SalesManager/SelectFormFhMx", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = dd.rtnData.list;
+                gcMain.BindingContext = new BindingContext();
+                gcMain.DataSource = dt;
+                gcMain.ForceInitialize();
+                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.resx b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
new file mode 100644
index 0000000..b805315
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
@@ -0,0 +1,221 @@
+锘縩amespace Gs.DevApp.DevFrm.Sales
+{
+    partial class Frm_SalesReturnNoticeSelectLink
+    {
+        /// <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()
+        {
+            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();
+            this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+            this.panelControl2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // panelControl2
+            // 
+            this.panelControl2.Controls.Add(this.gcMain);
+            this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panelControl2.Location = new System.Drawing.Point(0, 0);
+            this.panelControl2.Name = "panelControl2";
+            this.panelControl2.Size = new System.Drawing.Size(855, 691);
+            this.panelControl2.TabIndex = 4;
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Location = new System.Drawing.Point(2, 2);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
+            this.gcMain.Size = new System.Drawing.Size(851, 687);
+            this.gcMain.TabIndex = 6;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 60;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_depotCode,
+            this.gv_depotName,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn4,
+            this.gridColumn3,
+            this.gv_Btn});
+            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;
+            // 
+            // gv_depotCode
+            // 
+            this.gv_depotCode.AppearanceCell.Options.UseFont = true;
+            this.gv_depotCode.Caption = "鐗╂枡ID";
+            this.gv_depotCode.FieldName = "itemId";
+            this.gv_depotCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.gv_depotCode.MinWidth = 50;
+            this.gv_depotCode.Name = "gv_depotCode";
+            this.gv_depotCode.OptionsColumn.AllowEdit = false;
+            this.gv_depotCode.Tag = "query_a.depot_code";
+            this.gv_depotCode.Width = 100;
+            // 
+            // gv_depotName
+            // 
+            this.gv_depotName.AppearanceCell.Options.UseFont = true;
+            this.gv_depotName.Caption = "鐗╂枡缂栫爜";
+            this.gv_depotName.FieldName = "itemNo";
+            this.gv_depotName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.gv_depotName.MinWidth = 50;
+            this.gv_depotName.Name = "gv_depotName";
+            this.gv_depotName.OptionsColumn.AllowEdit = false;
+            this.gv_depotName.Tag = "query_a.depot_name";
+            this.gv_depotName.Visible = true;
+            this.gv_depotName.VisibleIndex = 0;
+            this.gv_depotName.Width = 150;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "浣跨敤缁勭粐";
+            this.gridColumn1.FieldName = "fSubsidiary2";
+            this.gridColumn1.MinWidth = 50;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Tag = "org.FNumber";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 4;
+            this.gridColumn1.Width = 250;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn2.FieldName = "itemName";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn4.FieldName = "itemModel";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 3;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "搴撳瓨";
+            this.gridColumn3.FieldName = "kcQty";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 1;
+            this.gridColumn3.Width = 94;
+            // 
+            // gv_Btn
+            // 
+            this.gv_Btn.Caption = "閫夋嫨";
+            this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gv_Btn.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            this.gv_Btn.MinWidth = 25;
+            this.gv_Btn.Name = "gv_Btn";
+            this.gv_Btn.Visible = true;
+            this.gv_Btn.VisibleIndex = 5;
+            this.gv_Btn.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_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);
+            // 
+            // SelectMesCgthSqLink
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(855, 691);
+            this.Controls.Add(this.panelControl2);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "SelectMesCgthSqLink";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "閫夋嫨鐗╂枡鏃犳簮鍗�";
+            this.TopMost = true;
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+            this.panelControl2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private DevExpress.XtraEditors.PanelControl panelControl2;
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs
new file mode 100644
index 0000000..f638ee5
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.cs
@@ -0,0 +1,115 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+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.DevFrm.Sales
+{
+    public partial class Frm_SalesReturnNoticeSelectLink : DevExpress.XtraEditors.XtraForm
+    {
+        public readonly string _webServiceName = "MesItemsManager/";
+        public string orgId = "";
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="_suppId">渚涘簲鍟�</param>
+        /// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
+        /// <param name="_isWw">鏄惁濮斿</param>
+        public Frm_SalesReturnNoticeSelectLink(string _orgId)
+        {
+            InitializeComponent();
+            this.orgId = _orgId;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+            getPageList(1);
+        }
+
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            var _sbSqlWhere = " and a.FSubsidiary=" + orgId;
+            var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc", "asc", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListSelect", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 閫夋嫨鐗╂枡
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            var rowhandle = gridView1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gridView1.GetDataRow(rowhandle);
+                var itemId = dr["id"].ToString();
+                if (string.IsNullOrEmpty(itemId))
+                {
+                    return;
+                }
+                var list = new List<dynamic>();
+                list.Add(new
+                {
+                    guid = "",
+                    deliveDetailGuid = "",
+                    itemId = dr["id"].ToString(), //鐗╂枡id,
+                    itemNo = dr["itemNo"].ToString(), //鐗╂枡缂栧彿,
+                    itemName = dr["itemName"].ToString(), //鐗╂枡鍚嶇О,
+                    itemModel = dr["itemModel"].ToString(),//瑙勬牸鍨嬪彿,
+                    xxDw = dr["dwName"].ToString(),
+                    salesQuantity = "",
+                    isFreeChk = "0",
+                    fhQuantity = "",
+            });
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+                Close();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
index cd664d1..58ed8ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -37,6 +37,7 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
@@ -55,6 +56,13 @@
             this.txt_qtckdcgy = new DevExpress.XtraEditors.TextEdit();
             this.txt_cgthsqcgy = new DevExpress.XtraEditors.TextEdit();
             this.txt_sctlbfb = new DevExpress.XtraEditors.TextEdit();
+            this.txt_FSalesManId = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -62,15 +70,12 @@
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
             this.splitContainerControl1.Panel1.SuspendLayout();
@@ -87,6 +92,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdcgy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_cgthsqcgy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -94,15 +106,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             this.SuspendLayout();
             // 
             // splitContainerControl1
@@ -122,7 +130,7 @@
             this.splitContainerControl1.Panel2.Text = "Panel2";
             this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitContainerControl1.Size = new System.Drawing.Size(757, 533);
-            this.splitContainerControl1.SplitterPosition = 398;
+            this.splitContainerControl1.SplitterPosition = 459;
             this.splitContainerControl1.TabIndex = 0;
             // 
             // groupControl1
@@ -130,12 +138,13 @@
             this.groupControl1.Controls.Add(this.layoutControl1);
             this.groupControl1.Location = new System.Drawing.Point(22, 31);
             this.groupControl1.Name = "groupControl1";
-            this.groupControl1.Size = new System.Drawing.Size(553, 349);
+            this.groupControl1.Size = new System.Drawing.Size(553, 359);
             this.groupControl1.TabIndex = 0;
             this.groupControl1.Text = "鍩虹閰嶇疆";
             // 
             // layoutControl1
             // 
+            this.layoutControl1.Controls.Add(this.lb_FSalesManId);
             this.layoutControl1.Controls.Add(this.lb_sctlbfb);
             this.layoutControl1.Controls.Add(this.lb_cgthsqcgy);
             this.layoutControl1.Controls.Add(this.lb_qtckdcgy);
@@ -151,20 +160,22 @@
             this.layoutControl1.Controls.Add(this.txt_qtckdcgy);
             this.layoutControl1.Controls.Add(this.txt_cgthsqcgy);
             this.layoutControl1.Controls.Add(this.txt_sctlbfb);
+            this.layoutControl1.Controls.Add(this.txt_FSalesManId);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem7,
             this.layoutControlItem8,
             this.layoutControlItem9,
             this.layoutControlItem10,
-            this.layoutControlItem11,
             this.layoutControlItem13,
-            this.layoutControlItem15});
+            this.layoutControlItem15,
+            this.layoutControlItem17,
+            this.layoutControlItem11});
             this.layoutControl1.Location = new System.Drawing.Point(2, 28);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(924, 201, 812, 500);
             this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(549, 319);
+            this.layoutControl1.Size = new System.Drawing.Size(549, 329);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -188,7 +199,7 @@
             // 
             // lb_qtckdcgy
             // 
-            this.lb_qtckdcgy.Location = new System.Drawing.Point(433, 160);
+            this.lb_qtckdcgy.Location = new System.Drawing.Point(416, 187);
             this.lb_qtckdcgy.Name = "lb_qtckdcgy";
             this.lb_qtckdcgy.Size = new System.Drawing.Size(100, 18);
             this.lb_qtckdcgy.StyleController = this.layoutControl1;
@@ -241,7 +252,7 @@
             // 
             // txt_qtrkdcgy
             // 
-            this.txt_qtrkdcgy.Location = new System.Drawing.Point(174, 49);
+            this.txt_qtrkdcgy.Location = new System.Drawing.Point(174, 46);
             this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
             this.txt_qtrkdcgy.Size = new System.Drawing.Size(363, 24);
             this.txt_qtrkdcgy.StyleController = this.layoutControl1;
@@ -250,7 +261,7 @@
             // btnSave
             // 
             this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
-            this.btnSave.Location = new System.Drawing.Point(12, 271);
+            this.btnSave.Location = new System.Drawing.Point(12, 284);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(96, 27);
             this.btnSave.StyleController = this.layoutControl1;
@@ -259,7 +270,7 @@
             // 
             // txt_qtkg
             // 
-            this.txt_qtkg.Location = new System.Drawing.Point(12, 86);
+            this.txt_qtkg.Location = new System.Drawing.Point(12, 80);
             this.txt_qtkg.Name = "txt_qtkg";
             this.txt_qtkg.Properties.Caption = "榻愬寮�宸�";
             this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
@@ -268,7 +279,7 @@
             // 
             // txt_qtckdllr
             // 
-            this.txt_qtckdllr.Location = new System.Drawing.Point(174, 123);
+            this.txt_qtckdllr.Location = new System.Drawing.Point(174, 114);
             this.txt_qtckdllr.Name = "txt_qtckdllr";
             this.txt_qtckdllr.Size = new System.Drawing.Size(363, 24);
             this.txt_qtckdllr.StyleController = this.layoutControl1;
@@ -276,7 +287,7 @@
             // 
             // txt_qtckdcgy
             // 
-            this.txt_qtckdcgy.Location = new System.Drawing.Point(174, 160);
+            this.txt_qtckdcgy.Location = new System.Drawing.Point(174, 148);
             this.txt_qtckdcgy.Name = "txt_qtckdcgy";
             this.txt_qtckdcgy.Size = new System.Drawing.Size(363, 24);
             this.txt_qtckdcgy.StyleController = this.layoutControl1;
@@ -284,7 +295,7 @@
             // 
             // txt_cgthsqcgy
             // 
-            this.txt_cgthsqcgy.Location = new System.Drawing.Point(174, 197);
+            this.txt_cgthsqcgy.Location = new System.Drawing.Point(174, 182);
             this.txt_cgthsqcgy.Name = "txt_cgthsqcgy";
             this.txt_cgthsqcgy.Size = new System.Drawing.Size(363, 24);
             this.txt_cgthsqcgy.StyleController = this.layoutControl1;
@@ -292,11 +303,90 @@
             // 
             // txt_sctlbfb
             // 
-            this.txt_sctlbfb.Location = new System.Drawing.Point(174, 234);
+            this.txt_sctlbfb.Location = new System.Drawing.Point(174, 216);
             this.txt_sctlbfb.Name = "txt_sctlbfb";
             this.txt_sctlbfb.Size = new System.Drawing.Size(363, 24);
             this.txt_sctlbfb.StyleController = this.layoutControl1;
             this.txt_sctlbfb.TabIndex = 18;
+            // 
+            // txt_FSalesManId
+            // 
+            this.txt_FSalesManId.Location = new System.Drawing.Point(174, 250);
+            this.txt_FSalesManId.Name = "txt_FSalesManId";
+            this.txt_FSalesManId.Size = new System.Drawing.Size(363, 24);
+            this.txt_FSalesManId.StyleController = this.layoutControl1;
+            this.txt_FSalesManId.TabIndex = 20;
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.lb_qtrkdysy;
+            this.layoutControlItem7.Location = new System.Drawing.Point(421, 0);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.Size = new System.Drawing.Size(108, 37);
+            this.layoutControlItem7.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳label";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem7.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.lb_qtrkdcgy;
+            this.layoutControlItem8.Location = new System.Drawing.Point(421, 37);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(108, 37);
+            this.layoutControlItem8.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳label";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem8.TextVisible = false;
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.lb_qtkg;
+            this.layoutControlItem9.Location = new System.Drawing.Point(421, 74);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(108, 37);
+            this.layoutControlItem9.Text = "榻愬寮�宸abel";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.lb_qtckdllr;
+            this.layoutControlItem10.Location = new System.Drawing.Point(421, 111);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(108, 37);
+            this.layoutControlItem10.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉label";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.lb_cgthsqcgy;
+            this.layoutControlItem13.Location = new System.Drawing.Point(421, 185);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem13.Size = new System.Drawing.Size(108, 37);
+            this.layoutControlItem13.Text = "閲囪喘閫�璐х敵璇烽噰璐憳label";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem13.TextVisible = false;
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.lb_sctlbfb;
+            this.layoutControlItem15.Location = new System.Drawing.Point(465, 222);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem15.Size = new System.Drawing.Size(64, 37);
+            this.layoutControlItem15.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳label";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem15.TextVisible = false;
             // 
             // Root
             // 
@@ -309,8 +399,9 @@
             this.layoutControlItem5,
             this.layoutControlItem6,
             this.layoutControlItem12,
-            this.layoutControlItem4,
-            this.layoutControlItem14});
+            this.layoutControlItem14,
+            this.layoutControlItem16,
+            this.layoutControlItem4});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -333,6 +424,8 @@
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition8.Height = 100D;
             rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
@@ -341,8 +434,9 @@
             rowDefinition5,
             rowDefinition6,
             rowDefinition7,
-            rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(549, 319);
+            rowDefinition8,
+            rowDefinition9});
+            this.Root.Size = new System.Drawing.Size(549, 329);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -350,27 +444,27 @@
             this.layoutControlItem1.Control = this.txt_qtrkdysy;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(529, 37);
+            this.layoutControlItem1.Size = new System.Drawing.Size(529, 34);
             this.layoutControlItem1.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(150, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_qtrkdcgy;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 37);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(529, 37);
+            this.layoutControlItem2.Size = new System.Drawing.Size(529, 34);
             this.layoutControlItem2.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(150, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_qtkg;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 74);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 68);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(529, 37);
+            this.layoutControlItem3.Size = new System.Drawing.Size(529, 34);
             this.layoutControlItem3.Text = "榻愬寮�宸�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
@@ -378,139 +472,100 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_qtckdllr;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 111);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 102);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(529, 37);
+            this.layoutControlItem5.Size = new System.Drawing.Size(529, 34);
             this.layoutControlItem5.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(150, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_qtckdcgy;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 148);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 136);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem6.Size = new System.Drawing.Size(529, 37);
+            this.layoutControlItem6.Size = new System.Drawing.Size(529, 34);
             this.layoutControlItem6.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(150, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_cgthsqcgy;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 185);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 170);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem12.Size = new System.Drawing.Size(529, 37);
+            this.layoutControlItem12.Size = new System.Drawing.Size(529, 34);
             this.layoutControlItem12.Text = "閲囪喘閫�璐х敵璇烽噰璐憳";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(150, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_sctlbfb;
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 204);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem14.Size = new System.Drawing.Size(529, 34);
+            this.layoutControlItem14.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(150, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_FSalesManId;
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 238);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem16.Size = new System.Drawing.Size(529, 34);
+            this.layoutControlItem16.Text = "閿�鍞憳";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(150, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.btnSave;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 259);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 272);
             this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
             this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem4.Size = new System.Drawing.Size(529, 40);
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 8;
+            this.layoutControlItem4.Size = new System.Drawing.Size(529, 37);
             this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem4.Text = "纭畾淇濆瓨";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem4.TextVisible = false;
             // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_sctlbfb;
-            this.layoutControlItem14.Location = new System.Drawing.Point(0, 222);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem14.Size = new System.Drawing.Size(529, 37);
-            this.layoutControlItem14.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(150, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.lb_qtkg;
-            this.layoutControlItem9.Location = new System.Drawing.Point(421, 74);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(108, 37);
-            this.layoutControlItem9.Text = "榻愬寮�宸abel";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem9.TextVisible = false;
-            // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.lb_qtckdcgy;
-            this.layoutControlItem11.Location = new System.Drawing.Point(421, 148);
+            this.layoutControlItem11.Location = new System.Drawing.Point(404, 186);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem11.Size = new System.Drawing.Size(108, 37);
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem11.Size = new System.Drawing.Size(104, 31);
             this.layoutControlItem11.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳label";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             // 
-            // layoutControlItem8
+            // lb_FSalesManId
             // 
-            this.layoutControlItem8.Control = this.lb_qtrkdcgy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(421, 37);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(108, 37);
-            this.layoutControlItem8.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳label";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem8.TextVisible = false;
+            this.lb_FSalesManId.Location = new System.Drawing.Point(416, 218);
+            this.lb_FSalesManId.Name = "lb_FSalesManId";
+            this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
+            this.lb_FSalesManId.StyleController = this.layoutControl1;
+            this.lb_FSalesManId.TabIndex = 21;
+            this.lb_FSalesManId.Text = "FSalesManId";
             // 
-            // layoutControlItem7
+            // layoutControlItem17
             // 
-            this.layoutControlItem7.Control = this.lb_qtrkdysy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(421, 0);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(108, 37);
-            this.layoutControlItem7.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳label";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem7.TextVisible = false;
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.lb_sctlbfb;
-            this.layoutControlItem15.Location = new System.Drawing.Point(465, 222);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem15.Size = new System.Drawing.Size(64, 37);
-            this.layoutControlItem15.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳label";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem15.TextVisible = false;
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.lb_cgthsqcgy;
-            this.layoutControlItem13.Location = new System.Drawing.Point(421, 185);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem13.Size = new System.Drawing.Size(108, 37);
-            this.layoutControlItem13.Text = "閲囪喘閫�璐х敵璇烽噰璐憳label";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem13.TextVisible = false;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.lb_qtckdllr;
-            this.layoutControlItem10.Location = new System.Drawing.Point(421, 111);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(108, 37);
-            this.layoutControlItem10.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉label";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem10.TextVisible = false;
+            this.layoutControlItem17.Control = this.lb_FSalesManId;
+            this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
+            this.layoutControlItem17.Location = new System.Drawing.Point(404, 217);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem17.Size = new System.Drawing.Size(104, 31);
+            this.layoutControlItem17.Text = "閿�鍞憳";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem17.TextVisible = false;
             // 
             // Frm_Config
             // 
@@ -536,6 +591,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdcgy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_cgthsqcgy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -543,15 +605,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -582,15 +640,19 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraEditors.LabelControl lb_cgthsqcgy;
         private DevExpress.XtraEditors.TextEdit txt_sctlbfb;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraEditors.LabelControl lb_sctlbfb;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraEditors.TextEdit txt_FSalesManId;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.LabelControl lb_FSalesManId;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index b7f42cd..a10a4d1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -45,12 +45,12 @@
             //閲囪喘閫�璐х敵璇烽噰璐憳
             sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
             sb.Append(" values(newid(),'" + lb_cgthsqcgy.Text.Trim() + "','" + txt_cgthsqcgy.Text.Trim() + "','" + layoutControlItem12.Text.Trim() + "')");
-
             //鐢熶骇閫�鏂欒秴%鍒欒璁″垝瀹℃牳锛屽嵆鎵瑰噯
             sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
             sb.Append(" values(newid(),'" + lb_sctlbfb.Text.Trim() + "','" + txt_sctlbfb.Text.Trim() + "','" + layoutControlItem14.Text.Trim() + "')");
-
-
+            //閿�鍞憳
+            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+            sb.Append(" values(newid(),'" + lb_FSalesManId.Text.Trim() + "','" + txt_FSalesManId.Text.Trim() + "','" + layoutControlItem16.Text.Trim() + "')");
             var _obj = new
             {
                 sql = sb.ToString(),
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 88cfa51..2c9d410 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -37,17 +37,16 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -64,8 +63,6 @@
             this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -75,9 +72,7 @@
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
             this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
@@ -90,14 +85,9 @@
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -170,6 +160,9 @@
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -189,9 +182,7 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
@@ -204,14 +195,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -258,6 +244,9 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -347,8 +336,6 @@
             this.gridColumn26,
             this.gv_suppNo,
             this.gridColumn2,
-            this.gv_depotsCode,
-            this.gridColumn3,
             this.gv_remark,
             this.gv_fstatus,
             this.gridColumn11,
@@ -481,30 +468,6 @@
             this.gridColumn2.VisibleIndex = 9;
             this.gridColumn2.Width = 200;
             // 
-            // gv_depotsCode
-            // 
-            this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
-            this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
-            this.gv_depotsCode.FieldName = "depotsCode";
-            this.gv_depotsCode.MinWidth = 50;
-            this.gv_depotsCode.Name = "gv_depotsCode";
-            this.gv_depotsCode.OptionsColumn.AllowEdit = false;
-            this.gv_depotsCode.Tag = "query_a.depots_code";
-            this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 10;
-            this.gv_depotsCode.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "鏀惰揣浠撳簱鍚嶇О";
-            this.gridColumn3.FieldName = "depotName";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.AllowEdit = false;
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
-            this.gridColumn3.Width = 94;
-            // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
@@ -515,7 +478,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 12;
+            this.gv_remark.VisibleIndex = 10;
             this.gv_remark.Width = 94;
             // 
             // gv_fstatus
@@ -537,7 +500,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 13;
+            this.gridColumn11.VisibleIndex = 11;
             this.gridColumn11.Width = 94;
             // 
             // gv_checkDate
@@ -550,7 +513,7 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 14;
+            this.gv_checkDate.VisibleIndex = 12;
             this.gv_checkDate.Width = 180;
             // 
             // pageBar1
@@ -590,15 +553,13 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1344, 570);
-            this.splitMx1.SplitterPosition = 140;
+            this.splitMx1.SplitterPosition = 103;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_dptName);
             this.layoutMx1.Controls.Add(this.txt_gysNo);
-            this.layoutMx1.Controls.Add(this.txt_depotsCode);
             this.layoutMx1.Controls.Add(this.txt_barcodeProgress);
             this.layoutMx1.Controls.Add(this.txt_paperBillNo);
             this.layoutMx1.Controls.Add(this.txt_billNo);
@@ -615,7 +576,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(638, 441, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1344, 140);
+            this.layoutMx1.Size = new System.Drawing.Size(1344, 103);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -627,48 +588,30 @@
             this.lbGuid.TabIndex = 471;
             this.lbGuid.Text = "lbGuid";
             // 
-            // txt_dptName
-            // 
-            this.txt_dptName.Location = new System.Drawing.Point(445, 42);
-            this.txt_dptName.Name = "txt_dptName";
-            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(225, 24);
-            this.txt_dptName.StyleController = this.layoutMx1;
-            this.txt_dptName.TabIndex = 468;
-            // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(114, 72);
+            this.txt_gysNo.Location = new System.Drawing.Point(114, 40);
             this.txt_gysNo.Name = "txt_gysNo";
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_gysNo.Size = new System.Drawing.Size(219, 24);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
-            // txt_depotsCode
-            // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(445, 72);
-            this.txt_depotsCode.Name = "txt_depotsCode";
-            this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotsCode.Size = new System.Drawing.Size(225, 24);
-            this.txt_depotsCode.StyleController = this.layoutMx1;
-            this.txt_depotsCode.TabIndex = 462;
-            // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 72);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(765, 68);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(220, 24);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
@@ -677,61 +620,61 @@
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(225, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(219, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(114, 42);
+            this.txt_gysName.Location = new System.Drawing.Point(439, 40);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(225, 24);
+            this.txt_gysName.Size = new System.Drawing.Size(220, 24);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(776, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(765, 12);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(225, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(220, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(114, 102);
+            this.txt_remark.Location = new System.Drawing.Point(114, 68);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(556, 24);
+            this.txt_remark.Size = new System.Drawing.Size(545, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(776, 42);
+            this.txt_createDate.Location = new System.Drawing.Point(765, 40);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(225, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(220, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(1005, 12);
+            this.txt_fType.Location = new System.Drawing.Point(989, 12);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(327, 24);
+            this.txt_fType.Size = new System.Drawing.Size(322, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(322, 24);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -753,17 +696,15 @@
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
-            this.layoutControlItem2,
-            this.layoutControlItem3,
             this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem6,
             this.layoutControlItem7,
             this.layoutControlItem8,
-            this.layoutControlItem12,
             this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem13});
+            this.layoutControlItem13,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem12});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -785,14 +726,11 @@
             rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition3.Height = 100D;
             rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
-            rowDefinition3,
-            rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1344, 140);
+            rowDefinition3});
+            this.Root.Size = new System.Drawing.Size(1323, 104);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -800,69 +738,27 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_gysName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 30);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(331, 30);
-            this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_gysNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 60);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(331, 30);
-            this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(325, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem4.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_dptName;
-            this.layoutControlItem5.Location = new System.Drawing.Point(331, 30);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(331, 30);
-            this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_depotsCode;
-            this.layoutControlItem6.Location = new System.Drawing.Point(331, 60);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(331, 30);
-            this.layoutControlItem6.Text = "浠撳簱缂栧彿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(651, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -870,32 +766,21 @@
             // 
             this.layoutControlItem8.Control = this.txt_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(662, 30);
+            this.layoutControlItem8.Location = new System.Drawing.Point(651, 28);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem8.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_remark;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 90);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(662, 30);
-            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(977, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem10.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -903,11 +788,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(993, 30);
+            this.layoutControlItem11.Location = new System.Drawing.Point(977, 28);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem11.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -915,11 +800,11 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
+            this.layoutControlItem13.Location = new System.Drawing.Point(651, 56);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
+            this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -929,7 +814,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1344, 418);
+            this.tabMx.Size = new System.Drawing.Size(1344, 455);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -939,7 +824,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.split99);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 386);
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 423);
             this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
             // 
             // split99
@@ -959,7 +844,7 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1342, 386);
+            this.split99.Size = new System.Drawing.Size(1342, 423);
             this.split99.SplitterPosition = 136;
             this.split99.TabIndex = 2;
             // 
@@ -1036,10 +921,10 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition5,
             columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition4});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
             this.layoutControlGroup2.TextVisible = false;
@@ -1215,16 +1100,16 @@
             columnDefinition8,
             columnDefinition9,
             columnDefinition10});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition6.Height = 100D;
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition7.Height = 100D;
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5,
             rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
+            rowDefinition7});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -1343,7 +1228,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1342, 238);
+            this.gcMx1.Size = new System.Drawing.Size(1342, 275);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1758,6 +1643,38 @@
             this.gridColumn24.VisibleIndex = 11;
             this.gridColumn24.Width = 94;
             // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_gysName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(325, 28);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_gysNo;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remark;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(651, 28);
+            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            // 
             // Frm_ArrivalBarcode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1786,9 +1703,7 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
@@ -1801,14 +1716,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -1855,6 +1765,9 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1875,18 +1788,14 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraEditors.TextEdit txt_dptName;
         private DevExpress.XtraEditors.TextEdit txt_gysNo;
         private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
-        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
         private DevExpress.XtraEditors.TextEdit txt_gysName;
         private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -1894,16 +1803,11 @@
         private DevExpress.XtraEditors.TextEdit txt_createBy;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraEditors.CheckEdit txt_fType;
         private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1981,5 +1885,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 8022b31..16a9333 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -797,6 +797,18 @@
     <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.Designer.cs">
       <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.Designer.cs">
+      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\Sales\Frm_SalesReturnNoticeSelectLink.Designer.cs">
+      <DependentUpon>Frm_SalesReturnNoticeSelectLink.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\Sys\EasyRptEdt.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1792,6 +1804,9 @@
     <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeDj.resx">
       <DependentUpon>Frm_SalesReturnNoticeDj.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\Sales\Frm_SalesReturnNoticeSelect.resx">
+      <DependentUpon>Frm_SalesReturnNoticeSelect.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\Sys\EasyRptEdt.resx">
       <DependentUpon>EasyRptEdt.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3