From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001 From: cdk <2441919651@qq.com> Date: 星期二, 12 八月 2025 13:58:07 +0800 Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient --- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs | 13 DevApp/Gs.DevApp/App.config | 1 DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2 DevApp/Gs.DevApp/UserControl/Toast.cs | 15 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 4 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs | 16 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 731 ++++++++- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 5 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 5 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 124 - DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs | 10 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 4 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 6 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 1 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 165 + DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 13 DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs | 18 DevApp/Gs.DevApp/Gs.DevApp.csproj | 6 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 90 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 127 + DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs | 189 +- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 3 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 423 +++-- DevApp/Gs.DevApp/DevFrm/User/User.cs | 26 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 1 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 67 /dev/null | 123 - DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 25 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 8 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 1 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 81 DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 6 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 35 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs | 376 ++-- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 1039 ++++++++++--- DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 94 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 287 +- DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 59 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 21 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs | 38 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 40 DevApp/Gs.DevApp/DevFrm/User/Role.cs | 28 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 124 + DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 46 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | 30 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 8 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 68 47 files changed, 2,968 insertions(+), 1,634 deletions(-) diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json index 5770b8a..82166e0 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_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\\Frm_UserBindLst.cs"},{"SourceFile":"DevFrm\\PDA\\Frm_UserBindLst.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\\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\\Frm_MesItemTblShow.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesItemTblShow.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\\Frm_PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Rk\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbckDj.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDbckDj.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_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_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":"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.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.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.XtraTreeList.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_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 diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index b236262..de7edef 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -44,6 +44,7 @@ <add key="Version" value="0.1" /> <add key="IsAutoUpdater" value="0" /> <add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" /> + <add key="ToastSeconds" value="3" /> </appSettings> <userSettings> <Gs.DevApp.Properties.Settings> diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs index 1cc22e9..452fc35 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs @@ -30,17 +30,17 @@ 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 rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.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.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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -63,6 +63,7 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -76,7 +77,6 @@ this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.txt_description = new DevExpress.XtraEditors.TextEdit(); this.txt_depottype = new DevExpress.XtraEditors.TextEdit(); - this.txt_remark5 = new DevExpress.XtraEditors.ComboBoxEdit(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); @@ -87,7 +87,6 @@ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -102,7 +101,6 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -130,7 +128,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); @@ -141,7 +138,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -433,6 +429,16 @@ this.gridColumn10.VisibleIndex = 13; this.gridColumn10.Width = 94; // + // gridColumn12 + // + this.gridColumn12.Caption = "鐗规畩浠�"; + this.gridColumn12.FieldName = "remark5"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 12; + this.gridColumn12.Width = 94; + // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -483,7 +489,6 @@ this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_description); this.layoutMx1.Controls.Add(this.txt_depottype); - this.layoutMx1.Controls.Add(this.txt_remark5); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem9, @@ -585,21 +590,6 @@ this.txt_depottype.TabIndex = 231; this.txt_depottype.Tag = "readonly"; // - // txt_remark5 - // - this.txt_remark5.EditValue = "鍚�"; - this.txt_remark5.Location = new System.Drawing.Point(721, 52); - this.txt_remark5.Name = "txt_remark5"; - this.txt_remark5.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.txt_remark5.Properties.Items.AddRange(new object[] { - "鍚�", - "鏄�"}); - this.txt_remark5.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_remark5.Size = new System.Drawing.Size(220, 24); - this.txt_remark5.StyleController = this.layoutMx1; - this.txt_remark5.TabIndex = 292; - // // layoutControlItem9 // this.layoutControlItem9.Control = this.lbGuid; @@ -634,30 +624,29 @@ this.layoutControlItem4, this.layoutControlItem5, this.layoutControlItem7, - this.layoutControlItem8, - this.layoutControlItem10}); + this.layoutControlItem8}); 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}); - rowDefinition3.Height = 100D; - rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition4.Height = 100D; - rowDefinition4.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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition3, - rowDefinition4}); + rowDefinition1, + rowDefinition2}); this.Root.Size = new System.Drawing.Size(1264, 100); this.Root.TextVisible = false; // @@ -732,17 +721,6 @@ this.layoutControlItem8.Size = new System.Drawing.Size(311, 40); this.layoutControlItem8.Text = "绂佺敤鐘舵��"; this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_remark5; - this.layoutControlItem10.Location = new System.Drawing.Point(622, 40); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(311, 40); - this.layoutControlItem10.Text = "鐗规畩浠撳簱"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); // // tabMx // @@ -880,10 +858,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, 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); @@ -897,16 +875,6 @@ this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 5; this.gridColumn11.Width = 94; - // - // gridColumn12 - // - this.gridColumn12.Caption = "鐗规畩浠�"; - this.gridColumn12.FieldName = "remark5"; - this.gridColumn12.MinWidth = 25; - this.gridColumn12.Name = "gridColumn12"; - this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 12; - this.gridColumn12.Width = 94; // // Frm_MesDepot // @@ -944,7 +912,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); @@ -955,7 +922,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1025,8 +991,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; - private DevExpress.XtraEditors.ComboBoxEdit txt_remark5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs index 6349208..43a7424 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs @@ -203,7 +203,6 @@ DepotCode = txt_depotCode.Text, DepotName = txt_depotName.Text, Description = txt_description.Text, - Remark5=txt_remark5.Text.Trim(), list = lst }; try diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs index 77cfe3e..5d2713a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs @@ -66,7 +66,6 @@ this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -100,9 +99,6 @@ this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -111,7 +107,6 @@ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -146,6 +141,10 @@ this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -183,9 +182,6 @@ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); @@ -194,7 +190,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit(); @@ -207,6 +202,10 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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(); this.SuspendLayout(); // // toolBarMenu1 @@ -295,7 +294,6 @@ this.gv_checkDate, this.gv_returnMethod, this.gv_returnType, - this.gv_depotId, this.gv_suppId, this.gv_remark, this.gridColumn7, @@ -441,18 +439,6 @@ this.gv_returnType.VisibleIndex = 9; this.gv_returnType.Width = 94; // - // gv_depotId - // - this.gv_depotId.AppearanceCell.Options.UseFont = true; - this.gv_depotId.Caption = "浠撳簱"; - this.gv_depotId.FieldName = "dptName"; - this.gv_depotId.Name = "gv_depotId"; - this.gv_depotId.OptionsColumn.AllowEdit = false; - this.gv_depotId.Tag = "query_a.DEPOT_ID"; - this.gv_depotId.Visible = true; - this.gv_depotId.VisibleIndex = 10; - this.gv_depotId.Width = 94; - // // gv_suppId // this.gv_suppId.AppearanceCell.Options.UseFont = true; @@ -462,7 +448,7 @@ this.gv_suppId.OptionsColumn.AllowEdit = false; this.gv_suppId.Tag = "query_a.SUPP_ID"; this.gv_suppId.Visible = true; - this.gv_suppId.VisibleIndex = 11; + this.gv_suppId.VisibleIndex = 10; this.gv_suppId.Width = 94; // // gv_remark @@ -474,7 +460,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 = 11; this.gv_remark.Width = 94; // // gridColumn7 @@ -492,7 +478,7 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 13; + this.gridColumn11.VisibleIndex = 12; this.gridColumn11.Width = 94; // // pageBar1 @@ -532,7 +518,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1126, 570); - this.splitMx1.SplitterPosition = 187; + this.splitMx1.SplitterPosition = 166; this.splitMx1.TabIndex = 0; // // layoutMx1 @@ -565,38 +551,38 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1126, 187); + this.layoutMx1.Size = new System.Drawing.Size(1126, 166); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fOwnerIdHead // this.txt_fOwnerIdHead.IsReadly = false; - this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 147); + this.txt_fOwnerIdHead.Location = new System.Drawing.Point(355, 132); this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead"; - this.txt_fOwnerIdHead.Size = new System.Drawing.Size(200, 24); + this.txt_fOwnerIdHead.Size = new System.Drawing.Size(195, 24); this.txt_fOwnerIdHead.TabIndex = 537; // // txt_fPurchaseDeptId // this.txt_fPurchaseDeptId.IsReadly = false; - this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 147); + this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(626, 132); this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId"; - this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(200, 24); + this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(195, 24); this.txt_fPurchaseDeptId.TabIndex = 535; // // txt_fRequireOrgId // this.txt_fRequireOrgId.IsReadly = false; - this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 147); + this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 132); this.txt_fRequireOrgId.Name = "txt_fRequireOrgId"; - this.txt_fRequireOrgId.Size = new System.Drawing.Size(200, 24); + this.txt_fRequireOrgId.Size = new System.Drawing.Size(195, 24); this.txt_fRequireOrgId.TabIndex = 534; // // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; - this.btnSelect.Location = new System.Drawing.Point(12, 108); + this.btnSelect.Location = new System.Drawing.Point(12, 96); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(116, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -615,15 +601,15 @@ // txt_thOrgId // this.txt_thOrgId.IsReadly = false; - this.txt_thOrgId.Location = new System.Drawing.Point(84, 44); + this.txt_thOrgId.Location = new System.Drawing.Point(84, 40); this.txt_thOrgId.Name = "txt_thOrgId"; - this.txt_thOrgId.Size = new System.Drawing.Size(200, 24); + this.txt_thOrgId.Size = new System.Drawing.Size(195, 24); this.txt_thOrgId.TabIndex = 526; // // txt_returnType // this.txt_returnType.EditValue = "-璇烽�夋嫨-"; - this.txt_returnType.Location = new System.Drawing.Point(360, 76); + this.txt_returnType.Location = new System.Drawing.Point(355, 40); this.txt_returnType.Name = "txt_returnType"; this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -635,7 +621,7 @@ "渚涘簲鍟嗙墿鍝佸彿閿欒", "閲囪喘鏂欏彿鍙樻洿"}); this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_returnType.Size = new System.Drawing.Size(200, 24); + this.txt_returnType.Size = new System.Drawing.Size(195, 24); this.txt_returnType.StyleController = this.layoutMx1; this.txt_returnType.TabIndex = 521; // @@ -644,7 +630,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(200, 24); + this.txt_billNo.Size = new System.Drawing.Size(195, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; this.txt_billNo.Tag = "readonly"; @@ -652,7 +638,7 @@ // txt_returnMethod // this.txt_returnMethod.EditValue = "-璇烽�夋嫨-"; - this.txt_returnMethod.Location = new System.Drawing.Point(360, 44); + this.txt_returnMethod.Location = new System.Drawing.Point(355, 12); this.txt_returnMethod.Name = "txt_returnMethod"; this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -661,35 +647,35 @@ "閫�鏂欒ˉ鏂�", "閫�鏂欏苟鎵f"}); this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_returnMethod.Size = new System.Drawing.Size(200, 24); + this.txt_returnMethod.Size = new System.Drawing.Size(195, 24); this.txt_returnMethod.StyleController = this.layoutMx1; this.txt_returnMethod.TabIndex = 520; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(912, 44); + this.txt_checkDate.Location = new System.Drawing.Point(897, 40); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(202, 24); + this.txt_checkDate.Size = new System.Drawing.Size(196, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 226; this.txt_checkDate.Tag = "readonly"; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(636, 76); + this.txt_remark.Location = new System.Drawing.Point(355, 68); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(200, 24); + this.txt_remark.Size = new System.Drawing.Size(195, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 252; // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(912, 12); + this.txt_checkUser.Location = new System.Drawing.Point(897, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(202, 24); + this.txt_checkUser.Size = new System.Drawing.Size(196, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 222; this.txt_checkUser.Tag = "readonly"; @@ -697,56 +683,56 @@ // txt_suppId // this.txt_suppId.IsReadly = false; - this.txt_suppId.Location = new System.Drawing.Point(84, 76); + this.txt_suppId.Location = new System.Drawing.Point(84, 68); this.txt_suppId.Margin = new System.Windows.Forms.Padding(0); this.txt_suppId.Name = "txt_suppId"; - this.txt_suppId.Size = new System.Drawing.Size(200, 24); + this.txt_suppId.Size = new System.Drawing.Size(195, 24); this.txt_suppId.TabIndex = 259; // // txt_isOut // - this.txt_isOut.Location = new System.Drawing.Point(288, 12); + this.txt_isOut.Location = new System.Drawing.Point(554, 68); this.txt_isOut.Name = "txt_isOut"; this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑"; - this.txt_isOut.Size = new System.Drawing.Size(272, 24); + this.txt_isOut.Size = new System.Drawing.Size(267, 24); this.txt_isOut.StyleController = this.layoutMx1; this.txt_isOut.TabIndex = 527; this.txt_isOut.Tag = "readOnly"; // // txt_status // - this.txt_status.Location = new System.Drawing.Point(840, 76); + this.txt_status.Location = new System.Drawing.Point(825, 68); this.txt_status.Name = "txt_status"; this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_status.Size = new System.Drawing.Size(274, 24); + this.txt_status.Size = new System.Drawing.Size(268, 24); this.txt_status.StyleController = this.layoutMx1; this.txt_status.TabIndex = 528; this.txt_status.Tag = "readonly"; // // txt_isFinish // - this.txt_isFinish.Location = new System.Drawing.Point(840, 108); + this.txt_isFinish.Location = new System.Drawing.Point(825, 96); this.txt_isFinish.Name = "txt_isFinish"; this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑"; - this.txt_isFinish.Size = new System.Drawing.Size(274, 24); + this.txt_isFinish.Size = new System.Drawing.Size(268, 24); this.txt_isFinish.StyleController = this.layoutMx1; this.txt_isFinish.TabIndex = 529; this.txt_isFinish.Tag = "readonly"; // // lastUpdateUser // - this.lastUpdateUser.Location = new System.Drawing.Point(636, 12); + this.lastUpdateUser.Location = new System.Drawing.Point(626, 12); this.lastUpdateUser.Name = "lastUpdateUser"; - this.lastUpdateUser.Size = new System.Drawing.Size(200, 24); + this.lastUpdateUser.Size = new System.Drawing.Size(195, 24); this.lastUpdateUser.StyleController = this.layoutMx1; this.lastUpdateUser.TabIndex = 530; this.lastUpdateUser.Tag = "readonly"; // // lastUpdateTime // - this.lastUpdateTime.Location = new System.Drawing.Point(636, 44); + this.lastUpdateTime.Location = new System.Drawing.Point(626, 40); this.lastUpdateTime.Name = "lastUpdateTime"; - this.lastUpdateTime.Size = new System.Drawing.Size(200, 24); + this.lastUpdateTime.Size = new System.Drawing.Size(195, 24); this.lastUpdateTime.StyleController = this.layoutMx1; this.lastUpdateTime.TabIndex = 531; this.lastUpdateTime.Tag = "readonly"; @@ -761,13 +747,13 @@ // // txt_fHasLinkRad // - this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 108); + this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 96); 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", "鏃犳簮鍗�")}); this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0); - this.txt_fHasLinkRad.Size = new System.Drawing.Size(200, 35); + this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 32); this.txt_fHasLinkRad.StyleController = this.layoutMx1; this.txt_fHasLinkRad.TabIndex = 533; // @@ -801,9 +787,6 @@ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, - this.layoutControlItem6, - this.layoutControlItem5, - this.layoutControlItem8, this.layoutControlItem9, this.layoutControlItem10, this.layoutControlItem14, @@ -812,11 +795,14 @@ this.layoutControlItem4, this.layoutControlItem16, this.layoutControlItem12, - this.layoutControlItem7, this.layoutControlItem3, this.layItem1, this.layItem4, - this.layItem2}); + this.layItem2, + this.layoutControlItem5, + this.layoutControlItem6, + this.layoutControlItem7, + this.layoutControlItem8}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -838,7 +824,7 @@ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition3.Height = 100D; rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition4.Height = 39D; + rowDefinition4.Height = 36D; rowDefinition4.SizeType = System.Windows.Forms.SizeType.AutoSize; rowDefinition5.Height = 100D; rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; @@ -848,7 +834,7 @@ rowDefinition3, rowDefinition4, rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1126, 187); + this.Root.Size = new System.Drawing.Size(1105, 168); this.Root.TextVisible = false; // // layoutControlItem1 @@ -856,72 +842,39 @@ 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(276, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(271, 28); this.layoutControlItem1.Text = "鐢宠鍗曞彿"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_thOrgId; - this.layoutControlItem2.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem2.Location = new System.Drawing.Point(0, 28); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(271, 28); this.layoutControlItem2.Text = "閫夋嫨缁勭粐"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_returnType; - this.layoutControlItem6.Location = new System.Drawing.Point(276, 64); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem6.Text = "閫�鏂欏師鍥�"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.txt_returnMethod; - this.layoutControlItem5.Location = new System.Drawing.Point(276, 32); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem5.Text = "閫�鏂欐柟寮�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_isOut; - this.layoutControlItem8.Location = new System.Drawing.Point(276, 0); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem8.Text = "濮斿鏍囪瘑"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem8.TextVisible = false; // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_checkUser; this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳"; - this.layoutControlItem9.Location = new System.Drawing.Point(828, 0); + this.layoutControlItem9.Location = new System.Drawing.Point(813, 0); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem9.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem9.Size = new System.Drawing.Size(272, 28); this.layoutControlItem9.Text = "瀹℃牳浜哄憳"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_checkDate; - this.layoutControlItem10.Location = new System.Drawing.Point(828, 32); + this.layoutControlItem10.Location = new System.Drawing.Point(813, 28); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem10.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem10.Size = new System.Drawing.Size(272, 28); this.layoutControlItem10.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // @@ -929,32 +882,32 @@ // this.layoutControlItem14.Control = this.lastUpdateUser; this.layoutControlItem14.CustomizationFormText = "鏈�鍚庢洿鏂�"; - this.layoutControlItem14.Location = new System.Drawing.Point(552, 0); + this.layoutControlItem14.Location = new System.Drawing.Point(542, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem14.Size = new System.Drawing.Size(271, 28); this.layoutControlItem14.Text = "鏇存柊浜哄憳"; this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.lastUpdateTime; - this.layoutControlItem15.Location = new System.Drawing.Point(552, 32); + this.layoutControlItem15.Location = new System.Drawing.Point(542, 28); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem15.Size = new System.Drawing.Size(271, 28); this.layoutControlItem15.Text = "鏇存柊鏃堕棿"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_status; - this.layoutControlItem11.Location = new System.Drawing.Point(828, 64); + this.layoutControlItem11.Location = new System.Drawing.Point(813, 56); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(278, 32); + this.layoutControlItem11.Size = new System.Drawing.Size(272, 28); this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem11.TextVisible = false; @@ -962,22 +915,22 @@ // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_suppId; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 56); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(271, 28); this.layoutControlItem4.Text = "閫変緵搴斿晢"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.btnSelect; - this.layoutControlItem16.Location = new System.Drawing.Point(0, 96); + this.layoutControlItem16.Location = new System.Drawing.Point(0, 84); this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31); this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(276, 39); + this.layoutControlItem16.Size = new System.Drawing.Size(271, 36); this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem16.Text = "閫�璐ф槑缁�"; this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0); @@ -986,36 +939,25 @@ // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_isFinish; - this.layoutControlItem12.Location = new System.Drawing.Point(828, 96); + this.layoutControlItem12.Location = new System.Drawing.Point(813, 84); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(278, 39); + this.layoutControlItem12.Size = new System.Drawing.Size(272, 36); this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; - // - // layoutControlItem7 - // - this.layoutControlItem7.Control = this.txt_remark; - this.layoutControlItem7.Location = new System.Drawing.Point(552, 64); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(276, 32); - this.layoutControlItem7.Text = "鐢宠澶囨敞"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true; this.layoutControlItem3.Control = this.txt_fHasLinkRad; - this.layoutControlItem3.Location = new System.Drawing.Point(276, 96); + this.layoutControlItem3.Location = new System.Drawing.Point(271, 84); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem3.Size = new System.Drawing.Size(276, 39); + this.layoutControlItem3.Size = new System.Drawing.Size(271, 36); this.layoutControlItem3.Text = "婧愬崟绫诲瀷"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // @@ -1024,10 +966,10 @@ this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; this.layItem1.AppearanceItemCaption.Options.UseBackColor = true; this.layItem1.Control = this.txt_fRequireOrgId; - this.layItem1.Location = new System.Drawing.Point(0, 135); + this.layItem1.Location = new System.Drawing.Point(0, 120); this.layItem1.Name = "layItem1"; this.layItem1.OptionsTableLayoutItem.RowIndex = 4; - this.layItem1.Size = new System.Drawing.Size(276, 32); + this.layItem1.Size = new System.Drawing.Size(271, 28); this.layItem1.Text = "闇�姹傜粍缁�"; this.layItem1.TextSize = new System.Drawing.Size(60, 18); // @@ -1036,11 +978,11 @@ this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; this.layItem4.AppearanceItemCaption.Options.UseBackColor = true; this.layItem4.Control = this.txt_fOwnerIdHead; - this.layItem4.Location = new System.Drawing.Point(276, 135); + this.layItem4.Location = new System.Drawing.Point(271, 120); this.layItem4.Name = "layItem4"; this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1; this.layItem4.OptionsTableLayoutItem.RowIndex = 4; - this.layItem4.Size = new System.Drawing.Size(276, 32); + this.layItem4.Size = new System.Drawing.Size(271, 28); this.layItem4.Text = "璐т富"; this.layItem4.TextSize = new System.Drawing.Size(60, 18); // @@ -1049,11 +991,11 @@ this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue; this.layItem2.AppearanceItemCaption.Options.UseBackColor = true; this.layItem2.Control = this.txt_fPurchaseDeptId; - this.layItem2.Location = new System.Drawing.Point(552, 135); + this.layItem2.Location = new System.Drawing.Point(542, 120); this.layItem2.Name = "layItem2"; this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2; this.layItem2.OptionsTableLayoutItem.RowIndex = 4; - this.layItem2.Size = new System.Drawing.Size(276, 32); + this.layItem2.Size = new System.Drawing.Size(271, 28); this.layItem2.Text = "閲囪喘閮ㄩ棬"; this.layItem2.TextSize = new System.Drawing.Size(60, 18); // @@ -1063,7 +1005,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, 371); + this.tabMx.Size = new System.Drawing.Size(1126, 392); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1072,7 +1014,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 339); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 360); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -1084,7 +1026,7 @@ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, this.rptCk}); - this.gcMx1.Size = new System.Drawing.Size(1124, 339); + this.gcMx1.Size = new System.Drawing.Size(1124, 360); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1392,6 +1334,50 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.txt_returnMethod; + this.layoutControlItem5.Location = new System.Drawing.Point(271, 0); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem5.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem5.Text = "閫�鏂欐柟寮�"; + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_returnType; + this.layoutControlItem6.Location = new System.Drawing.Point(271, 28); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem6.Text = "閫�鏂欏師鍥�"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem7 + // + this.layoutControlItem7.Control = this.txt_remark; + this.layoutControlItem7.Location = new System.Drawing.Point(271, 56); + this.layoutControlItem7.Name = "layoutControlItem7"; + this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem7.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem7.Text = "鐢宠澶囨敞"; + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + this.layoutControlItem8.Control = this.txt_isOut; + this.layoutControlItem8.Location = new System.Drawing.Point(542, 56); + this.layoutControlItem8.Name = "layoutControlItem8"; + this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem8.Size = new System.Drawing.Size(271, 28); + this.layoutControlItem8.Text = "濮斿鏍囪瘑"; + this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem8.TextVisible = false; + // // Frm_MesCgthSq // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1439,9 +1425,6 @@ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); @@ -1450,7 +1433,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit(); @@ -1463,6 +1445,10 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).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(); this.ResumeLayout(false); } @@ -1485,7 +1471,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod; private DevExpress.XtraGrid.Columns.GridColumn gv_returnType; - private DevExpress.XtraGrid.Columns.GridColumn gv_depotId; private DevExpress.XtraGrid.Columns.GridColumn gv_suppId; private DevExpress.XtraGrid.Columns.GridColumn gv_remark; private UserControls.Data.UcPageBar pageBar1; @@ -1506,9 +1491,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraEditors.CheckEdit txt_isOut; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraEditors.CheckEdit txt_status; private DevExpress.XtraEditors.CheckEdit txt_isFinish; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; @@ -1554,7 +1536,6 @@ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad; private UserControl.UcLookDepartment txt_fPurchaseDeptId; private UserControl.UcLookOrg txt_fRequireOrgId; @@ -1564,5 +1545,9 @@ private DevExpress.XtraLayout.LayoutControlItem layItem1; private DevExpress.XtraLayout.LayoutControlItem layItem4; private DevExpress.XtraLayout.LayoutControlItem layItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs index c4f3cff..d7314bc 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs @@ -375,7 +375,7 @@ // this.gv_depotCode.AppearanceCell.Options.UseFont = true; this.gv_depotCode.Caption = "閫�鏂欎粨搴�"; - this.gv_depotCode.FieldName = "depotCode"; + this.gv_depotCode.FieldName = "ckCode"; this.gv_depotCode.Name = "gv_depotCode"; this.gv_depotCode.OptionsColumn.AllowEdit = false; this.gv_depotCode.Tag = "query_a.depot_code"; @@ -1314,8 +1314,6 @@ this.gvMx1ebelnK3id.FieldName = "ebelnK3id"; this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id"; this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID"; - this.gvMx1ebelnK3id.Visible = true; - this.gvMx1ebelnK3id.VisibleIndex = 8; this.gvMx1ebelnK3id.Width = 94; // // gvMx1lineK3id @@ -1325,8 +1323,6 @@ this.gvMx1lineK3id.FieldName = "lineK3id"; this.gvMx1lineK3id.Name = "gvMx1lineK3id"; this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID"; - this.gvMx1lineK3id.Visible = true; - this.gvMx1lineK3id.VisibleIndex = 9; this.gvMx1lineK3id.Width = 94; // // gridColumn16 @@ -1336,7 +1332,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 10; + this.gridColumn16.VisibleIndex = 8; this.gridColumn16.Width = 94; // // gridColumn17 @@ -1346,7 +1342,7 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 11; + this.gridColumn17.VisibleIndex = 9; this.gridColumn17.Width = 94; // // picCheckBox diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs index 97817f7..a24636d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs @@ -666,13 +666,12 @@ // // txt_qt019 // - this.txt_qt019.EditValue = "璇烽�夋嫨"; + this.txt_qt019.EditValue = "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)"; this.txt_qt019.Location = new System.Drawing.Point(390, 12); this.txt_qt019.Name = "txt_qt019"; this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_qt019.Properties.Items.AddRange(new object[] { - "璇烽�夋嫨", "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)", "璧勪骇鍑哄簱(QTCKD02_SYS)", "VMI鍑哄簱(QTCKD03_SYS)", diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs index 1c7742e..f0d6a28 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs @@ -39,7 +39,7 @@ toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; - this.toolBarMenu1.getXmlConfig(); + this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) => { @@ -76,7 +76,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } }; //閫夋嫨棰嗙敤缁勭粐 @@ -178,7 +178,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck"); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -196,17 +196,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -243,7 +245,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck"); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -393,7 +395,7 @@ { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - + if (_rtn.rtnCode > 0) { ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); @@ -459,7 +461,7 @@ } } - + /// <summary> /// 璇诲彇 /// </summary> @@ -471,7 +473,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -519,11 +521,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -610,7 +612,7 @@ { _toolCk(41); } - + /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> @@ -644,13 +646,14 @@ case 41: strMsg = "閲囪喘鍙嶅鏍�"; break; - }; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_qtck, gridView1, "qtck"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -666,9 +669,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -677,10 +680,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "isChk", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e) @@ -731,13 +736,14 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + getModel(lbGuid.Text); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } @@ -770,6 +776,6 @@ frm.ShowDialog(); } - + } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs index faf52d1..acc8db9 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs @@ -55,6 +55,7 @@ this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -115,7 +116,6 @@ this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -276,7 +276,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "org.fnamber"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 2; + this.gridColumn13.VisibleIndex = 6; this.gridColumn13.Width = 250; // // gv_status @@ -316,7 +316,7 @@ this.gv_itemOutNo.OptionsColumn.AllowEdit = false; this.gv_itemOutNo.Tag = "query_a.item_out_no"; this.gv_itemOutNo.Visible = true; - this.gv_itemOutNo.VisibleIndex = 4; + this.gv_itemOutNo.VisibleIndex = 2; this.gv_itemOutNo.Width = 100; // // gv_suppNo @@ -328,7 +328,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; - this.gv_suppNo.VisibleIndex = 5; + this.gv_suppNo.VisibleIndex = 4; this.gv_suppNo.Width = 94; // // gridColumn1 @@ -337,7 +337,7 @@ this.gridColumn1.FieldName = "suppName"; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 6; + this.gridColumn1.VisibleIndex = 5; this.gridColumn1.Width = 94; // // gridColumn3 @@ -413,6 +413,16 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Width = 94; + // + // gridColumn7 + // + this.gridColumn7.Caption = "鍒拌揣鍗曞彿"; + this.gridColumn7.FieldName = "taskNo"; + this.gridColumn7.MinWidth = 25; + this.gridColumn7.Name = "gridColumn7"; + this.gridColumn7.Visible = true; + this.gridColumn7.VisibleIndex = 3; + this.gridColumn7.Width = 94; // // pageBar1 // @@ -1096,16 +1106,6 @@ this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.Size = new System.Drawing.Size(138, 73); this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20); - // - // gridColumn7 - // - this.gridColumn7.Caption = "鍒拌揣鍗曞彿"; - this.gridColumn7.FieldName = "taskNo"; - this.gridColumn7.MinWidth = 25; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 3; - this.gridColumn7.Width = 94; // // Frm_MesYanTui // diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs index 9243711..eeb3986 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs @@ -184,7 +184,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void getModel(string strGuid) @@ -194,7 +194,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -254,11 +254,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -297,9 +297,10 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -308,6 +309,8 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs index a23cc49..83cda47 100644 --- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs @@ -505,7 +505,7 @@ } //褰撲笉鍚堟牸鏃剁殑妫�鏌� string _txt_fngHandle = txt_fngHandle.Text.Trim(); - string _txt_fmrmode = txt_fmrmode.SelectedText.Trim(); + string _txt_fmrmode = txt_fmrmode.Text.Trim(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_zrType = txt_zrType.Text.Trim(); @@ -944,7 +944,7 @@ return; } string _txt_fngHandle = txt_fngHandle.Text.Trim(); - string _txt_fmrmode = txt_fmrmode.SelectedText.Trim(); + string _txt_fmrmode = txt_fmrmode.Text.Trim(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_msg = txt_msg.TextTxt; diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs index abc60a4..c7a3bc0 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs @@ -515,7 +515,7 @@ this.gv_lotNo.OptionsColumn.AllowEdit = false; this.gv_lotNo.Tag = "query_a.lot_no"; this.gv_lotNo.Visible = true; - this.gv_lotNo.VisibleIndex = 6; + this.gv_lotNo.VisibleIndex = 3; this.gv_lotNo.Width = 120; // // gv_lifnr @@ -553,8 +553,6 @@ this.gv_itemId.Name = "gv_itemId"; this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.item_id"; - this.gv_itemId.Visible = true; - this.gv_itemId.VisibleIndex = 8; this.gv_itemId.Width = 30; // // gv_itemNo @@ -567,7 +565,7 @@ this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_a.item_no"; this.gv_itemNo.Visible = true; - this.gv_itemNo.VisibleIndex = 9; + this.gv_itemNo.VisibleIndex = 8; this.gv_itemNo.Width = 136; // // gv_boardStyle @@ -580,7 +578,7 @@ this.gv_boardStyle.OptionsColumn.AllowEdit = false; this.gv_boardStyle.Tag = "query_a.board_style"; this.gv_boardStyle.Visible = true; - this.gv_boardStyle.VisibleIndex = 10; + this.gv_boardStyle.VisibleIndex = 9; this.gv_boardStyle.Width = 164; // // gridColumn14 @@ -591,7 +589,7 @@ this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.OptionsColumn.ReadOnly = true; this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 11; + this.gridColumn14.VisibleIndex = 10; this.gridColumn14.Width = 200; // // gv_fbatchQty @@ -604,7 +602,7 @@ this.gv_fbatchQty.OptionsColumn.AllowEdit = false; this.gv_fbatchQty.Tag = "query_a.fbatch_qty"; this.gv_fbatchQty.Visible = true; - this.gv_fbatchQty.VisibleIndex = 12; + this.gv_fbatchQty.VisibleIndex = 11; this.gv_fbatchQty.Width = 80; // // gv_fcheckResu @@ -617,7 +615,7 @@ this.gv_fcheckResu.OptionsColumn.AllowEdit = false; this.gv_fcheckResu.Tag = "query_a.fcheck_resu"; this.gv_fcheckResu.Visible = true; - this.gv_fcheckResu.VisibleIndex = 4; + this.gv_fcheckResu.VisibleIndex = 5; this.gv_fcheckResu.Width = 50; // // gv_fcovertQty @@ -642,7 +640,7 @@ this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.remarks"; this.gv_remarks.Visible = true; - this.gv_remarks.VisibleIndex = 13; + this.gv_remarks.VisibleIndex = 12; this.gv_remarks.Width = 100; // // gv_fcheckBy @@ -655,7 +653,7 @@ this.gv_fcheckBy.OptionsColumn.AllowEdit = false; this.gv_fcheckBy.Tag = "query_a.fcheck_by"; this.gv_fcheckBy.Visible = true; - this.gv_fcheckBy.VisibleIndex = 14; + this.gv_fcheckBy.VisibleIndex = 13; this.gv_fcheckBy.Width = 118; // // gv_fcheckDate @@ -668,7 +666,7 @@ this.gv_fcheckDate.OptionsColumn.AllowEdit = false; this.gv_fcheckDate.Tag = "query_a.fcheck_date"; this.gv_fcheckDate.Visible = true; - this.gv_fcheckDate.VisibleIndex = 16; + this.gv_fcheckDate.VisibleIndex = 15; this.gv_fcheckDate.Width = 182; // // gv_createBy @@ -681,7 +679,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 15; + this.gv_createBy.VisibleIndex = 14; this.gv_createBy.Width = 67; // // gridColumn15 @@ -691,7 +689,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 17; + this.gridColumn15.VisibleIndex = 16; this.gridColumn15.Width = 94; // // gv_lastupdateBy @@ -704,7 +702,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; this.gv_lastupdateBy.Visible = true; - this.gv_lastupdateBy.VisibleIndex = 18; + this.gv_lastupdateBy.VisibleIndex = 17; this.gv_lastupdateBy.Width = 60; // // gv_lastupdateDate @@ -717,7 +715,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; this.gv_lastupdateDate.Visible = true; - this.gv_lastupdateDate.VisibleIndex = 19; + this.gv_lastupdateDate.VisibleIndex = 18; this.gv_lastupdateDate.Width = 120; // // gv_fngHandle @@ -730,7 +728,7 @@ this.gv_fngHandle.OptionsColumn.AllowEdit = false; this.gv_fngHandle.Tag = "query_a.fng_handle"; this.gv_fngHandle.Visible = true; - this.gv_fngHandle.VisibleIndex = 5; + this.gv_fngHandle.VisibleIndex = 6; this.gv_fngHandle.Width = 100; // // bandedGridColumn1 @@ -741,7 +739,7 @@ this.bandedGridColumn1.Name = "bandedGridColumn1"; this.bandedGridColumn1.Tag = "org.fnamber"; this.bandedGridColumn1.Visible = true; - this.bandedGridColumn1.VisibleIndex = 20; + this.bandedGridColumn1.VisibleIndex = 19; this.bandedGridColumn1.Width = 250; // // gridColumn18 @@ -751,7 +749,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 21; + this.gridColumn18.VisibleIndex = 20; this.gridColumn18.Width = 94; // // gridColumn19 @@ -761,7 +759,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 22; + this.gridColumn19.VisibleIndex = 21; this.gridColumn19.Width = 94; // // gridColumn17 @@ -779,7 +777,7 @@ this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 23; + this.gridColumn23.VisibleIndex = 22; this.gridColumn23.Width = 94; // // gridColumn30 @@ -798,7 +796,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.ReadOnly = true; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.VisibleIndex = 4; this.gridColumn5.Width = 94; // // gridColumn6 diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs index 6917f0c..e5fee83 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs @@ -62,6 +62,7 @@ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; btnIpt.Click += BtnIpt_Click; btnYcReport.Click += BtnYcReport_Click; + #region 浜旀閲嶉噺 //鍏抽棴鏃堕噴鏀総imer this.Disposed += (s, e) => { @@ -149,6 +150,8 @@ _setWeigth(99, ""); }; + #endregion + } /// <summary> /// 鎻愪氦绉伴噸 @@ -258,7 +261,7 @@ string strGuid = lbGuid.Text.Trim(); if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -280,7 +283,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -293,7 +296,7 @@ int intHandle = this.gvMx1.FocusedRowHandle; if (intHandle < 0) { - ToolBox.MsgHelper.Warning("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒"); + ToolBox.MsgHelper.ShowError("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒"); return; } if (e.KeyCode == Keys.Enter) @@ -342,7 +345,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } @@ -505,7 +508,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo"); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -533,7 +536,7 @@ toolBarMenu1.isSetBtn = false; if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰~鍐欏娉ㄨ鏄庯紒"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰~鍐欏娉ㄨ鏄庯紒"); txt_fngDesc.Focus(); return; } @@ -605,7 +608,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -621,7 +624,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -673,11 +676,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -733,7 +736,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs index d30aee1..6d87553 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs @@ -125,7 +125,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo"); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -139,6 +139,7 @@ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { getPageList(this.pageBar1.CurrentPage); @@ -146,11 +147,12 @@ else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); } - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -187,7 +189,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -231,14 +233,14 @@ toolBarMenu1.isSetBtn = false; if (string.IsNullOrEmpty(txt_sampleSizeNo.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.Warning("鏍囧噯缂栫爜涓嶈兘涓虹┖锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍囧噯缂栫爜涓嶈兘涓虹┖锛�"); txt_sampleSizeNo.Focus(); return; } if (string.IsNullOrEmpty(txt_sampleSizeName.Text.Trim())) { - Gs.DevApp.ToolBox.MsgHelper.Warning("鏍囧噯鍚嶇О涓嶈兘涓虹┖锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍囧噯鍚嶇О涓嶈兘涓虹┖锛�"); txt_sampleSizeName.Focus(); return; } @@ -325,12 +327,12 @@ } if (qmaql2.Count <= 0) { - Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒"); return; } if (qmaql3.Count <= 0) { - Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("鎶芥牱鏂规涓嶈兘涓虹┖锛�"); return; } var _obj = new MesQmAql1 @@ -351,9 +353,10 @@ { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) { + ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; List<GridView> gridViews = new List<GridView>(); @@ -363,10 +366,12 @@ toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } catch (Exception ex) @@ -414,7 +419,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -429,7 +434,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -485,11 +490,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -527,13 +532,17 @@ JsonConvert.SerializeObject(lst)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + getModel(lbGuid.Text); + } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } @@ -570,13 +579,16 @@ JsonConvert.SerializeObject(lst)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + getModel(lbGuid.Text); MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } @@ -596,13 +608,14 @@ case 0: strMsg = "鍙嶅鏍�"; break; - }; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -619,9 +632,9 @@ var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -630,10 +643,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs index 9440399..af362ec 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs @@ -29,18 +29,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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.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.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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -322,8 +322,6 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.AllowEdit = false; this.gridColumn7.Tag = "query_a.ITEM_ID"; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 1; this.gridColumn7.Width = 94; // // gv_itemNo @@ -336,7 +334,7 @@ this.gv_itemNo.OptionsColumn.AllowEdit = false; this.gv_itemNo.Tag = "query_b.item_no"; this.gv_itemNo.Visible = true; - this.gv_itemNo.VisibleIndex = 2; + this.gv_itemNo.VisibleIndex = 1; this.gv_itemNo.Width = 150; // // gridColumn3 @@ -348,7 +346,7 @@ this.gridColumn3.OptionsColumn.AllowEdit = false; this.gridColumn3.Tag = "query_b.item_name"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 3; + this.gridColumn3.VisibleIndex = 2; this.gridColumn3.Width = 250; // // gridColumn2 @@ -361,7 +359,7 @@ this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Tag = "query_b.item_model"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 4; + this.gridColumn2.VisibleIndex = 3; this.gridColumn2.Width = 100; // // gv_foneCheckor @@ -374,7 +372,7 @@ this.gv_foneCheckor.OptionsColumn.AllowEdit = false; this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR"; this.gv_foneCheckor.Visible = true; - this.gv_foneCheckor.VisibleIndex = 5; + this.gv_foneCheckor.VisibleIndex = 4; this.gv_foneCheckor.Width = 94; // // gv_foneCheckdate @@ -387,7 +385,7 @@ this.gv_foneCheckdate.OptionsColumn.AllowEdit = false; this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE"; this.gv_foneCheckdate.Visible = true; - this.gv_foneCheckdate.VisibleIndex = 6; + this.gv_foneCheckdate.VisibleIndex = 5; this.gv_foneCheckdate.Width = 120; // // gridColumn1 @@ -399,7 +397,7 @@ this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Tag = "query_a.CREATE_BY"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 7; + this.gridColumn1.VisibleIndex = 6; this.gridColumn1.Width = 94; // // gridColumn4 @@ -411,7 +409,7 @@ this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Tag = "query_a.CREATE_DATE"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 8; + this.gridColumn4.VisibleIndex = 7; this.gridColumn4.Width = 180; // // gv_memo @@ -424,7 +422,7 @@ this.gv_memo.OptionsColumn.AllowEdit = false; this.gv_memo.Tag = "query_a.MEMO"; this.gv_memo.Visible = true; - this.gv_memo.VisibleIndex = 9; + this.gv_memo.VisibleIndex = 8; this.gv_memo.Width = 150; // // gridColumn16 @@ -444,7 +442,7 @@ this.gridColumn8.OptionsColumn.AllowEdit = false; this.gridColumn8.Tag = "org.fnumber"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 10; + this.gridColumn8.VisibleIndex = 9; this.gridColumn8.Width = 250; // // gridColumn18 @@ -454,7 +452,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 11; + this.gridColumn18.VisibleIndex = 10; this.gridColumn18.Width = 94; // // pageBar1 @@ -678,29 +676,29 @@ this.layoutControlItem6}); 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}); - 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; + 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition4, - rowDefinition5, - rowDefinition6}); + rowDefinition1, + rowDefinition2, + rowDefinition3}); this.Root.Size = new System.Drawing.Size(1127, 113); this.Root.TextVisible = false; // @@ -1143,10 +1141,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, 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); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs index bff9872..57b9eda 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs @@ -48,7 +48,7 @@ txt_ftype.Text = strType; if (strType == QcSeason.iqc.ToString()) { - dfValue = 5; + dfValue = 5; gvMx1.Columns["funit"].Visible = true; gvMx1.Columns["funit"].VisibleIndex = 13; gvMx1.Columns["fcheckType"].Visible = false; @@ -62,7 +62,7 @@ { dfValue = 0; gvMx1.Columns["ypsl"].Visible = false; - + } //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣� if (strType != QcSeason.ipqc宸℃.ToString()) @@ -251,6 +251,8 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } + //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼 + txt_itemId.Enabled = false; } /// <summary> @@ -592,6 +594,7 @@ } if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -601,7 +604,8 @@ Form parentForm = this.FindForm(); UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString()); } - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { @@ -844,12 +848,17 @@ _webServiceName + "DeleteModelMx", JsonConvert.SerializeObject(lst)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + getModel(lbGuid.Text); + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs index 5e48fe7..569737b 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs @@ -59,7 +59,7 @@ } if (_oldTable.Rows.Count <= 0) { - MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); return; } gcMainCopy.BindingContext = new BindingContext(); @@ -72,7 +72,7 @@ int _rows = gvMainCopy.RowCount; if (_rows <= 0) { - MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); e.Cancel = true; return; } @@ -100,15 +100,17 @@ { var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy); } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } }; this.wizardControl1.NextClick += (s, e) => @@ -119,7 +121,7 @@ int _rows = gvMainCopy.RowCount; if (_rows <= 0) { - MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); + MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�"); e.Handled = true; return; } @@ -186,7 +188,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -229,12 +231,12 @@ } else { - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs index 69ce2e2..d660f64 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs @@ -310,7 +310,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 15; + this.gridColumn1.VisibleIndex = 14; this.gridColumn1.Width = 94; // // gridColumn2 @@ -425,8 +425,6 @@ this.gridColumn3.FieldName = "itemId"; this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 14; this.gridColumn3.Width = 94; // // gridColumn17 diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs index 2e3daa0..89348e8 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs @@ -173,7 +173,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -187,7 +187,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -227,11 +227,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -245,27 +245,6 @@ /// <param name="inFieldValue"></param> private void _toolCk(int _inFieldValue) { - //toolBarMenu1.guidKey = ""; - //string rowGuid, rowName; - //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - // lbGuid, txt_fBillNo, gridView1, "fBillNo"); - //toolBarMenu1.guidKey = rowGuid; - //if (string.IsNullOrEmpty(rowGuid)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵")) - // return; - //var frm = new MesQcExceptionalShow(rowGuid); - //frm.UpdateParent += (s, e) => - //{ - // int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); - // gridView1.FocusedRowHandle = rowHandle; - // UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); - //}; - //frm.ShowDialog(); - //return; string strMsg = ""; switch (_inFieldValue) { @@ -297,9 +276,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -308,10 +287,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs index 41affff..216d718 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs @@ -266,7 +266,7 @@ toolBarMenu1.guidKey = rowGuid; if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵")) @@ -280,9 +280,9 @@ { var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -291,10 +291,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs index cf5b2ad..4dbca7e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs @@ -40,6 +40,16 @@ 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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = 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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); 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(); @@ -110,9 +120,6 @@ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -124,8 +131,41 @@ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); + this.lay99 = new DevExpress.XtraLayout.LayoutControl(); + this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); + this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); + this.radOut = new DevExpress.XtraEditors.RadioGroup(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); + this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); + this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); + this.txtWlid = new DevExpress.XtraEditors.TextEdit(); + this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); + this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -151,9 +191,8 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); this.rptBl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); - this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -172,6 +211,8 @@ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); + this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -215,9 +256,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); @@ -229,9 +267,47 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); + this.split99.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit(); + this.split99.Panel2.SuspendLayout(); + this.split99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.lay99)).BeginInit(); + this.lay99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); @@ -243,6 +319,8 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -626,6 +704,7 @@ this.layoutMx1.Controls.Add(this.txt_qt033); this.layoutMx1.Controls.Add(this.txt_qt032); this.layoutMx1.Controls.Add(this.txt_qt035); + this.layoutMx1.Controls.Add(this.txt_isIqc); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem12}); @@ -639,7 +718,7 @@ // // txt_qt003 // - this.txt_qt003.Location = new System.Drawing.Point(770, 68); + this.txt_qt003.Location = new System.Drawing.Point(770, 12); this.txt_qt003.Name = "txt_qt003"; this.txt_qt003.Size = new System.Drawing.Size(222, 24); this.txt_qt003.TabIndex = 333; @@ -767,7 +846,7 @@ // // txt_qt005 // - this.txt_qt005.Location = new System.Drawing.Point(770, 12); + this.txt_qt005.Location = new System.Drawing.Point(770, 40); this.txt_qt005.Name = "txt_qt005"; this.txt_qt005.Properties.Appearance.Options.UseFont = true; this.txt_qt005.Size = new System.Drawing.Size(222, 24); @@ -777,7 +856,7 @@ // // txt_qt001 // - this.txt_qt001.Location = new System.Drawing.Point(770, 40); + this.txt_qt001.Location = new System.Drawing.Point(770, 68); this.txt_qt001.Name = "txt_qt001"; this.txt_qt001.Properties.Appearance.Options.UseFont = true; this.txt_qt001.Size = new System.Drawing.Size(222, 24); @@ -875,9 +954,6 @@ this.layoutControlItem8, this.layoutControlItem6, this.layoutControlItem3, - this.layoutControlItem14, - this.layoutControlItem15, - this.layoutControlItem2, this.layoutControlItem13, this.layoutControlItem16, this.layoutControlItem17, @@ -888,7 +964,11 @@ this.layoutControlItem9, this.layoutControlItem11, this.layoutControlItem21, - this.layoutControlItem35}); + this.layoutControlItem35, + this.layoutControlItem2, + this.layoutControlItem15, + this.layoutControlItem14, + this.layoutControlItem36}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1000,39 +1080,6 @@ this.layoutControlItem3.Size = new System.Drawing.Size(328, 28); this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem14 - // - this.layoutControlItem14.Control = this.txt_qt005; - this.layoutControlItem14.CustomizationFormText = "鐢宠浜�"; - this.layoutControlItem14.Location = new System.Drawing.Point(656, 0); - this.layoutControlItem14.Name = "layoutControlItem14"; - this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(328, 28); - this.layoutControlItem14.Text = "鐢宠浜哄憳"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem15 - // - this.layoutControlItem15.Control = this.txt_qt001; - this.layoutControlItem15.Location = new System.Drawing.Point(656, 28); - this.layoutControlItem15.Name = "layoutControlItem15"; - this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem15.Size = new System.Drawing.Size(328, 28); - this.layoutControlItem15.Text = "鐢宠鏃堕棿"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem2 - // - this.layoutControlItem2.Control = this.txt_qt003; - this.layoutControlItem2.Location = new System.Drawing.Point(656, 56); - this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem2.Size = new System.Drawing.Size(328, 29); - this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem13 // @@ -1154,6 +1201,39 @@ this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿"; this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18); // + // layoutControlItem2 + // + this.layoutControlItem2.Control = this.txt_qt003; + this.layoutControlItem2.Location = new System.Drawing.Point(656, 0); + this.layoutControlItem2.Name = "layoutControlItem2"; + this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem2.Size = new System.Drawing.Size(328, 28); + this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷"; + this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem15 + // + this.layoutControlItem15.Control = this.txt_qt001; + this.layoutControlItem15.Location = new System.Drawing.Point(656, 56); + this.layoutControlItem15.Name = "layoutControlItem15"; + this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem15.Size = new System.Drawing.Size(328, 29); + this.layoutControlItem15.Text = "鐢宠鏃堕棿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem14 + // + this.layoutControlItem14.Control = this.txt_qt005; + this.layoutControlItem14.CustomizationFormText = "鐢宠浜�"; + this.layoutControlItem14.Location = new System.Drawing.Point(656, 28); + this.layoutControlItem14.Name = "layoutControlItem14"; + this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem14.Size = new System.Drawing.Size(328, 28); + this.layoutControlItem14.Text = "鐢宠浜哄憳"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1168,10 +1248,410 @@ // // tabMxPage1 // - this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Controls.Add(this.split99); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1330, 334); this.tabMxPage1.Text = "鐗╂枡鏄庣粏"; + // + // split99 + // + this.split99.Dock = System.Windows.Forms.DockStyle.Fill; + this.split99.Horizontal = false; + this.split99.Location = new System.Drawing.Point(0, 0); + this.split99.Name = "split99"; + // + // split99.Panel1 + // + this.split99.Panel1.Controls.Add(this.lay99); + this.split99.Panel1.Text = "Panel1"; + // + // split99.Panel2 + // + 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(1330, 334); + this.split99.SplitterPosition = 131; + this.split99.TabIndex = 2; + // + // lay99 + // + this.lay99.Controls.Add(this.lbMxGuid); + this.lay99.Controls.Add(this.ucBtnPrint1); + this.lay99.Controls.Add(this.radOut); + this.lay99.Controls.Add(this.layoutControl1); + this.lay99.Controls.Add(this.txt_kQty); + this.lay99.Controls.Add(this.txt_psnQty_1); + this.lay99.Controls.Add(this.txtQuantity); + this.lay99.Controls.Add(this.txt_yQty); + this.lay99.Controls.Add(this.txtWlid); + this.lay99.Controls.Add(this.txtWlmc); + this.lay99.Controls.Add(this.txtWlgg); + this.lay99.Dock = System.Windows.Forms.DockStyle.Fill; + this.lay99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem32}); + this.lay99.Location = new System.Drawing.Point(0, 0); + this.lay99.Name = "lay99"; + this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(710, 473, 812, 500); + this.lay99.Root = this.layoutControlGroup1; + this.lay99.Size = new System.Drawing.Size(1330, 131); + this.lay99.TabIndex = 1; + this.lay99.Text = "layoutControl1"; + // + // lbMxGuid + // + this.lbMxGuid.Location = new System.Drawing.Point(1032, 44); + this.lbMxGuid.Name = "lbMxGuid"; + this.lbMxGuid.Size = new System.Drawing.Size(58, 18); + this.lbMxGuid.StyleController = this.lay99; + this.lbMxGuid.TabIndex = 481; + this.lbMxGuid.Text = "lbMxGuid"; + // + // ucBtnPrint1 + // + this.ucBtnPrint1.allClickKey = null; + this.ucBtnPrint1.guidKey = null; + this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48); + this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); + this.ucBtnPrint1.Name = "ucBtnPrint1"; + this.ucBtnPrint1.rptParameter = null; + this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32); + this.ucBtnPrint1.TabIndex = 480; + // + // radOut + // + this.radOut.Location = new System.Drawing.Point(1032, 12); + this.radOut.Margin = new System.Windows.Forms.Padding(0); + this.radOut.Name = "radOut"; + this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; + this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); + this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0); + this.radOut.Size = new System.Drawing.Size(336, 32); + this.radOut.StyleController = this.lay99; + this.radOut.TabIndex = 479; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.txt_iCount_1); + this.layoutControl1.Controls.Add(this.txt_yuliang_1); + this.layoutControl1.Location = new System.Drawing.Point(692, 84); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup2; + this.layoutControl1.Size = new System.Drawing.Size(336, 32); + this.layoutControl1.TabIndex = 478; + this.layoutControl1.Text = "layoutControl1"; + // + // txt_iCount_1 + // + this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; + this.txt_iCount_1.Properties.ReadOnly = true; + this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.StyleController = this.layoutControl1; + this.txt_iCount_1.TabIndex = 228; + // + // txt_yuliang_1 + // + this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Name = "txt_yuliang_1"; + this.txt_yuliang_1.Properties.ReadOnly = true; + this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.StyleController = this.layoutControl1; + this.txt_yuliang_1.TabIndex = 229; + // + // layoutControlGroup2 + // + this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup2.GroupBordersVisible = false; + this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem33, + this.layoutControlItem34}); + this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup2.Name = "layoutControlGroup2"; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition5, + columnDefinition6}); + rowDefinition7.Height = 100D; + rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition7}); + this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); + this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32); + this.layoutControlGroup2.TextVisible = false; + // + // layoutControlItem33 + // + this.layoutControlItem33.Control = this.txt_iCount_1; + this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem33.Name = "layoutControlItem33"; + this.layoutControlItem33.Size = new System.Drawing.Size(168, 32); + this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; + this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem34 + // + this.layoutControlItem34.Control = this.txt_yuliang_1; + this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem34.Name = "layoutControlItem34"; + this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem34.Size = new System.Drawing.Size(168, 32); + this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; + this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); + // + // txt_kQty + // + this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Name = "txt_kQty"; + this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_kQty.Properties.Appearance.Options.UseFont = true; + this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; + this.txt_kQty.Properties.ReadOnly = true; + this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.StyleController = this.lay99; + this.txt_kQty.TabIndex = 224; + // + // txt_psnQty_1 + // + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; + this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.StyleController = this.lay99; + this.txt_psnQty_1.TabIndex = 226; + // + // txtQuantity + // + this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Name = "txtQuantity"; + this.txtQuantity.Properties.Appearance.Options.UseFont = true; + this.txtQuantity.Properties.ReadOnly = true; + this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.StyleController = this.lay99; + this.txtQuantity.TabIndex = 220; + // + // txt_yQty + // + this.txt_yQty.Location = new System.Drawing.Point(454, 48); + this.txt_yQty.Name = "txt_yQty"; + this.txt_yQty.Properties.Appearance.Options.UseFont = true; + this.txt_yQty.Properties.ReadOnly = true; + this.txt_yQty.Size = new System.Drawing.Size(234, 24); + this.txt_yQty.StyleController = this.lay99; + this.txt_yQty.TabIndex = 222; + // + // txtWlid + // + this.txtWlid.Location = new System.Drawing.Point(114, 12); + this.txtWlid.Name = "txtWlid"; + this.txtWlid.Properties.Appearance.Options.UseFont = true; + this.txtWlid.Properties.ReadOnly = true; + this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.StyleController = this.lay99; + this.txtWlid.TabIndex = 214; + // + // txtWlmc + // + this.txtWlmc.Location = new System.Drawing.Point(114, 48); + this.txtWlmc.Name = "txtWlmc"; + this.txtWlmc.Properties.Appearance.Options.UseFont = true; + this.txtWlmc.Properties.ReadOnly = true; + this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.StyleController = this.lay99; + this.txtWlmc.TabIndex = 216; + // + // txtWlgg + // + this.txtWlgg.Location = new System.Drawing.Point(114, 84); + this.txtWlgg.Name = "txtWlgg"; + 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.lay99; + this.txtWlgg.TabIndex = 218; + // + // layoutControlItem32 + // + this.layoutControlItem32.Control = this.lbMxGuid; + this.layoutControlItem32.Location = new System.Drawing.Point(1020, 72); + this.layoutControlItem32.Name = "layoutControlItem32"; + this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem32.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem32.Text = "lbMxGuid"; + this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem32.TextVisible = false; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.GroupBordersVisible = false; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem23, + this.layoutControlItem22, + this.layoutControlItem27, + this.layoutControlItem28, + this.layoutControlItem25, + this.layoutControlItem26, + this.layoutControlItem24, + this.layoutControlItem29, + this.layoutControlItem30, + this.layoutControlItem31}); + this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup1.Name = "Root"; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; + columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition9.Width = 100D; + columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition10.Width = 100D; + this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition7, + columnDefinition8, + columnDefinition9, + columnDefinition10}); + rowDefinition8.Height = 100D; + rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition9.Height = 100D; + rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition10.Height = 100D; + rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition8, + rowDefinition9, + rowDefinition10}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.radOut; + this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem23.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem23.TextVisible = false; + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.layoutControl1; + this.layoutControlItem22.Location = new System.Drawing.Point(680, 72); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem22.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem22.Text = "鎵撳嵃寮犳暟"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem22.TextVisible = false; + // + // layoutControlItem27 + // + this.layoutControlItem27.Control = this.txt_kQty; + this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem27.CustomizationFormText = "鍙墦鍗版�绘暟"; + this.layoutControlItem27.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem27.Name = "layoutControlItem27"; + this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem27.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; + this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_psnQty_1; + this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉$爜鏁伴噺"; + this.layoutControlItem28.Location = new System.Drawing.Point(680, 36); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem28.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem25 + // + this.layoutControlItem25.Control = this.txtQuantity; + this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem25.CustomizationFormText = "鏈鐢宠鎬婚噺"; + this.layoutControlItem25.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem25.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem25.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; + this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.txt_yQty; + this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺"; + this.layoutControlItem26.Location = new System.Drawing.Point(340, 36); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem26.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.txtWlid; + this.layoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜"; + this.layoutControlItem24.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem24.Text = "鐗╂枡缂栫爜"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem29 + // + this.layoutControlItem29.Control = this.txtWlmc; + this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О"; + this.layoutControlItem29.Location = new System.Drawing.Point(0, 36); + this.layoutControlItem29.Name = "layoutControlItem29"; + this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem29.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem29.Text = "鐗╂枡鍚嶇О"; + this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem30 + // + this.layoutControlItem30.Control = this.txtWlgg; + this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; + this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸"; + this.layoutControlItem30.Location = new System.Drawing.Point(0, 72); + this.layoutControlItem30.Name = "layoutControlItem30"; + this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem30.Size = new System.Drawing.Size(680, 36); + this.layoutControlItem30.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.ucBtnPrint1; + this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36); + this.layoutControlItem31.Name = "layoutControlItem31"; + this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem31.Size = new System.Drawing.Size(340, 36); + this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem31.TextVisible = false; // // gcMx1 // @@ -1184,7 +1664,7 @@ this.repositoryItemSearchLookUpEdit1, this.rptBl, this.repositoryItemMemoEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1330, 334); + this.gcMx1.Size = new System.Drawing.Size(1330, 191); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1206,7 +1686,6 @@ this.gvMx1qd009, this.gvMxDel, this.gridColumn29, - this.gridColumn28, this.gridColumn12}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -1410,7 +1889,7 @@ this.gridColumn15.MinWidth = 25; this.gridColumn15.Name = "gridColumn15"; this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 8; + this.gridColumn15.VisibleIndex = 7; this.gridColumn15.Width = 140; // // gridColumn16 @@ -1420,7 +1899,7 @@ this.gridColumn16.MinWidth = 25; this.gridColumn16.Name = "gridColumn16"; this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 9; + this.gridColumn16.VisibleIndex = 8; this.gridColumn16.Width = 140; // // gvMx1qd008 @@ -1434,7 +1913,7 @@ this.gvMx1qd008.OptionsColumn.ReadOnly = true; this.gvMx1qd008.Tag = "query_a.qd008"; this.gvMx1qd008.Visible = true; - this.gvMx1qd008.VisibleIndex = 10; + this.gvMx1qd008.VisibleIndex = 9; this.gvMx1qd008.Width = 140; // // gvMx1qd009 @@ -1448,7 +1927,7 @@ this.gvMx1qd009.OptionsColumn.ReadOnly = true; this.gvMx1qd009.Tag = "query_a.qd009"; this.gvMx1qd009.Visible = true; - this.gvMx1qd009.VisibleIndex = 11; + this.gvMx1qd009.VisibleIndex = 10; this.gvMx1qd009.Width = 140; // // gvMxDel @@ -1458,7 +1937,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 12; + this.gvMxDel.VisibleIndex = 11; this.gvMxDel.Width = 166; // // repositoryItemButtonEdit1 @@ -1474,13 +1953,19 @@ // // gridColumn29 // - this.gridColumn29.Caption = "閫夋嫨"; + this.gridColumn29.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn29.AppearanceCell.Options.UseForeColor = true; + this.gridColumn29.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn29.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn29.Caption = "閫夋嫨涓嶈壇绫诲瀷"; this.gridColumn29.ColumnEdit = this.rptBl; - this.gridColumn29.MinWidth = 25; + this.gridColumn29.FieldName = "qd012"; + this.gridColumn29.MinWidth = 80; this.gridColumn29.Name = "gridColumn29"; + this.gridColumn29.Tag = "edit"; this.gridColumn29.Visible = true; this.gridColumn29.VisibleIndex = 6; - this.gridColumn29.Width = 50; + this.gridColumn29.Width = 80; // // rptBl // @@ -1489,28 +1974,7 @@ this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.rptBl.Name = "rptBl"; - this.rptBl.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick); - // - // gridColumn28 - // - this.gridColumn28.AppearanceCell.ForeColor = System.Drawing.Color.Blue; - this.gridColumn28.AppearanceCell.Options.UseForeColor = true; - this.gridColumn28.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; - this.gridColumn28.AppearanceHeader.Options.UseForeColor = true; - this.gridColumn28.Caption = "涓嶈壇绫诲埆"; - this.gridColumn28.ColumnEdit = this.repositoryItemMemoEdit1; - this.gridColumn28.FieldName = "qd012"; - this.gridColumn28.MinWidth = 25; - this.gridColumn28.Name = "gridColumn28"; - this.gridColumn28.Tag = "edit"; - this.gridColumn28.Visible = true; - this.gridColumn28.VisibleIndex = 7; - this.gridColumn28.Width = 50; - // - // repositoryItemMemoEdit1 - // - this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1"; // // gridColumn12 // @@ -1519,6 +1983,10 @@ this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Width = 50; + // + // repositoryItemMemoEdit1 + // + this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1"; // // xtraTabPage3 // @@ -1710,6 +2178,27 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // txt_isIqc + // + this.txt_isIqc.Location = new System.Drawing.Point(340, 155); + this.txt_isIqc.Name = "txt_isIqc"; + this.txt_isIqc.Properties.Caption = "鏄惁闇�瑕両QC"; + this.txt_isIqc.Size = new System.Drawing.Size(324, 24); + this.txt_isIqc.StyleController = this.layoutMx1; + this.txt_isIqc.TabIndex = 341; + this.txt_isIqc.Tag = "readonly"; + // + // layoutControlItem36 + // + this.layoutControlItem36.Control = this.txt_isIqc; + this.layoutControlItem36.Location = new System.Drawing.Point(328, 143); + this.layoutControlItem36.Name = "layoutControlItem36"; + this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5; + this.layoutControlItem36.Size = new System.Drawing.Size(328, 29); + this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem36.TextVisible = false; + // // Frm_MesItemQtrk // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -1763,9 +2252,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); @@ -1777,9 +2263,47 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).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.split99.Panel1)).EndInit(); + this.split99.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); + this.split99.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit(); + this.split99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.lay99)).EndInit(); + this.lay99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); @@ -1791,6 +2315,8 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit(); this.ResumeLayout(false); } @@ -1888,10 +2414,7 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; private DevExpress.XtraGrid.Columns.GridColumn gridColumn24; private DevExpress.Utils.ToolTipController tips; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private UserControl.UcDictionaryComBox txt_qt003; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; @@ -1912,10 +2435,44 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl; private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1; private DevExpress.XtraEditors.ButtonEdit txt_qt035; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; + private DevExpress.XtraLayout.LayoutControl lay99; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraEditors.SplitContainerControl split99; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraEditors.TextEdit txt_iCount_1; + private DevExpress.XtraEditors.TextEdit txt_yuliang_1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; + private DevExpress.XtraEditors.RadioGroup radOut; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraEditors.TextEdit txt_kQty; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; + private DevExpress.XtraEditors.TextEdit txt_psnQty_1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; + private DevExpress.XtraEditors.TextEdit txtQuantity; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; + private DevExpress.XtraEditors.TextEdit txt_yQty; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; + private DevExpress.XtraEditors.TextEdit txtWlid; + private DevExpress.XtraEditors.TextEdit txtWlmc; + private DevExpress.XtraEditors.TextEdit txtWlgg; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; + private UserControl.UcBtnPrint ucBtnPrint1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; + private DevExpress.XtraEditors.LabelControl lbMxGuid; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; + private DevExpress.XtraEditors.CheckEdit txt_isIqc; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index 8ff0765..f07b552 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -1,4 +1,5 @@ using DevExpress.XtraEditors; +using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.DevFrm.Work; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -24,6 +25,7 @@ public Frm_MesItemQtrk() { InitializeComponent(); + split99.PanelVisibility = SplitPanelVisibility.Panel2; this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; @@ -97,6 +99,91 @@ }; frm.ShowDialog(); }; + //鎵撳嵃浜嬩欢 + this.ucBtnPrint1.btnPrintClick += (s, e) => + { + string rowGuid = lbMxGuid.Text.Trim(); + ucBtnPrint1.guidKey = rowGuid; + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); + txt_iCount_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); + txt_psnQty_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (lbMxGuid.Text.Trim().Length < 10) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + this.ucBtnPrint1.rptParameter = "rpt_Qtrk{" + + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭 + + "," + "" + + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟 + + "," + txt_iCount_1.Text.Trim()//寮犳暟 + + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉$爜鏁伴噺 + + "}"; + txt_iCount_1.Text = ""; + txt_psnQty_1.Text = ""; + }; + //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢 + this.ucBtnPrint1.btnAllClick += (s, e) => + { + string rowGuid = lbMxGuid.Text.Trim(); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.鍏跺畠鍏ュ簱妫�.ToString()); + string strCodeList = ""; + string strAction = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + strAction = ee.Data; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + if (strAction == "print") + { + try + { + string rptParameter = "rpt_Qtrk{" + + "100"//閲嶆墦閮芥槸浼�100锛� + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } + } + }; + gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; + //鎵撳嵃鑷姩璁$畻 + txt_psnQty_1.TextChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); + }; + radOut.SelectedIndexChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); + }; + } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -457,6 +544,7 @@ /// <param name="strGuid"></param> private void getModel(string strGuid) { + gcMx1.DataSource = null; bool isEdit = false; if (toolBarMenu1.currentAction == "add") return; @@ -530,6 +618,11 @@ { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2); } + + if (txt_isIqc.Checked) + split99.PanelVisibility = SplitPanelVisibility.Panel2; + else + split99.PanelVisibility = SplitPanelVisibility.Both; } else ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); @@ -735,6 +828,11 @@ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } + /// <summary> + /// 閫夋嫨涓嶈壇 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) { var rowhandle = gvMx1.FocusedRowHandle; @@ -756,5 +854,34 @@ }; frm.ShowDialog(); } + + private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) + { + if (e.FocusedRowHandle >= 0) + { + DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); + lbMxGuid.Text = row["guid"].ToString(); + ucBtnPrint1.guidKey = row["guid"].ToString(); + txtWlid.Text = row["qd002"].ToString(); + txtWlgg.Text = row["qd004"].ToString(); + txtWlmc.Text = row["qd003"].ToString(); + txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺 + txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 + txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + } + else + { + lbMxGuid.Text = ""; + ucBtnPrint1.guidKey = ""; + txtWlid.Text = ""; + txtWlgg.Text = ""; + txtWlmc.Text = ""; + txtQuantity.Text = ""; + txt_yQty.Text = ""; + txt_kQty.Text = ""; + txt_psnQty_1.Text = ""; + txt_iCount_1.Text = ""; + } + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs deleted file mode 100644 index 71bd03a..0000000 --- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.Designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -锘縰sing Gs.DevApp.ToolBox; - -namespace Gs.DevApp.DevFrm.RkQC -{ - partial class Frm_XsthDetect01 - { - /// <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.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.閿�鍞��璐у叆搴撴.ToString()); - this.SuspendLayout(); - // - // rkDetect011 - // - this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill; - this.rkDetect011.Location = new System.Drawing.Point(0, 0); - this.rkDetect011.Name = "rkDetect011"; - this.rkDetect011.Size = new System.Drawing.Size(1118, 648); - this.rkDetect011.TabIndex = 0; - // - // Frm_RkDetect01 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1118, 648); - this.Controls.Add(this.rkDetect011); - this.Name = "Frm_RkDetect01"; - this.Text = "閿�鍞��璐у叆搴撴"; - this.ResumeLayout(false); - - } - - #endregion - - private RkDetect01 rkDetect011; - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs deleted file mode 100644 index a216eac..0000000 --- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_XsthDetect01.cs +++ /dev/null @@ -1,21 +0,0 @@ -锘縰sing DevExpress.XtraEditors; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Gs.DevApp.DevFrm.RkQC -{ - public partial class Frm_XsthDetect01 : DevExpress.XtraEditors.XtraForm - { - public Frm_XsthDetect01() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs index 02cdb69..166624b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs @@ -38,6 +38,7 @@ 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.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(); @@ -89,7 +90,6 @@ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -97,13 +97,11 @@ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = 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.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -154,6 +152,16 @@ 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(); @@ -191,7 +199,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); @@ -199,13 +206,11 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).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.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -217,6 +222,15 @@ ((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 @@ -306,7 +320,8 @@ this.gridColumn33, this.gridColumn34, this.gridColumn35, - this.gridColumn36}); + this.gridColumn36, + this.gridColumn38}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -317,7 +332,7 @@ // gv_fApproverStaus // this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true; - this.gv_fApproverStaus.Caption = "瀹℃牳鏍囪瘑"; + this.gv_fApproverStaus.Caption = "鍒跺崟瀹℃牳"; this.gv_fApproverStaus.FieldName = "chkStatus"; this.gv_fApproverStaus.MinWidth = 50; this.gv_fApproverStaus.Name = "gv_fApproverStaus"; @@ -334,7 +349,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 1; + this.gridColumn2.VisibleIndex = 2; this.gridColumn2.Width = 94; // // gv_billNo @@ -347,7 +362,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.bill_no"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 2; + this.gv_billNo.VisibleIndex = 3; this.gv_billNo.Width = 94; // // gv_fBillTypeID @@ -360,7 +375,7 @@ this.gv_fBillTypeID.OptionsColumn.AllowEdit = false; this.gv_fBillTypeID.Tag = "query_a.FBillTypeID"; this.gv_fBillTypeID.Visible = true; - this.gv_fBillTypeID.VisibleIndex = 3; + this.gv_fBillTypeID.VisibleIndex = 4; this.gv_fBillTypeID.Width = 94; // // gv_fSaleOrgId @@ -373,7 +388,7 @@ this.gv_fSaleOrgId.OptionsColumn.AllowEdit = false; this.gv_fSaleOrgId.Tag = "query_a.FSaleOrgId"; this.gv_fSaleOrgId.Visible = true; - this.gv_fSaleOrgId.VisibleIndex = 4; + this.gv_fSaleOrgId.VisibleIndex = 5; this.gv_fSaleOrgId.Width = 94; // // gv_fCreatorId @@ -386,7 +401,7 @@ this.gv_fCreatorId.OptionsColumn.AllowEdit = false; this.gv_fCreatorId.Tag = "query_a.FCreatorId"; this.gv_fCreatorId.Visible = true; - this.gv_fCreatorId.VisibleIndex = 5; + this.gv_fCreatorId.VisibleIndex = 6; this.gv_fCreatorId.Width = 94; // // gv_fApproverID @@ -399,7 +414,7 @@ this.gv_fApproverID.OptionsColumn.AllowEdit = false; this.gv_fApproverID.Tag = "query_a.FApproverID"; this.gv_fApproverID.Visible = true; - this.gv_fApproverID.VisibleIndex = 6; + this.gv_fApproverID.VisibleIndex = 7; this.gv_fApproverID.Width = 94; // // gv_fCreateDate @@ -412,7 +427,7 @@ this.gv_fCreateDate.OptionsColumn.AllowEdit = false; this.gv_fCreateDate.Tag = "query_a.FCreateDate"; this.gv_fCreateDate.Visible = true; - this.gv_fCreateDate.VisibleIndex = 7; + this.gv_fCreateDate.VisibleIndex = 8; this.gv_fCreateDate.Width = 94; // // gv_fApproveDate @@ -425,7 +440,7 @@ this.gv_fApproveDate.OptionsColumn.AllowEdit = false; this.gv_fApproveDate.Tag = "query_a.FApproveDate"; this.gv_fApproveDate.Visible = true; - this.gv_fApproveDate.VisibleIndex = 8; + this.gv_fApproveDate.VisibleIndex = 9; this.gv_fApproveDate.Width = 94; // // gv_fSalesManID @@ -460,7 +475,7 @@ this.gv_fNote.OptionsColumn.AllowEdit = false; this.gv_fNote.Tag = "query_a.FNote"; this.gv_fNote.Visible = true; - this.gv_fNote.VisibleIndex = 9; + this.gv_fNote.VisibleIndex = 10; this.gv_fNote.Width = 94; // // gridColumn33 @@ -470,7 +485,7 @@ this.gridColumn33.MinWidth = 25; this.gridColumn33.Name = "gridColumn33"; this.gridColumn33.Visible = true; - this.gridColumn33.VisibleIndex = 10; + this.gridColumn33.VisibleIndex = 11; this.gridColumn33.Width = 94; // // gridColumn34 @@ -480,7 +495,7 @@ this.gridColumn34.MinWidth = 25; this.gridColumn34.Name = "gridColumn34"; this.gridColumn34.Visible = true; - this.gridColumn34.VisibleIndex = 11; + this.gridColumn34.VisibleIndex = 12; this.gridColumn34.Width = 94; // // gridColumn35 @@ -490,7 +505,7 @@ this.gridColumn35.MinWidth = 25; this.gridColumn35.Name = "gridColumn35"; this.gridColumn35.Visible = true; - this.gridColumn35.VisibleIndex = 12; + this.gridColumn35.VisibleIndex = 13; this.gridColumn35.Width = 94; // // gridColumn36 @@ -537,7 +552,7 @@ this.splitContainerControl1.Panel2.Controls.Add(this.tabMx); this.splitContainerControl1.Panel2.Text = "Panel2"; this.splitContainerControl1.Size = new System.Drawing.Size(1126, 570); - this.splitContainerControl1.SplitterPosition = 141; + this.splitContainerControl1.SplitterPosition = 167; this.splitContainerControl1.TabIndex = 0; // // layoutMx1 @@ -559,6 +574,9 @@ this.layoutMx1.Controls.Add(this.txt_shf); this.layoutMx1.Controls.Add(this.txt_shName); this.layoutMx1.Controls.Add(this.txt_wjStatus); + this.layoutMx1.Controls.Add(this.txt_qt031); + this.layoutMx1.Controls.Add(this.txt_qt030); + this.layoutMx1.Controls.Add(this.txt_qt029); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, @@ -567,7 +585,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, 141); + this.layoutMx1.Size = new System.Drawing.Size(1126, 167); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -581,7 +599,7 @@ // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(840, 72); + this.txt_chkStatus.Location = new System.Drawing.Point(840, 70); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��"; this.txt_chkStatus.Size = new System.Drawing.Size(274, 24); @@ -601,10 +619,10 @@ // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(99, 12); + 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(185, 24); + this.txt_billNo.Size = new System.Drawing.Size(170, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; this.txt_billNo.Tag = "readonly"; @@ -612,23 +630,23 @@ // txt_fBillTypeID // this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"; - this.txt_fBillTypeID.Location = new System.Drawing.Point(99, 42); + this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 41); 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(185, 24); + this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 24); this.txt_fBillTypeID.StyleController = this.layoutMx1; this.txt_fBillTypeID.TabIndex = 362; // // txt_fApproverID // - this.txt_fApproverID.Location = new System.Drawing.Point(927, 12); + this.txt_fApproverID.Location = new System.Drawing.Point(942, 12); this.txt_fApproverID.Name = "txt_fApproverID"; this.txt_fApproverID.Properties.Appearance.Options.UseFont = true; - this.txt_fApproverID.Size = new System.Drawing.Size(187, 24); + this.txt_fApproverID.Size = new System.Drawing.Size(172, 24); this.txt_fApproverID.StyleController = this.layoutMx1; this.txt_fApproverID.TabIndex = 222; this.txt_fApproverID.Tag = "readonly"; @@ -636,101 +654,101 @@ // txt_salesId // this.txt_salesId.IsReadly = false; - this.txt_salesId.Location = new System.Drawing.Point(99, 72); + this.txt_salesId.Location = new System.Drawing.Point(114, 70); this.txt_salesId.Name = "txt_salesId"; - this.txt_salesId.Size = new System.Drawing.Size(185, 24); + this.txt_salesId.Size = new System.Drawing.Size(170, 24); this.txt_salesId.TabIndex = 367; // // txt_fSaleOrgIdTxt // - this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(375, 12); + this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(390, 12); this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt"; this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true; - this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(185, 24); + this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(170, 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(651, 12); + this.txt_fCreatorId.Location = new System.Drawing.Point(666, 12); this.txt_fCreatorId.Name = "txt_fCreatorId"; this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true; - this.txt_fCreatorId.Size = new System.Drawing.Size(185, 24); + this.txt_fCreatorId.Size = new System.Drawing.Size(170, 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(927, 42); + this.txt_fApproveDate.Location = new System.Drawing.Point(942, 41); this.txt_fApproveDate.Name = "txt_fApproveDate"; this.txt_fApproveDate.Properties.Appearance.Options.UseFont = true; - this.txt_fApproveDate.Size = new System.Drawing.Size(187, 24); + this.txt_fApproveDate.Size = new System.Drawing.Size(172, 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(99, 102); + this.txt_fNote.Location = new System.Drawing.Point(114, 99); this.txt_fNote.Name = "txt_fNote"; this.txt_fNote.Properties.Appearance.Options.UseFont = true; - this.txt_fNote.Size = new System.Drawing.Size(461, 24); + this.txt_fNote.Size = new System.Drawing.Size(446, 24); this.txt_fNote.StyleController = this.layoutMx1; this.txt_fNote.TabIndex = 243; // // txt_fSalesManIDTxt // - this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(651, 72); + this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(114, 128); this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt"; this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true; - this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(185, 24); + this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(170, 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(651, 42); + this.txt_fCreateDate.Location = new System.Drawing.Point(666, 41); this.txt_fCreateDate.Name = "txt_fCreateDate"; this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true; - this.txt_fCreateDate.Size = new System.Drawing.Size(185, 24); + this.txt_fCreateDate.Size = new System.Drawing.Size(170, 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(375, 42); + this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(390, 41); this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt"; this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true; - this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(185, 24); + this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(170, 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(375, 72); + this.txt_shf.Location = new System.Drawing.Point(390, 70); this.txt_shf.Name = "txt_shf"; - this.txt_shf.Size = new System.Drawing.Size(185, 24); + this.txt_shf.Size = new System.Drawing.Size(170, 24); this.txt_shf.StyleController = this.layoutMx1; this.txt_shf.TabIndex = 373; this.txt_shf.Tag = "readonly"; // // txt_shName // - this.txt_shName.Location = new System.Drawing.Point(651, 102); + this.txt_shName.Location = new System.Drawing.Point(390, 128); this.txt_shName.Name = "txt_shName"; - this.txt_shName.Size = new System.Drawing.Size(185, 24); + this.txt_shName.Size = new System.Drawing.Size(170, 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, 102); + this.txt_wjStatus.Location = new System.Drawing.Point(840, 99); this.txt_wjStatus.Name = "txt_wjStatus"; this.txt_wjStatus.Properties.Caption = "瀹岀粨鐘舵��"; this.txt_wjStatus.Size = new System.Drawing.Size(274, 24); @@ -768,7 +786,6 @@ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.layoutControlGroup1.GroupBordersVisible = false; this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { - this.layoutControlItem17, this.layoutControlItem2, this.layoutControlItem10, this.layoutControlItem11, @@ -776,13 +793,17 @@ this.layoutControlItem6, this.layoutControlItem7, this.layoutControlItem13, - this.layoutControlItem9, this.layoutControlItem5, this.layoutControlItem14, this.layoutControlItem8, this.layoutControlItem4, this.layoutControlItem3, - this.layoutControlItem12}); + this.layoutControlItem12, + this.layoutControlItem9, + this.layoutControlItem17, + this.layoutControlItem18, + this.layoutControlItem19, + this.layoutControlItem20}); this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.layoutControlGroup1.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -806,26 +827,16 @@ 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; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, - rowDefinition4}); - this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 141); + rowDefinition4, + rowDefinition5}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1126, 167); this.layoutControlGroup1.TextVisible = false; - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_shName; - this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; - this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�"; - this.layoutControlItem17.Location = new System.Drawing.Point(552, 90); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem17.Size = new System.Drawing.Size(276, 31); - this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem2 // @@ -834,9 +845,9 @@ this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿"; this.layoutControlItem2.Location = new System.Drawing.Point(0, 0); this.layoutControlItem2.Name = "layoutControlItem2"; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem2.Size = new System.Drawing.Size(276, 29); this.layoutControlItem2.Text = "鐢宠缂栧彿"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem10 // @@ -846,31 +857,31 @@ 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, 30); + this.layoutControlItem10.Size = new System.Drawing.Size(278, 29); this.layoutControlItem10.Text = "瀹℃牳浜哄憳"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18); + 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, 30); + 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, 30); + this.layoutControlItem11.Size = new System.Drawing.Size(278, 29); this.layoutControlItem11.Text = "瀹℃牳鏃ユ湡"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_chkStatus; - this.layoutControlItem15.Location = new System.Drawing.Point(828, 60); + 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, 30); + 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; @@ -883,48 +894,35 @@ 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, 30); + this.layoutControlItem6.Size = new System.Drawing.Size(276, 29); this.layoutControlItem6.Text = "鍒涘缓浜哄憳"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18); + 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, 30); + 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, 30); + this.layoutControlItem7.Size = new System.Drawing.Size(276, 29); this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); + 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, 30); + this.layoutControlItem13.Location = new System.Drawing.Point(276, 29); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem13.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem13.Size = new System.Drawing.Size(276, 29); this.layoutControlItem13.Text = "瀹㈡埛鍚嶇О"; - this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18); - // - // layoutControlItem9 - // - this.layoutControlItem9.Control = this.txt_fSalesManIDTxt; - this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; - this.layoutControlItem9.CustomizationFormText = "閿�鍞憳"; - this.layoutControlItem9.Location = new System.Drawing.Point(552, 60); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(276, 30); - this.layoutControlItem9.Text = "閿�鍞汉鍛�"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem5 // @@ -934,73 +932,59 @@ this.layoutControlItem5.Location = new System.Drawing.Point(276, 0); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem5.Size = new System.Drawing.Size(276, 29); this.layoutControlItem5.Text = "閿�鍞粍缁�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_shf; this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; this.layoutControlItem14.CustomizationFormText = "鏀惰揣鏂�"; - this.layoutControlItem14.Location = new System.Drawing.Point(276, 60); + this.layoutControlItem14.Location = new System.Drawing.Point(276, 58); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem14.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem14.Size = new System.Drawing.Size(276, 29); this.layoutControlItem14.Text = "鏀惰揣鏂�"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fNote; this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; this.layoutControlItem8.CustomizationFormText = "鐢宠澶囨敞"; - this.layoutControlItem8.Location = new System.Drawing.Point(0, 90); + this.layoutControlItem8.Location = new System.Drawing.Point(0, 87); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem8.Size = new System.Drawing.Size(552, 31); + this.layoutControlItem8.Size = new System.Drawing.Size(552, 29); this.layoutControlItem8.Text = "鐢宠澶囨敞"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_salesId; this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; this.layoutControlItem4.CustomizationFormText = "閿�鍞鍗�"; - this.layoutControlItem4.Location = new System.Drawing.Point(0, 60); + this.layoutControlItem4.Location = new System.Drawing.Point(0, 58); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem4.Size = new System.Drawing.Size(276, 29); this.layoutControlItem4.Text = "閿�鍞鍗�"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); + this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_fBillTypeID; this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft; this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷"; - this.layoutControlItem3.Location = new System.Drawing.Point(0, 30); + this.layoutControlItem3.Location = new System.Drawing.Point(0, 29); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem3.Size = new System.Drawing.Size(276, 30); + this.layoutControlItem3.Size = new System.Drawing.Size(276, 29); this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 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(828, 90); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(278, 31); - this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem12.TextVisible = false; + this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); // // tabMx // @@ -1008,7 +992,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, 417); + this.tabMx.Size = new System.Drawing.Size(1126, 391); this.tabMx.TabIndex = 4; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1017,7 +1001,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1124, 385); + this.tabMxPage1.Size = new System.Drawing.Size(1124, 359); this.tabMxPage1.Text = "鐢宠鏄庣粏"; // // gcMx1 @@ -1030,7 +1014,7 @@ this.repositoryItemSearchLookUpEdit1, this.repositoryItemButtonEdit1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1124, 385); + this.gcMx1.Size = new System.Drawing.Size(1124, 359); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1227,7 +1211,7 @@ this.gvMx1fMustQty.Name = "gvMx1fMustQty"; this.gvMx1fMustQty.Tag = "yz_quantity_0_edit"; this.gvMx1fMustQty.Visible = true; - this.gvMx1fMustQty.VisibleIndex = 1; + this.gvMx1fMustQty.VisibleIndex = 3; this.gvMx1fMustQty.Width = 94; // // gridColumn11 @@ -1243,7 +1227,7 @@ this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Tag = "edit"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 2; + this.gridColumn11.VisibleIndex = 4; this.gridColumn11.Width = 94; // // repositoryItemDateEdit1 @@ -1268,7 +1252,7 @@ this.gvMx1fEntrynote.Name = "gvMx1fEntrynote"; this.gvMx1fEntrynote.Tag = "edit"; this.gvMx1fEntrynote.Visible = true; - this.gvMx1fEntrynote.VisibleIndex = 3; + this.gvMx1fEntrynote.VisibleIndex = 5; this.gvMx1fEntrynote.Width = 94; // // gvMx1fRealQty @@ -1280,7 +1264,7 @@ this.gvMx1fRealQty.Name = "gvMx1fRealQty"; this.gvMx1fRealQty.Tag = "query_a.FRealQty"; this.gvMx1fRealQty.Visible = true; - this.gvMx1fRealQty.VisibleIndex = 4; + this.gvMx1fRealQty.VisibleIndex = 6; this.gvMx1fRealQty.Width = 94; // // gridColumn12 @@ -1290,7 +1274,7 @@ this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; - this.gridColumn12.VisibleIndex = 5; + this.gridColumn12.VisibleIndex = 7; this.gridColumn12.Width = 94; // // gridColumn13 @@ -1300,7 +1284,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 6; + this.gridColumn13.VisibleIndex = 1; this.gridColumn13.Width = 94; // // gridColumn14 @@ -1310,7 +1294,7 @@ this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 7; + this.gridColumn14.VisibleIndex = 2; this.gridColumn14.Width = 94; // // gridColumn15 @@ -1349,8 +1333,6 @@ this.gridColumn18.FieldName = "dwJj"; this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; - this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 11; this.gridColumn18.Width = 94; // // gridColumn19 @@ -1360,7 +1342,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 12; + this.gridColumn19.VisibleIndex = 11; this.gridColumn19.Width = 94; // // gridColumn20 @@ -1370,7 +1352,7 @@ this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 13; + this.gridColumn20.VisibleIndex = 12; this.gridColumn20.Width = 94; // // gridColumn21 @@ -1380,7 +1362,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; - this.gridColumn21.VisibleIndex = 14; + this.gridColumn21.VisibleIndex = 13; this.gridColumn21.Width = 94; // // gridColumn22 @@ -1389,8 +1371,6 @@ this.gridColumn22.FieldName = "hzlx"; this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; - this.gridColumn22.Visible = true; - this.gridColumn22.VisibleIndex = 15; this.gridColumn22.Width = 94; // // gridColumn23 @@ -1399,8 +1379,6 @@ this.gridColumn23.FieldName = "hz"; this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; - this.gridColumn23.Visible = true; - this.gridColumn23.VisibleIndex = 16; this.gridColumn23.Width = 94; // // gridColumn24 @@ -1410,7 +1388,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; - this.gridColumn24.VisibleIndex = 17; + this.gridColumn24.VisibleIndex = 14; this.gridColumn24.Width = 94; // // gridColumn25 @@ -1420,7 +1398,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; - this.gridColumn25.VisibleIndex = 18; + this.gridColumn25.VisibleIndex = 15; this.gridColumn25.Width = 94; // // gridColumn26 @@ -1430,7 +1408,7 @@ this.gridColumn26.MinWidth = 25; this.gridColumn26.Name = "gridColumn26"; this.gridColumn26.Visible = true; - this.gridColumn26.VisibleIndex = 19; + this.gridColumn26.VisibleIndex = 16; this.gridColumn26.Width = 94; // // gridColumn27 @@ -1439,8 +1417,6 @@ this.gridColumn27.FieldName = "gyOrg"; this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; - this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 20; this.gridColumn27.Width = 94; // // gridColumn28 @@ -1449,8 +1425,6 @@ this.gridColumn28.FieldName = "kcOrg"; this.gridColumn28.MinWidth = 25; this.gridColumn28.Name = "gridColumn28"; - this.gridColumn28.Visible = true; - this.gridColumn28.VisibleIndex = 21; this.gridColumn28.Width = 94; // // gridColumn29 @@ -1459,8 +1433,6 @@ this.gridColumn29.FieldName = "jsOrg"; this.gridColumn29.MinWidth = 25; this.gridColumn29.Name = "gridColumn29"; - this.gridColumn29.Visible = true; - this.gridColumn29.VisibleIndex = 22; this.gridColumn29.Width = 94; // // gvMx1id @@ -1510,7 +1482,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 23; + this.gvMxDel.VisibleIndex = 17; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1543,6 +1515,120 @@ 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); @@ -1552,7 +1638,7 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_SalesDeliver"; - this.Text = "鍙戣揣閫氱煡鐢宠"; + this.Text = "閿�鍞嚭搴撶敵璇峰崟"; ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); this.xtraTabControl1.ResumeLayout(false); this.xtraTabPage1.ResumeLayout(false); @@ -1590,7 +1676,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); @@ -1598,13 +1683,11 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).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.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1616,6 +1699,15 @@ ((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); } @@ -1709,7 +1801,6 @@ private DevExpress.XtraEditors.TextEdit txt_shf; private DevExpress.XtraEditors.CheckEdit txt_chkStatus; private DevExpress.XtraEditors.TextEdit txt_shName; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraEditors.CheckEdit txt_wjStatus; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; @@ -1719,7 +1810,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; @@ -1727,9 +1817,18 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn36; private DevExpress.XtraGrid.Columns.GridColumn gridColumn37; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn38; + private DevExpress.XtraEditors.TextEdit txt_qt031; + 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 layoutControlItem19; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; } } \ 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 b7858e0..f8e0091 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs @@ -14,7 +14,7 @@ { public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm { - string _webServiceName = "SalesDeliverManager/"; + string _webServiceName = "SalesDeliverManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); public Frm_SalesDeliver() { @@ -29,6 +29,8 @@ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; + toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick; + toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) => @@ -137,7 +139,7 @@ lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -155,20 +157,20 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } - } /// <summary> @@ -204,7 +206,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billno"); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -218,6 +220,8 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(layoutMx1.Controls, true, gvList); } + //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼 + txt_salesId.IsReadly = true; } /// <summary> /// 鏂板浜嬩欢 @@ -247,13 +251,13 @@ string _sqGuid = txt_salesId.GetId(); if (txt_fBillTypeID.SelectedIndex < 0) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); txt_fBillTypeID.Focus(); return; } if (string.IsNullOrEmpty(_sqGuid)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞崟锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞崟锛�"); txt_salesId.Focus(); return; } @@ -304,9 +308,9 @@ { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData.outGuid; txt_billNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; @@ -316,10 +320,12 @@ toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -342,7 +348,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -385,7 +391,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -424,15 +430,34 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } - + /// <summary> + /// 璐㈠姟瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e) + { + _toolCk(30); + } + /// <summary> + /// 璐㈠姟鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + /// <exception cref="NotImplementedException"></exception> + private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e) + { + _toolCk(31); + } /// <summary> /// 瀹℃牳浜嬩欢 /// </summary> @@ -469,13 +494,20 @@ case 0: strMsg = "鍙嶅鏍�"; break; - }; + case 30: + strMsg = "璐㈠姟瀹℃牳"; + break; + case 31: + strMsg = "璐㈠姟鍙嶅鏍�"; + break; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -491,9 +523,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -502,10 +534,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "chkStatus", "fApproverID", "fApproveDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -567,13 +601,14 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + getModel(lbGuid.Text); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs index 6e4ec45..69c018f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs @@ -44,7 +44,7 @@ private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); } @@ -188,7 +188,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -203,7 +203,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -261,50 +261,14 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } - private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) - { - gvMx2.CloseEditor(); - gvMx2.UpdateCurrentRow(); - var rowhandle = gvMx2.FocusedRowHandle; - if (rowhandle < 0) - return; - if (e.Button.Index == 0) - { - var dr = gvMx2.GetDataRow(rowhandle); - var mxGuid = dr["guid"].ToString(); - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵")) - return; - if (string.IsNullOrEmpty(mxGuid)) - { - gvMx2.DeleteRow(rowhandle); - return; - } - var strJson = ""; - var lst = new List<string>(); - lst.Add(mxGuid); - try - { - strJson = UtilityHelper.HttpPost("", - _webServiceName + "DeleteModelMx2", - JsonConvert.SerializeObject(lst)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } - + /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> @@ -326,7 +290,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -342,22 +306,23 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); } int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); gridView1.FocusedRowHandle = rowHandle; - Form parentForm = this.FindForm(); - UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, parentForm, _inFieldValue.ToString()); + UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs index 889b4cd..ff9d6d1 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.Designer.cs @@ -30,19 +30,19 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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(); - DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); + 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(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -225,7 +225,6 @@ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -333,7 +332,6 @@ this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -477,8 +475,6 @@ this.gv_erpId.Name = "gv_erpId"; this.gv_erpId.OptionsColumn.AllowEdit = false; this.gv_erpId.Tag = "query_a.erp_id"; - this.gv_erpId.Visible = true; - this.gv_erpId.VisibleIndex = 0; this.gv_erpId.Width = 94; // // gv_billNo @@ -491,7 +487,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.bill_no"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 1; + this.gv_billNo.VisibleIndex = 0; this.gv_billNo.Width = 94; // // gv_billTypeId @@ -917,7 +913,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 23; + this.gridColumn1.VisibleIndex = 1; this.gridColumn1.Width = 94; // // gridColumn2 @@ -927,7 +923,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 24; + this.gridColumn2.VisibleIndex = 23; this.gridColumn2.Width = 94; // // gridColumn3 @@ -937,7 +933,7 @@ this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 25; + this.gridColumn3.VisibleIndex = 24; this.gridColumn3.Width = 94; // // gridColumn4 @@ -947,7 +943,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 26; + this.gridColumn4.VisibleIndex = 25; this.gridColumn4.Width = 94; // // gridColumn14 @@ -957,7 +953,7 @@ this.gridColumn14.MinWidth = 25; this.gridColumn14.Name = "gridColumn14"; this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 27; + this.gridColumn14.VisibleIndex = 26; this.gridColumn14.Width = 94; // // pageBar1 @@ -1070,19 +1066,19 @@ // // txt_receiveContact // - this.txt_receiveContact.Location = new System.Drawing.Point(1244, 152); + this.txt_receiveContact.Location = new System.Drawing.Point(1260, 152); this.txt_receiveContact.Name = "txt_receiveContact"; this.txt_receiveContact.Properties.Appearance.Options.UseFont = true; - this.txt_receiveContact.Size = new System.Drawing.Size(291, 24); + this.txt_receiveContact.Size = new System.Drawing.Size(296, 24); this.txt_receiveContact.StyleController = this.layoutMx1; this.txt_receiveContact.TabIndex = 427; // // txt_receiveId // - this.txt_receiveId.Location = new System.Drawing.Point(1244, 68); + this.txt_receiveId.Location = new System.Drawing.Point(1260, 68); this.txt_receiveId.Name = "txt_receiveId"; this.txt_receiveId.Properties.Appearance.Options.UseFont = true; - this.txt_receiveId.Size = new System.Drawing.Size(291, 24); + this.txt_receiveId.Size = new System.Drawing.Size(296, 24); this.txt_receiveId.StyleController = this.layoutMx1; this.txt_receiveId.TabIndex = 425; // @@ -1106,10 +1102,10 @@ // // txt_changerId // - this.txt_changerId.Location = new System.Drawing.Point(1244, 180); + this.txt_changerId.Location = new System.Drawing.Point(1260, 180); this.txt_changerId.Name = "txt_changerId"; this.txt_changerId.Properties.Appearance.Options.UseFont = true; - this.txt_changerId.Size = new System.Drawing.Size(291, 24); + this.txt_changerId.Size = new System.Drawing.Size(296, 24); this.txt_changerId.StyleController = this.layoutMx1; this.txt_changerId.TabIndex = 378; // @@ -1118,142 +1114,142 @@ this.txt_versionNo.Location = new System.Drawing.Point(99, 180); this.txt_versionNo.Name = "txt_versionNo"; this.txt_versionNo.Properties.Appearance.Options.UseFont = true; - this.txt_versionNo.Size = new System.Drawing.Size(290, 24); + this.txt_versionNo.Size = new System.Drawing.Size(296, 24); this.txt_versionNo.StyleController = this.layoutMx1; this.txt_versionNo.TabIndex = 376; // // txt_cancellerId // - this.txt_cancellerId.Location = new System.Drawing.Point(480, 180); + this.txt_cancellerId.Location = new System.Drawing.Point(486, 180); this.txt_cancellerId.Name = "txt_cancellerId"; this.txt_cancellerId.Properties.Appearance.Options.UseFont = true; - this.txt_cancellerId.Size = new System.Drawing.Size(291, 24); + this.txt_cancellerId.Size = new System.Drawing.Size(296, 24); this.txt_cancellerId.StyleController = this.layoutMx1; this.txt_cancellerId.TabIndex = 374; // // txt_cancelStatusTxt // - this.txt_cancelStatusTxt.Location = new System.Drawing.Point(480, 208); + this.txt_cancelStatusTxt.Location = new System.Drawing.Point(486, 208); this.txt_cancelStatusTxt.Name = "txt_cancelStatusTxt"; this.txt_cancelStatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_cancelStatusTxt.Size = new System.Drawing.Size(291, 24); + this.txt_cancelStatusTxt.Size = new System.Drawing.Size(296, 24); this.txt_cancelStatusTxt.StyleController = this.layoutMx1; this.txt_cancelStatusTxt.TabIndex = 372; // // txt_changeDate // - this.txt_changeDate.Location = new System.Drawing.Point(1244, 208); + this.txt_changeDate.Location = new System.Drawing.Point(1260, 208); this.txt_changeDate.Name = "txt_changeDate"; this.txt_changeDate.Properties.Appearance.Options.UseFont = true; - this.txt_changeDate.Size = new System.Drawing.Size(291, 24); + this.txt_changeDate.Size = new System.Drawing.Size(296, 24); this.txt_changeDate.StyleController = this.layoutMx1; this.txt_changeDate.TabIndex = 344; // // txt_closeDate // - this.txt_closeDate.Location = new System.Drawing.Point(862, 236); + this.txt_closeDate.Location = new System.Drawing.Point(873, 236); this.txt_closeDate.Name = "txt_closeDate"; this.txt_closeDate.Properties.Appearance.Options.UseFont = true; - this.txt_closeDate.Size = new System.Drawing.Size(291, 24); + this.txt_closeDate.Size = new System.Drawing.Size(296, 24); this.txt_closeDate.StyleController = this.layoutMx1; this.txt_closeDate.TabIndex = 342; // // txt_closerId // - this.txt_closerId.Location = new System.Drawing.Point(862, 208); + this.txt_closerId.Location = new System.Drawing.Point(873, 208); this.txt_closerId.Name = "txt_closerId"; this.txt_closerId.Properties.Appearance.Options.UseFont = true; - this.txt_closerId.Size = new System.Drawing.Size(291, 24); + this.txt_closerId.Size = new System.Drawing.Size(296, 24); this.txt_closerId.StyleController = this.layoutMx1; this.txt_closerId.TabIndex = 340; // // txt_approveDate // - this.txt_approveDate.Location = new System.Drawing.Point(480, 96); + this.txt_approveDate.Location = new System.Drawing.Point(486, 96); this.txt_approveDate.Name = "txt_approveDate"; this.txt_approveDate.Properties.Appearance.Options.UseFont = true; - this.txt_approveDate.Size = new System.Drawing.Size(291, 24); + this.txt_approveDate.Size = new System.Drawing.Size(296, 24); this.txt_approveDate.StyleController = this.layoutMx1; this.txt_approveDate.TabIndex = 338; // // txt_modifyDate // - this.txt_modifyDate.Location = new System.Drawing.Point(862, 152); + this.txt_modifyDate.Location = new System.Drawing.Point(873, 152); this.txt_modifyDate.Name = "txt_modifyDate"; this.txt_modifyDate.Properties.Appearance.Options.UseFont = true; - this.txt_modifyDate.Size = new System.Drawing.Size(291, 24); + this.txt_modifyDate.Size = new System.Drawing.Size(296, 24); this.txt_modifyDate.StyleController = this.layoutMx1; this.txt_modifyDate.TabIndex = 314; // // txt_modifierId // - this.txt_modifierId.Location = new System.Drawing.Point(862, 124); + this.txt_modifierId.Location = new System.Drawing.Point(873, 124); this.txt_modifierId.Name = "txt_modifierId"; this.txt_modifierId.Properties.Appearance.Options.UseFont = true; - this.txt_modifierId.Size = new System.Drawing.Size(291, 24); + this.txt_modifierId.Size = new System.Drawing.Size(296, 24); this.txt_modifierId.StyleController = this.layoutMx1; this.txt_modifierId.TabIndex = 312; // // txt_createDate // - this.txt_createDate.Location = new System.Drawing.Point(480, 152); + this.txt_createDate.Location = new System.Drawing.Point(486, 152); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; - this.txt_createDate.Size = new System.Drawing.Size(291, 24); + this.txt_createDate.Size = new System.Drawing.Size(296, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 310; // // txt_creatorId // - this.txt_creatorId.Location = new System.Drawing.Point(480, 124); + this.txt_creatorId.Location = new System.Drawing.Point(486, 124); this.txt_creatorId.Name = "txt_creatorId"; this.txt_creatorId.Properties.Appearance.Options.UseFont = true; - this.txt_creatorId.Size = new System.Drawing.Size(291, 24); + this.txt_creatorId.Size = new System.Drawing.Size(296, 24); this.txt_creatorId.StyleController = this.layoutMx1; this.txt_creatorId.TabIndex = 308; // // txt_linkPhone // - this.txt_linkPhone.Location = new System.Drawing.Point(1244, 124); + this.txt_linkPhone.Location = new System.Drawing.Point(1260, 124); this.txt_linkPhone.Name = "txt_linkPhone"; this.txt_linkPhone.Properties.Appearance.Options.UseFont = true; - this.txt_linkPhone.Size = new System.Drawing.Size(291, 24); + this.txt_linkPhone.Size = new System.Drawing.Size(296, 24); this.txt_linkPhone.StyleController = this.layoutMx1; this.txt_linkPhone.TabIndex = 288; // // txt_chargeId // - this.txt_chargeId.Location = new System.Drawing.Point(862, 68); + this.txt_chargeId.Location = new System.Drawing.Point(873, 68); this.txt_chargeId.Name = "txt_chargeId"; this.txt_chargeId.Properties.Appearance.Options.UseFont = true; - this.txt_chargeId.Size = new System.Drawing.Size(291, 24); + this.txt_chargeId.Size = new System.Drawing.Size(296, 24); this.txt_chargeId.StyleController = this.layoutMx1; this.txt_chargeId.TabIndex = 286; // // txt_linkMan // - this.txt_linkMan.Location = new System.Drawing.Point(1244, 96); + this.txt_linkMan.Location = new System.Drawing.Point(1260, 96); this.txt_linkMan.Name = "txt_linkMan"; this.txt_linkMan.Properties.Appearance.Options.UseFont = true; - this.txt_linkMan.Size = new System.Drawing.Size(291, 24); + this.txt_linkMan.Size = new System.Drawing.Size(296, 24); this.txt_linkMan.StyleController = this.layoutMx1; this.txt_linkMan.TabIndex = 284; // // txt_approverId // - this.txt_approverId.Location = new System.Drawing.Point(480, 68); + this.txt_approverId.Location = new System.Drawing.Point(486, 68); this.txt_approverId.Name = "txt_approverId"; this.txt_approverId.Properties.Appearance.Options.UseFont = true; - this.txt_approverId.Size = new System.Drawing.Size(291, 24); + this.txt_approverId.Size = new System.Drawing.Size(296, 24); this.txt_approverId.StyleController = this.layoutMx1; this.txt_approverId.TabIndex = 282; // // txt_settleId // - this.txt_settleId.Location = new System.Drawing.Point(862, 96); + this.txt_settleId.Location = new System.Drawing.Point(873, 96); this.txt_settleId.Name = "txt_settleId"; this.txt_settleId.Properties.Appearance.Options.UseFont = true; - this.txt_settleId.Size = new System.Drawing.Size(291, 24); + this.txt_settleId.Size = new System.Drawing.Size(296, 24); this.txt_settleId.StyleController = this.layoutMx1; this.txt_settleId.TabIndex = 265; // @@ -1262,16 +1258,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(290, 24); + this.txt_note.Size = new System.Drawing.Size(296, 24); this.txt_note.StyleController = this.layoutMx1; this.txt_note.TabIndex = 263; // // txt_changeReason // - this.txt_changeReason.Location = new System.Drawing.Point(1244, 236); + this.txt_changeReason.Location = new System.Drawing.Point(1260, 236); this.txt_changeReason.Name = "txt_changeReason"; this.txt_changeReason.Properties.Appearance.Options.UseFont = true; - this.txt_changeReason.Size = new System.Drawing.Size(291, 24); + this.txt_changeReason.Size = new System.Drawing.Size(296, 24); this.txt_changeReason.StyleController = this.layoutMx1; this.txt_changeReason.TabIndex = 261; // @@ -1295,10 +1291,10 @@ // // txt_closeStatusTxt // - this.txt_closeStatusTxt.Location = new System.Drawing.Point(862, 180); + this.txt_closeStatusTxt.Location = new System.Drawing.Point(873, 180); this.txt_closeStatusTxt.Name = "txt_closeStatusTxt"; this.txt_closeStatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_closeStatusTxt.Size = new System.Drawing.Size(291, 24); + this.txt_closeStatusTxt.Size = new System.Drawing.Size(296, 24); this.txt_closeStatusTxt.StyleController = this.layoutMx1; this.txt_closeStatusTxt.TabIndex = 247; // @@ -1313,55 +1309,55 @@ // // txt_headLocId // - this.txt_headLocId.Location = new System.Drawing.Point(1244, 40); + this.txt_headLocId.Location = new System.Drawing.Point(1260, 40); this.txt_headLocId.Name = "txt_headLocId"; this.txt_headLocId.Properties.Appearance.Options.UseFont = true; - this.txt_headLocId.Size = new System.Drawing.Size(291, 24); + this.txt_headLocId.Size = new System.Drawing.Size(296, 24); this.txt_headLocId.StyleController = this.layoutMx1; this.txt_headLocId.TabIndex = 243; // // txt_headDeliveryWay // - this.txt_headDeliveryWay.Location = new System.Drawing.Point(1244, 12); + this.txt_headDeliveryWay.Location = new System.Drawing.Point(1260, 12); this.txt_headDeliveryWay.Name = "txt_headDeliveryWay"; this.txt_headDeliveryWay.Properties.Appearance.Options.UseFont = true; - this.txt_headDeliveryWay.Size = new System.Drawing.Size(291, 24); + this.txt_headDeliveryWay.Size = new System.Drawing.Size(296, 24); this.txt_headDeliveryWay.StyleController = this.layoutMx1; this.txt_headDeliveryWay.TabIndex = 235; // // txt_businessTypeTxt // - this.txt_businessTypeTxt.Location = new System.Drawing.Point(862, 40); + this.txt_businessTypeTxt.Location = new System.Drawing.Point(873, 40); this.txt_businessTypeTxt.Name = "txt_businessTypeTxt"; this.txt_businessTypeTxt.Properties.Appearance.Options.UseFont = true; - this.txt_businessTypeTxt.Size = new System.Drawing.Size(291, 24); + this.txt_businessTypeTxt.Size = new System.Drawing.Size(296, 24); this.txt_businessTypeTxt.StyleController = this.layoutMx1; this.txt_businessTypeTxt.TabIndex = 233; // // txt_fDate // - this.txt_fDate.Location = new System.Drawing.Point(480, 40); + this.txt_fDate.Location = new System.Drawing.Point(486, 40); this.txt_fDate.Name = "txt_fDate"; this.txt_fDate.Properties.Appearance.Options.UseFont = true; - this.txt_fDate.Size = new System.Drawing.Size(291, 24); + this.txt_fDate.Size = new System.Drawing.Size(296, 24); this.txt_fDate.StyleController = this.layoutMx1; this.txt_fDate.TabIndex = 231; // // txt_billTypeId // - this.txt_billTypeId.Location = new System.Drawing.Point(862, 12); + this.txt_billTypeId.Location = new System.Drawing.Point(873, 12); this.txt_billTypeId.Name = "txt_billTypeId"; this.txt_billTypeId.Properties.Appearance.Options.UseFont = true; - this.txt_billTypeId.Size = new System.Drawing.Size(291, 24); + this.txt_billTypeId.Size = new System.Drawing.Size(296, 24); this.txt_billTypeId.StyleController = this.layoutMx1; this.txt_billTypeId.TabIndex = 219; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(480, 12); + this.txt_billNo.Location = new System.Drawing.Point(486, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; - this.txt_billNo.Size = new System.Drawing.Size(291, 24); + this.txt_billNo.Size = new System.Drawing.Size(296, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 216; // @@ -1370,7 +1366,7 @@ this.txt_documentStatusTxt.Location = new System.Drawing.Point(99, 40); this.txt_documentStatusTxt.Name = "txt_documentStatusTxt"; this.txt_documentStatusTxt.Properties.Appearance.Options.UseFont = true; - this.txt_documentStatusTxt.Size = new System.Drawing.Size(290, 24); + this.txt_documentStatusTxt.Size = new System.Drawing.Size(296, 24); this.txt_documentStatusTxt.StyleController = this.layoutMx1; this.txt_documentStatusTxt.TabIndex = 229; // @@ -1379,7 +1375,7 @@ this.txt_erpId.Location = new System.Drawing.Point(99, 12); this.txt_erpId.Name = "txt_erpId"; this.txt_erpId.Properties.Appearance.Options.UseFont = true; - this.txt_erpId.Size = new System.Drawing.Size(290, 24); + this.txt_erpId.Size = new System.Drawing.Size(296, 24); this.txt_erpId.StyleController = this.layoutMx1; this.txt_erpId.TabIndex = 214; // @@ -1397,7 +1393,7 @@ // this.txt_xsOrgName.Location = new System.Drawing.Point(99, 96); this.txt_xsOrgName.Name = "txt_xsOrgName"; - this.txt_xsOrgName.Size = new System.Drawing.Size(290, 24); + this.txt_xsOrgName.Size = new System.Drawing.Size(296, 24); this.txt_xsOrgName.StyleController = this.layoutMx1; this.txt_xsOrgName.TabIndex = 429; // @@ -1405,7 +1401,7 @@ // this.txt_salerName.Location = new System.Drawing.Point(99, 152); this.txt_salerName.Name = "txt_salerName"; - this.txt_salerName.Size = new System.Drawing.Size(290, 24); + this.txt_salerName.Size = new System.Drawing.Size(296, 24); this.txt_salerName.StyleController = this.layoutMx1; this.txt_salerName.TabIndex = 430; // @@ -1413,7 +1409,7 @@ // this.txt_custName.Location = new System.Drawing.Point(99, 124); this.txt_custName.Name = "txt_custName"; - this.txt_custName.Size = new System.Drawing.Size(290, 24); + this.txt_custName.Size = new System.Drawing.Size(296, 24); this.txt_custName.StyleController = this.layoutMx1; this.txt_custName.TabIndex = 431; // @@ -1421,7 +1417,7 @@ // this.txt_saleDeptName.Location = new System.Drawing.Point(99, 68); this.txt_saleDeptName.Name = "txt_saleDeptName"; - this.txt_saleDeptName.Size = new System.Drawing.Size(290, 24); + this.txt_saleDeptName.Size = new System.Drawing.Size(296, 24); this.txt_saleDeptName.StyleController = this.layoutMx1; this.txt_saleDeptName.TabIndex = 432; // @@ -1541,48 +1537,48 @@ this.layoutControlItem29}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - 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; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - 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; - rowDefinition9.Height = 100D; - rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition1, - rowDefinition2, - rowDefinition3, - rowDefinition4, - rowDefinition5, - rowDefinition6, - rowDefinition7, - rowDefinition8, - rowDefinition9}); - this.Root.Size = new System.Drawing.Size(1547, 272); + rowDefinition10, + rowDefinition11, + rowDefinition12, + rowDefinition13, + rowDefinition14, + rowDefinition15, + rowDefinition16, + rowDefinition17, + rowDefinition18}); + this.Root.Size = new System.Drawing.Size(1568, 272); this.Root.TextVisible = false; // // layoutControlItem3 @@ -1591,40 +1587,40 @@ 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(381, 28); + 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(381, 28); + 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(382, 28); + 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(763, 28); + this.layoutControlItem7.Location = new System.Drawing.Point(774, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem7.Size = new System.Drawing.Size(387, 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(1145, 112); + this.layoutControlItem20.Location = new System.Drawing.Point(1161, 112); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem20.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem20.Size = new System.Drawing.Size(387, 28); this.layoutControlItem20.Text = "鑱旂郴鐢佃瘽"; this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18); // @@ -1633,48 +1629,48 @@ 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(381, 28); + this.layoutControlItem2.Size = new System.Drawing.Size(387, 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(381, 0); + 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(382, 28); + 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(763, 0); + this.layoutControlItem5.Location = new System.Drawing.Point(774, 0); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem5.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem5.Size = new System.Drawing.Size(387, 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(1145, 0); + this.layoutControlItem8.Location = new System.Drawing.Point(1161, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem8.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem8.Size = new System.Drawing.Size(387, 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(1145, 140); + this.layoutControlItem37.Location = new System.Drawing.Point(1161, 140); this.layoutControlItem37.Name = "layoutControlItem37"; this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem37.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem37.Size = new System.Drawing.Size(387, 28); this.layoutControlItem37.Text = "鏀惰揣鑱旂郴浜�"; this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18); // @@ -1684,7 +1680,7 @@ 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(381, 28); + this.layoutControlItem41.Size = new System.Drawing.Size(387, 28); this.layoutControlItem41.Text = "瀹㈡埛鍚嶇О"; this.layoutControlItem41.TextSize = new System.Drawing.Size(75, 18); // @@ -1694,7 +1690,7 @@ 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(381, 28); + this.lab_saleDeptName.Size = new System.Drawing.Size(387, 28); this.lab_saleDeptName.Text = "閿�鍞儴闂�"; this.lab_saleDeptName.TextSize = new System.Drawing.Size(75, 18); // @@ -1704,7 +1700,7 @@ 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(381, 28); + this.layoutControlItem39.Size = new System.Drawing.Size(387, 28); this.layoutControlItem39.Text = "閿�鍞粍缁�"; this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18); // @@ -1714,117 +1710,117 @@ 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(381, 28); + 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(1145, 28); + this.layoutControlItem9.Location = new System.Drawing.Point(1161, 28); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem9.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem9.Size = new System.Drawing.Size(387, 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(1145, 56); + this.layoutControlItem36.Location = new System.Drawing.Point(1161, 56); this.layoutControlItem36.Name = "layoutControlItem36"; this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem36.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem36.Size = new System.Drawing.Size(387, 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(1145, 84); + this.layoutControlItem18.Location = new System.Drawing.Point(1161, 84); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem18.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem18.Size = new System.Drawing.Size(387, 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(763, 56); + this.layoutControlItem19.Location = new System.Drawing.Point(774, 56); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem19.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem19.Size = new System.Drawing.Size(387, 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(763, 84); + this.layoutControlItem16.Location = new System.Drawing.Point(774, 84); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem16.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem16.Size = new System.Drawing.Size(387, 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(763, 112); + this.layoutControlItem23.Location = new System.Drawing.Point(774, 112); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem23.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem23.Size = new System.Drawing.Size(387, 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(763, 140); + this.layoutControlItem24.Location = new System.Drawing.Point(774, 140); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5; - this.layoutControlItem24.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem24.Size = new System.Drawing.Size(387, 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(763, 224); + 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(382, 28); + 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(763, 196); + 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(382, 28); + 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(763, 168); + this.layoutControlItem11.Location = new System.Drawing.Point(774, 168); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem11.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem11.Size = new System.Drawing.Size(387, 28); this.layoutControlItem11.Text = "鍏抽棴鐘舵��"; this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18); // @@ -1834,40 +1830,40 @@ 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(381, 28); + this.layoutControlItem31.Size = new System.Drawing.Size(387, 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(1145, 168); + this.layoutControlItem32.Location = new System.Drawing.Point(1161, 168); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 6; - this.layoutControlItem32.Size = new System.Drawing.Size(382, 28); + this.layoutControlItem32.Size = new System.Drawing.Size(387, 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(1145, 196); + 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(382, 28); + 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(1145, 224); + 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(382, 28); + this.layoutControlItem14.Size = new System.Drawing.Size(387, 28); this.layoutControlItem14.Text = "鍙樻洿鍘熷洜"; this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18); // @@ -1877,73 +1873,73 @@ 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.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(381, 56); + 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(382, 28); + 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(381, 84); + 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(382, 28); + 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(381, 112); + 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(382, 28); + 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(381, 140); + 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(382, 28); + 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(381, 168); + 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(382, 28); + 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(381, 196); + 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(382, 28); + this.layoutControlItem29.Size = new System.Drawing.Size(387, 28); this.layoutControlItem29.Text = "浣滃簾鐘舵��"; this.layoutControlItem29.TextSize = new System.Drawing.Size(75, 18); // @@ -2500,23 +2496,11 @@ this.gridColumn13.VisibleIndex = 29; this.gridColumn13.Width = 94; // - // picCheckBox - // - this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; - this.picCheckBox.Location = new System.Drawing.Point(970, 55); - this.picCheckBox.Name = "picCheckBox"; - this.picCheckBox.Size = new System.Drawing.Size(100, 50); - this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.picCheckBox.TabIndex = 9; - this.picCheckBox.TabStop = false; - this.picCheckBox.Visible = false; - // // Frm_SalesOrder // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1570, 682); - this.Controls.Add(this.picCheckBox); this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_SalesOrder"; @@ -2627,14 +2611,12 @@ this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); } #endregion private UserControl.UcToolBarMenu toolBarMenu1; private DevExpress.XtraTab.XtraTabControl xtraTabControl1; - private System.Windows.Forms.PictureBox picCheckBox; private DevExpress.XtraTab.XtraTabPage xtraTabPage2; private DevExpress.XtraEditors.SplitContainerControl splitMx1; private DevExpress.XtraTab.XtraTabControl tabMx; diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs index 3a5ac9c..150dc0b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs @@ -22,7 +22,7 @@ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "documentStatus", "", (value) => + Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) => { Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); }, tips); @@ -188,11 +188,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs index 3d52a0e..1d79e6b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs @@ -38,7 +38,16 @@ 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.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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); 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(); @@ -75,7 +84,7 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); - this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup(); + 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(); @@ -98,28 +107,58 @@ this.txt_createdBy = 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.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem20 = 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.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); + this.layout99 = new DevExpress.XtraLayout.LayoutControl(); + this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); + this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit(); + this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); + this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint(); + this.radOut = new DevExpress.XtraEditors.RadioGroup(); + this.lbMxGuid = new DevExpress.XtraEditors.LabelControl(); + this.txtWlid = new DevExpress.XtraEditors.TextEdit(); + this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit(); + this.txtWlmc = new DevExpress.XtraEditors.TextEdit(); + this.txtWlgg = new DevExpress.XtraEditors.TextEdit(); + this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); + this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); + this.txt_yQty = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem(); + 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(); @@ -191,7 +230,7 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit(); @@ -211,29 +250,64 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.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.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).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.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit(); + this.split99.Panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit(); + this.split99.Panel2.SuspendLayout(); + this.split99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit(); + this.layout99.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit(); @@ -382,7 +456,7 @@ // gridColumn27 // this.gridColumn27.Caption = "婧愬崟鏍囪瘑"; - this.gridColumn27.FieldName = "fIsLink"; + this.gridColumn27.FieldName = "fHasLinkTxt"; this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; @@ -633,12 +707,12 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1274, 570); - this.splitMx1.SplitterPosition = 184; + this.splitMx1.SplitterPosition = 144; this.splitMx1.TabIndex = 0; // // layoutMx1 // - this.layoutMx1.Controls.Add(this.txt_fIsLink); + 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); @@ -662,36 +736,40 @@ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem19, - this.layoutControlItem1}); + this.layoutControlItem1, + this.layoutControlItem12, + this.layoutControlItem11, + this.layoutControlItem3, + this.layoutControlItem18}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; - this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500); + this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(620, 530, 812, 500); this.layoutMx1.Root = this.Root; - this.layoutMx1.Size = new System.Drawing.Size(1274, 184); + this.layoutMx1.Size = new System.Drawing.Size(1274, 144); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // - // txt_fIsLink + // txt_fHasLinkRad // - this.txt_fIsLink.EditValue = "1"; - this.txt_fIsLink.Location = new System.Drawing.Point(84, 42); - this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0); - this.txt_fIsLink.Name = "txt_fIsLink"; - this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + this.txt_fHasLinkRad.EditValue = "1"; + this.txt_fHasLinkRad.Location = new System.Drawing.Point(84, 42); + 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)}); - this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0); - this.txt_fIsLink.Size = new System.Drawing.Size(237, 33); - this.txt_fIsLink.StyleController = this.layoutMx1; - this.txt_fIsLink.TabIndex = 534; + this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0); + this.txt_fHasLinkRad.Size = new System.Drawing.Size(232, 32); + 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(84, 110); + this.txt_fstockid.Location = new System.Drawing.Point(392, 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(237, 24); + this.txt_fstockid.Size = new System.Drawing.Size(232, 24); this.txt_fstockid.TabIndex = 454; // // lbGuid @@ -714,10 +792,10 @@ // // txt_chkStatus // - this.txt_chkStatus.Location = new System.Drawing.Point(951, 143); + this.txt_chkStatus.Location = new System.Drawing.Point(628, 108); this.txt_chkStatus.Name = "txt_chkStatus"; this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_chkStatus.Size = new System.Drawing.Size(311, 24); + this.txt_chkStatus.Size = new System.Drawing.Size(304, 24); this.txt_chkStatus.StyleController = this.layoutMx1; this.txt_chkStatus.TabIndex = 452; this.txt_chkStatus.Tag = "readonly"; @@ -725,31 +803,31 @@ // txt_billType // this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"; - this.txt_billType.Location = new System.Drawing.Point(397, 110); + this.txt_billType.Location = new System.Drawing.Point(392, 44); 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(237, 24); + this.txt_billType.Size = new System.Drawing.Size(232, 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, 77); + this.txt_salesOrderId.Location = new System.Drawing.Point(84, 76); this.txt_salesOrderId.Name = "txt_salesOrderId"; - this.txt_salesOrderId.Size = new System.Drawing.Size(237, 24); + 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(1023, 110); + this.txt_approvedDate.Location = new System.Drawing.Point(1008, 108); this.txt_approvedDate.Name = "txt_approvedDate"; this.txt_approvedDate.Properties.Appearance.Options.UseFont = true; - this.txt_approvedDate.Size = new System.Drawing.Size(239, 24); + this.txt_approvedDate.Size = new System.Drawing.Size(233, 24); this.txt_approvedDate.StyleController = this.layoutMx1; this.txt_approvedDate.TabIndex = 378; this.txt_approvedDate.Tag = "readonly"; @@ -766,20 +844,20 @@ // // txt_approvedBy // - this.txt_approvedBy.Location = new System.Drawing.Point(1023, 77); + this.txt_approvedBy.Location = new System.Drawing.Point(1008, 76); this.txt_approvedBy.Name = "txt_approvedBy"; this.txt_approvedBy.Properties.Appearance.Options.UseFont = true; - this.txt_approvedBy.Size = new System.Drawing.Size(239, 24); + this.txt_approvedBy.Size = new System.Drawing.Size(233, 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(397, 12); + 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(237, 24); + 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"; @@ -796,10 +874,10 @@ // // txt_modifiedDate // - this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44); + this.txt_modifiedDate.Location = new System.Drawing.Point(1008, 44); this.txt_modifiedDate.Name = "txt_modifiedDate"; this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true; - this.txt_modifiedDate.Size = new System.Drawing.Size(239, 24); + this.txt_modifiedDate.Size = new System.Drawing.Size(233, 24); this.txt_modifiedDate.StyleController = this.layoutMx1; this.txt_modifiedDate.TabIndex = 336; this.txt_modifiedDate.Tag = "readonly"; @@ -809,47 +887,47 @@ 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(237, 24); + this.txt_billNo.Size = new System.Drawing.Size(232, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 213; this.txt_billNo.Tag = "readonly"; // // txt_salerName // - this.txt_salerName.Location = new System.Drawing.Point(397, 44); + this.txt_salerName.Location = new System.Drawing.Point(700, 44); this.txt_salerName.Name = "txt_salerName"; this.txt_salerName.Properties.Appearance.Options.UseFont = true; - this.txt_salerName.Size = new System.Drawing.Size(237, 24); + this.txt_salerName.Size = new System.Drawing.Size(232, 24); this.txt_salerName.StyleController = this.layoutMx1; this.txt_salerName.TabIndex = 267; this.txt_salerName.Tag = "readonly"; // // txt_modifiedBy // - this.txt_modifiedBy.Location = new System.Drawing.Point(1023, 12); + this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 12); this.txt_modifiedBy.Name = "txt_modifiedBy"; this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true; - this.txt_modifiedBy.Size = new System.Drawing.Size(239, 24); + this.txt_modifiedBy.Size = new System.Drawing.Size(233, 24); this.txt_modifiedBy.StyleController = this.layoutMx1; this.txt_modifiedBy.TabIndex = 327; this.txt_modifiedBy.Tag = "readonly"; // // txt_saleDeptName // - this.txt_saleDeptName.Location = new System.Drawing.Point(397, 77); + this.txt_saleDeptName.Location = new System.Drawing.Point(700, 76); this.txt_saleDeptName.Name = "txt_saleDeptName"; this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true; - this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24); + this.txt_saleDeptName.Size = new System.Drawing.Size(232, 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(710, 44); + 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(237, 24); + 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"; @@ -866,10 +944,10 @@ // // txt_returnReason // - this.txt_returnReason.Location = new System.Drawing.Point(84, 143); + this.txt_returnReason.Location = new System.Drawing.Point(84, 108); this.txt_returnReason.Name = "txt_returnReason"; this.txt_returnReason.Properties.Appearance.Options.UseFont = true; - this.txt_returnReason.Size = new System.Drawing.Size(550, 24); + this.txt_returnReason.Size = new System.Drawing.Size(540, 24); this.txt_returnReason.StyleController = this.layoutMx1; this.txt_returnReason.TabIndex = 235; // @@ -904,30 +982,70 @@ this.layoutControlItem1.Text = "涓婚敭GUID"; this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18); // + // layoutControlItem12 + // + this.layoutControlItem12.Control = this.txt_createdDate; + this.layoutControlItem12.Location = new System.Drawing.Point(626, 98); + this.layoutControlItem12.Name = "layoutControlItem12"; + this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem12.Size = new System.Drawing.Size(313, 33); + this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; + this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem11 + // + this.layoutControlItem11.Control = this.txt_createdBy; + this.layoutControlItem11.Location = new System.Drawing.Point(626, 65); + this.layoutControlItem11.Name = "layoutControlItem11"; + this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem11.Size = new System.Drawing.Size(313, 33); + 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; + this.layoutControlItem18.Location = new System.Drawing.Point(626, 131); + this.layoutControlItem18.Name = "layoutControlItem18"; + this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; + this.layoutControlItem18.Size = new System.Drawing.Size(313, 33); + this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; + this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem18.TextVisible = false; + // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; this.Root.GroupBordersVisible = false; this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem2, - this.layoutControlItem3, - this.layoutControlItem6, - this.layoutControlItem7, - this.layoutControlItem8, - this.layoutControlItem10, - this.layoutControlItem11, - this.layoutControlItem12, this.layoutControlItem13, this.layoutControlItem14, this.layoutControlItem15, this.layoutControlItem16, - this.layoutControlItem17, - this.layoutControlItem18, this.layoutControlItem4, - this.layoutControlItem9, - this.layoutControlItem20, this.layoutControlItem5, - this.layoutControlItem21}); + this.layoutControlItem21, + this.layoutControlItem8, + this.layoutControlItem6, + this.layoutControlItem7, + this.layoutControlItem10, + this.layoutControlItem20, + this.layoutControlItem9, + this.layoutControlItem17}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -951,221 +1069,174 @@ 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; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, - rowDefinition4, - rowDefinition5}); - this.Root.Size = new System.Drawing.Size(1274, 184); + rowDefinition4}); + this.Root.Size = new System.Drawing.Size(1253, 148); this.Root.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_xsOrgName; - this.layoutControlItem2.Location = new System.Drawing.Point(313, 0); + 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(313, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(308, 32); this.layoutControlItem2.Text = "閿�鍞粍缁�"; this.layoutControlItem2.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); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_salerName; - this.layoutControlItem6.Location = new System.Drawing.Point(313, 32); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(313, 33); - 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(313, 65); - this.layoutControlItem7.Name = "layoutControlItem7"; - this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem7.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem7.Text = "閿�鍞儴闂�"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem8 - // - this.layoutControlItem8.Control = this.txt_custName; - this.layoutControlItem8.Location = new System.Drawing.Point(626, 32); - this.layoutControlItem8.Name = "layoutControlItem8"; - this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem8.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О"; - this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem10 - // - this.layoutControlItem10.Control = this.txt_billType; - this.layoutControlItem10.Location = new System.Drawing.Point(313, 98); - this.layoutControlItem10.Name = "layoutControlItem10"; - this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem11 - // - this.layoutControlItem11.Control = this.txt_createdBy; - this.layoutControlItem11.Location = new System.Drawing.Point(626, 65); - this.layoutControlItem11.Name = "layoutControlItem11"; - this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem11.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem11.Text = "鍒涘缓浜哄憳"; - this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem12 - // - this.layoutControlItem12.Control = this.txt_createdDate; - this.layoutControlItem12.Location = new System.Drawing.Point(626, 98); - this.layoutControlItem12.Name = "layoutControlItem12"; - this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem12.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem12.Text = "鍒涘缓鏃堕棿"; - this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_modifiedBy; - this.layoutControlItem13.Location = new System.Drawing.Point(939, 0); + 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(315, 32); + 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(939, 32); + 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(315, 33); + 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(939, 65); + 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(315, 33); + 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(939, 98); + 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(315, 33); + this.layoutControlItem16.Size = new System.Drawing.Size(309, 32); this.layoutControlItem16.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem17 - // - this.layoutControlItem17.Control = this.txt_chkStatus; - this.layoutControlItem17.Location = new System.Drawing.Point(939, 131); - this.layoutControlItem17.Name = "layoutControlItem17"; - this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem17.Size = new System.Drawing.Size(315, 33); - this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑"; - this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem17.TextVisible = false; - // - // layoutControlItem18 - // - this.layoutControlItem18.Control = this.txt_wjStatus; - this.layoutControlItem18.Location = new System.Drawing.Point(626, 131); - this.layoutControlItem18.Name = "layoutControlItem18"; - this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem18.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑"; - this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem18.TextVisible = false; // // 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(313, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(308, 32); this.layoutControlItem4.Text = "鐢宠鍗曞彿"; this.layoutControlItem4.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, 131); - this.layoutControlItem9.Name = "layoutControlItem9"; - this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; - this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4; - this.layoutControlItem9.Size = new System.Drawing.Size(626, 33); - this.layoutControlItem9.Text = "鐢宠鍘熷洜"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); - // - // layoutControlItem20 - // - this.layoutControlItem20.Control = this.txt_fstockid; - this.layoutControlItem20.Location = new System.Drawing.Point(0, 98); - this.layoutControlItem20.Name = "layoutControlItem20"; - this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3; - this.layoutControlItem20.Size = new System.Drawing.Size(313, 33); - this.layoutControlItem20.Text = "閫夋嫨浠撳簱"; - this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_salesOrderId; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 65); + 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(313, 33); + this.layoutControlItem5.Size = new System.Drawing.Size(308, 32); this.layoutControlItem5.Text = "閿�鍞鍗�"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem21 // - this.layoutControlItem21.Control = this.txt_fIsLink; + 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(313, 33); + this.layoutControlItem21.Size = new System.Drawing.Size(308, 32); this.layoutControlItem21.Text = "鏈夋棤婧愬崟"; this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem8 + // + 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); + // + // layoutControlItem20 + // + this.layoutControlItem20.Control = this.txt_fstockid; + this.layoutControlItem20.Location = new System.Drawing.Point(308, 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.Text = "閫夋嫨浠撳簱"; + this.layoutControlItem20.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.Name = "layoutControlItem9"; + this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3; + this.layoutControlItem9.Size = new System.Drawing.Size(616, 32); + this.layoutControlItem9.Text = "鐢宠鍘熷洜"; + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem17 + // + 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; // // tabMx // @@ -1173,7 +1244,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, 374); + this.tabMx.Size = new System.Drawing.Size(1274, 414); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1181,10 +1252,403 @@ // // tabMxPage1 // - this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Controls.Add(this.split99); this.tabMxPage1.Name = "tabMxPage1"; - this.tabMxPage1.Size = new System.Drawing.Size(1272, 342); + this.tabMxPage1.Size = new System.Drawing.Size(1272, 382); this.tabMxPage1.Text = "鐢宠鏄庣粏"; + // + // split99 + // + this.split99.Dock = System.Windows.Forms.DockStyle.Fill; + this.split99.Horizontal = false; + this.split99.Location = new System.Drawing.Point(0, 0); + this.split99.Name = "split99"; + // + // split99.Panel1 + // + this.split99.Panel1.Controls.Add(this.layout99); + this.split99.Panel1.Text = "Panel1"; + // + // split99.Panel2 + // + 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.TabIndex = 4; + // + // layout99 + // + this.layout99.Controls.Add(this.layoutControl1); + this.layout99.Controls.Add(this.ucBtnPrint1); + this.layout99.Controls.Add(this.radOut); + this.layout99.Controls.Add(this.lbMxGuid); + this.layout99.Controls.Add(this.txtWlid); + this.layout99.Controls.Add(this.txt_psnQty_1); + this.layout99.Controls.Add(this.txtWlmc); + this.layout99.Controls.Add(this.txtWlgg); + this.layout99.Controls.Add(this.txt_kQty); + this.layout99.Controls.Add(this.txtQuantity); + this.layout99.Controls.Add(this.txt_yQty); + this.layout99.Dock = System.Windows.Forms.DockStyle.Fill; + this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem29}); + this.layout99.Location = new System.Drawing.Point(0, 0); + 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.TabIndex = 0; + this.layout99.Text = "layoutControl1"; + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.txt_iCount_1); + this.layoutControl1.Controls.Add(this.txt_yuliang_1); + this.layoutControl1.Location = new System.Drawing.Point(692, 76); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup2; + this.layoutControl1.Size = new System.Drawing.Size(336, 28); + this.layoutControl1.TabIndex = 477; + this.layoutControl1.Text = "layoutControl1"; + // + // txt_iCount_1 + // + this.txt_iCount_1.Location = new System.Drawing.Point(104, 2); + this.txt_iCount_1.Name = "txt_iCount_1"; + this.txt_iCount_1.Properties.Appearance.Options.UseFont = true; + this.txt_iCount_1.Properties.ReadOnly = true; + this.txt_iCount_1.Size = new System.Drawing.Size(62, 24); + this.txt_iCount_1.StyleController = this.layoutControl1; + this.txt_iCount_1.TabIndex = 228; + // + // txt_yuliang_1 + // + this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2); + this.txt_yuliang_1.Name = "txt_yuliang_1"; + this.txt_yuliang_1.Properties.ReadOnly = true; + this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24); + this.txt_yuliang_1.StyleController = this.layoutControl1; + this.txt_yuliang_1.TabIndex = 229; + // + // layoutControlGroup2 + // + this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup2.GroupBordersVisible = false; + this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem33, + this.layoutControlItem34}); + this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup2.Name = "layoutControlGroup2"; + columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition5.Width = 100D; + columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition6.Width = 100D; + this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition5, + columnDefinition6}); + rowDefinition5.Height = 100D; + rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; + this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { + rowDefinition5}); + 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; + // + // layoutControlItem33 + // + this.layoutControlItem33.Control = this.txt_iCount_1; + this.layoutControlItem33.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem33.Name = "layoutControlItem33"; + this.layoutControlItem33.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��"; + this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem34 + // + this.layoutControlItem34.Control = this.txt_yuliang_1; + this.layoutControlItem34.Location = new System.Drawing.Point(168, 0); + this.layoutControlItem34.Name = "layoutControlItem34"; + this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem34.Size = new System.Drawing.Size(168, 28); + this.layoutControlItem34.Text = "鎵撳嵃浣欐暟"; + this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18); + // + // ucBtnPrint1 + // + this.ucBtnPrint1.allClickKey = null; + this.ucBtnPrint1.guidKey = null; + this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42); + this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); + this.ucBtnPrint1.Name = "ucBtnPrint1"; + this.ucBtnPrint1.rptParameter = null; + this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32); + this.ucBtnPrint1.TabIndex = 230; + // + // radOut + // + this.radOut.Location = new System.Drawing.Point(1033, 10); + this.radOut.Margin = new System.Windows.Forms.Padding(0); + this.radOut.Name = "radOut"; + this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; + this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"), + new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")}); + this.radOut.Size = new System.Drawing.Size(227, 28); + this.radOut.StyleController = this.layout99; + this.radOut.TabIndex = 476; + // + // lbMxGuid + // + this.lbMxGuid.Location = new System.Drawing.Point(755, 76); + this.lbMxGuid.Name = "lbMxGuid"; + this.lbMxGuid.Size = new System.Drawing.Size(58, 18); + this.lbMxGuid.StyleController = this.layout99; + this.lbMxGuid.TabIndex = 229; + this.lbMxGuid.Text = "lbMxGuid"; + this.lbMxGuid.Visible = false; + // + // txtWlid + // + this.txtWlid.Location = new System.Drawing.Point(114, 12); + this.txtWlid.Name = "txtWlid"; + this.txtWlid.Properties.Appearance.Options.UseFont = true; + this.txtWlid.Properties.ReadOnly = true; + this.txtWlid.Size = new System.Drawing.Size(234, 24); + this.txtWlid.StyleController = this.layout99; + this.txtWlid.TabIndex = 214; + // + // txt_psnQty_1 + // + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44); + this.txt_psnQty_1.Name = "txt_psnQty_1"; + this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; + this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); + this.txt_psnQty_1.StyleController = this.layout99; + this.txt_psnQty_1.TabIndex = 226; + // + // txtWlmc + // + this.txtWlmc.Location = new System.Drawing.Point(114, 44); + this.txtWlmc.Name = "txtWlmc"; + this.txtWlmc.Properties.Appearance.Options.UseFont = true; + this.txtWlmc.Properties.ReadOnly = true; + this.txtWlmc.Size = new System.Drawing.Size(234, 24); + this.txtWlmc.StyleController = this.layout99; + this.txtWlmc.TabIndex = 216; + // + // txtWlgg + // + this.txtWlgg.Location = new System.Drawing.Point(114, 76); + this.txtWlgg.Name = "txtWlgg"; + this.txtWlgg.Properties.Appearance.Options.UseFont = true; + this.txtWlgg.Properties.ReadOnly = true; + this.txtWlgg.Size = new System.Drawing.Size(574, 24); + this.txtWlgg.TabIndex = 218; + // + // txt_kQty + // + this.txt_kQty.Location = new System.Drawing.Point(794, 12); + this.txt_kQty.Name = "txt_kQty"; + this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; + this.txt_kQty.Properties.Appearance.Options.UseFont = true; + this.txt_kQty.Properties.Appearance.Options.UseForeColor = true; + this.txt_kQty.Properties.ReadOnly = true; + this.txt_kQty.Size = new System.Drawing.Size(234, 24); + this.txt_kQty.StyleController = this.layout99; + this.txt_kQty.TabIndex = 224; + // + // txtQuantity + // + this.txtQuantity.Location = new System.Drawing.Point(454, 12); + this.txtQuantity.Name = "txtQuantity"; + this.txtQuantity.Properties.Appearance.Options.UseFont = true; + this.txtQuantity.Properties.ReadOnly = true; + this.txtQuantity.Size = new System.Drawing.Size(234, 24); + this.txtQuantity.StyleController = this.layout99; + this.txtQuantity.TabIndex = 220; + // + // txt_yQty + // + this.txt_yQty.Location = new System.Drawing.Point(454, 44); + this.txt_yQty.Name = "txt_yQty"; + this.txt_yQty.Properties.Appearance.Options.UseFont = true; + this.txt_yQty.Properties.ReadOnly = true; + this.txt_yQty.Size = new System.Drawing.Size(234, 24); + this.txt_yQty.StyleController = this.layout99; + this.txt_yQty.TabIndex = 222; + // + // layoutControlItem29 + // + this.layoutControlItem29.Control = this.lbMxGuid; + this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64); + this.layoutControlItem29.Name = "layoutControlItem29"; + this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem29.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem29.Text = "lbMxGuid"; + this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem29.TextVisible = false; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.GroupBordersVisible = false; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItem22, + this.layoutControlItem23, + this.layoutControlItem24, + this.layoutControlItem25, + this.layoutControlItem26, + this.layoutControlItem27, + this.layoutControlItem28, + this.layoutControlItem30, + this.layoutControlItem31, + this.layoutControlItem32}); + this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; + this.layoutControlGroup1.Name = "Root"; + columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition7.Width = 100D; + columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition8.Width = 100D; + columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition9.Width = 100D; + columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition10.Width = 100D; + this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { + columnDefinition7, + columnDefinition8, + columnDefinition9, + columnDefinition10}); + 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[] { + rowDefinition6, + rowDefinition7, + rowDefinition8}); + this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116); + this.layoutControlGroup1.TextVisible = false; + // + // layoutControlItem22 + // + this.layoutControlItem22.Control = this.txtWlid; + this.layoutControlItem22.Location = new System.Drawing.Point(0, 0); + this.layoutControlItem22.Name = "layoutControlItem22"; + this.layoutControlItem22.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem22.Text = "鐗╂枡缂栫爜"; + this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem23 + // + this.layoutControlItem23.Control = this.txtWlmc; + this.layoutControlItem23.Location = new System.Drawing.Point(0, 32); + this.layoutControlItem23.Name = "layoutControlItem23"; + this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem23.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem23.Text = "鐗╂枡鍚嶇О"; + this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem24 + // + this.layoutControlItem24.Control = this.txtWlgg; + this.layoutControlItem24.Location = new System.Drawing.Point(0, 64); + this.layoutControlItem24.Name = "layoutControlItem24"; + this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2; + this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem24.Size = new System.Drawing.Size(680, 32); + this.layoutControlItem24.Text = "鐗╂枡瑙勬牸"; + this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem25 + // + this.layoutControlItem25.Control = this.txtQuantity; + this.layoutControlItem25.Location = new System.Drawing.Point(340, 0); + this.layoutControlItem25.Name = "layoutControlItem25"; + this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem25.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺"; + this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.txt_yQty; + this.layoutControlItem26.Location = new System.Drawing.Point(340, 32); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem26.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem27 + // + this.layoutControlItem27.Control = this.txt_kQty; + this.layoutControlItem27.Location = new System.Drawing.Point(680, 0); + this.layoutControlItem27.Name = "layoutControlItem27"; + this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem27.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem27.Text = "鍙墦鍗版�绘暟"; + this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem28 + // + this.layoutControlItem28.Control = this.txt_psnQty_1; + this.layoutControlItem28.Location = new System.Drawing.Point(680, 32); + this.layoutControlItem28.Name = "layoutControlItem28"; + this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem28.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem28.Text = "姣忓紶鏉$爜鏁伴噺"; + this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18); + // + // layoutControlItem30 + // + this.layoutControlItem30.Control = this.radOut; + this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0); + this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28); + this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28); + this.layoutControlItem30.Name = "layoutControlItem30"; + this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0); + this.layoutControlItem30.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem30.Text = "鑷姩璁$畻"; + this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem30.TextVisible = false; + // + // layoutControlItem31 + // + this.layoutControlItem31.Control = this.ucBtnPrint1; + this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32); + this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32); + this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32); + this.layoutControlItem31.Name = "layoutControlItem31"; + this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); + this.layoutControlItem31.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳"; + this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem31.TextVisible = false; + // + // layoutControlItem32 + // + this.layoutControlItem32.Control = this.layoutControl1; + this.layoutControlItem32.Location = new System.Drawing.Point(680, 64); + this.layoutControlItem32.Name = "layoutControlItem32"; + this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; + this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem32.Size = new System.Drawing.Size(340, 32); + this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺"; + this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem32.TextVisible = false; // // gcMx1 // @@ -1197,7 +1661,7 @@ this.repositoryItemButtonEdit1, this.repositoryItemComboBox1, this.repositoryItemDateEdit1}); - this.gcMx1.Size = new System.Drawing.Size(1272, 342); + this.gcMx1.Size = new System.Drawing.Size(1272, 233); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1382,7 +1846,7 @@ this.gvMx1materialSpecification.Name = "gvMx1materialSpecification"; this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION"; this.gvMx1materialSpecification.Visible = true; - this.gvMx1materialSpecification.VisibleIndex = 2; + this.gvMx1materialSpecification.VisibleIndex = 9; this.gvMx1materialSpecification.Width = 94; // // gridColumn20 @@ -1392,7 +1856,7 @@ this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 3; + this.gridColumn20.VisibleIndex = 2; this.gridColumn20.Width = 94; // // gvMx1salesUnitId @@ -1404,7 +1868,7 @@ this.gvMx1salesUnitId.Name = "gvMx1salesUnitId"; this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID"; this.gvMx1salesUnitId.Visible = true; - this.gvMx1salesUnitId.VisibleIndex = 4; + this.gvMx1salesUnitId.VisibleIndex = 3; this.gvMx1salesUnitId.Width = 94; // // gvMx1salesQuantity @@ -1416,7 +1880,7 @@ this.gvMx1salesQuantity.Name = "gvMx1salesQuantity"; this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY"; this.gvMx1salesQuantity.Visible = true; - this.gvMx1salesQuantity.VisibleIndex = 5; + this.gvMx1salesQuantity.VisibleIndex = 4; this.gvMx1salesQuantity.Width = 94; // // gridColumn32 @@ -1442,7 +1906,7 @@ this.gvMx1note.Name = "gvMx1note"; this.gvMx1note.Tag = "edit"; this.gvMx1note.Visible = true; - this.gvMx1note.VisibleIndex = 7; + this.gvMx1note.VisibleIndex = 6; this.gvMx1note.Width = 94; // // gridColumn13 @@ -1457,7 +1921,7 @@ this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Tag = "yz_quantity_0_edit"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 6; + this.gridColumn13.VisibleIndex = 5; this.gridColumn13.Width = 94; // // gvMx1returnDate @@ -1474,7 +1938,7 @@ this.gvMx1returnDate.Name = "gvMx1returnDate"; this.gvMx1returnDate.Tag = "edit"; this.gvMx1returnDate.Visible = true; - this.gvMx1returnDate.VisibleIndex = 8; + this.gvMx1returnDate.VisibleIndex = 7; this.gvMx1returnDate.Width = 94; // // repositoryItemDateEdit1 @@ -1512,7 +1976,7 @@ this.gvMx1returnType.Name = "gvMx1returnType"; this.gvMx1returnType.Tag = "edit"; this.gvMx1returnType.Visible = true; - this.gvMx1returnType.VisibleIndex = 9; + this.gvMx1returnType.VisibleIndex = 8; this.gvMx1returnType.Width = 94; // // repositoryItemComboBox1 @@ -1581,7 +2045,7 @@ // this.tabMxPage2.Controls.Add(this.gcMx2); this.tabMxPage2.Name = "tabMxPage2"; - this.tabMxPage2.Size = new System.Drawing.Size(1272, 342); + this.tabMxPage2.Size = new System.Drawing.Size(1272, 382); this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�"; // // gcMx2 @@ -1590,7 +2054,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, 342); + this.gcMx2.Size = new System.Drawing.Size(1272, 382); this.gcMx2.TabIndex = 3; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1796,7 +2260,7 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit(); @@ -1816,29 +2280,64 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.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.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).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.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit(); + this.split99.Panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit(); + this.split99.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit(); + this.split99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit(); + this.layout99.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit(); @@ -1906,10 +2405,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; @@ -1948,6 +2443,16 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; + private UserControl.UcBtnPrint ucBtnPrint1; + private DevExpress.XtraEditors.LabelControl lbMxGuid; + private DevExpress.XtraEditors.TextEdit txt_iCount_1; + private DevExpress.XtraEditors.TextEdit txt_psnQty_1; + private DevExpress.XtraEditors.TextEdit txt_kQty; + private DevExpress.XtraEditors.TextEdit txt_yQty; + private DevExpress.XtraEditors.TextEdit txtQuantity; + private DevExpress.XtraEditors.TextEdit txtWlgg; + private DevExpress.XtraEditors.TextEdit txtWlmc; + private DevExpress.XtraEditors.TextEdit txtWlid; private DevExpress.XtraTab.XtraTabPage tabMxPage2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; @@ -1958,12 +2463,9 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; private DevExpress.XtraGrid.Columns.GridColumn gridColumn26; private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18; - private DevExpress.XtraEditors.RadioGroup txt_fIsLink; + private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraGrid.GridControl gcMx2; @@ -1983,5 +2485,32 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn32; + private DevExpress.XtraEditors.RadioGroup radOut; + private DevExpress.XtraEditors.SplitContainerControl split99; + private DevExpress.XtraLayout.LayoutControl layout99; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; + private DevExpress.XtraLayout.LayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32; + 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 DevExpress.XtraLayout.LayoutControlItem layoutControlItem17; } } \ 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 226ff69..bee37e3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs @@ -1,4 +1,5 @@ using DevExpress.XtraEditors; +using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -72,14 +73,98 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } + }; + //鎵撳嵃浜嬩欢 + this.ucBtnPrint1.btnPrintClick += (s, e) => + { + string rowGuid = lbMxGuid.Text.Trim(); + ucBtnPrint1.guidKey = rowGuid; + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�"); + txt_iCount_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�"); + txt_psnQty_1.Focus(); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + if (lbMxGuid.Text.Trim().Length < 10) + { + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�"); + this.ucBtnPrint1.rptParameter = "return false"; + return; + } + this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭 + + "," + "" + + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟 + + "," + txt_iCount_1.Text.Trim()//寮犳暟 + + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉$爜鏁伴噺 + + "}"; + txt_iCount_1.Text = ""; + txt_psnQty_1.Text = ""; + }; + //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢 + this.ucBtnPrint1.btnAllClick += (s, e) => + { + string rowGuid = lbMxGuid.Text.Trim(); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.閿�鍞��璐у叆搴撴.ToString()); + string strCodeList = ""; + string strAction = ""; + frm.UpdateParent += (ss, ee) => + { + strCodeList = ee.StringSingle; + strAction = ee.Data; + }; + frm.ShowDialog(); + if (string.IsNullOrEmpty(strCodeList)) + return; + if (strAction == "print") + { + try + { + string rptParameter = "rpt_Xsth{" + + "100"//閲嶆墦閮芥槸浼�100锛� + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); + } + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } + } + }; + gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; + //鎵撳嵃鑷姩璁$畻 + txt_psnQty_1.TextChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); + }; + radOut.SelectedIndexChanged += (s, e) => + { + Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { - Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); Task.Delay(100); getPageList(1); } @@ -139,7 +224,7 @@ lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -157,18 +242,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -206,7 +292,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billno"); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -221,6 +307,10 @@ gvList.Add(gvMx2); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } + //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼 + + txt_fHasLinkRad.ReadOnly = true; + txt_salesOrderId.IsReadly = true; } /// <summary> /// 鏂板浜嬩欢 @@ -251,22 +341,21 @@ string FNote = txt_returnReason.Text.ToString(); string _sqGuid = txt_salesOrderId.GetId(); string ckId = txt_fstockid.GetId(); - int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0; if (string.IsNullOrEmpty(_sqGuid)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞鍗曪紒"); txt_salesOrderId.Focus(); return; } if (txt_billType.SelectedIndex < 0) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�"); txt_billType.Focus(); return; } if (string.IsNullOrEmpty(ckId)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�"); txt_fstockid.Focus(); return; } @@ -277,7 +366,7 @@ salesId = _sqGuid,//閿�鍞崟鍙� inRemark = FNote.Trim(),//澶囨敞 ckId = ckId, - FIsLink = _fIsLink,//鏈夋棤婧愬崟 + FIsLink = txt_fHasLinkRad.SelectedIndex, list = new List<dynamic>(), }; gvMx1.CloseEditor(); @@ -476,11 +565,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -521,13 +610,14 @@ case 0: strMsg = "鍙嶅鏍�"; break; - }; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -543,9 +633,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -554,10 +644,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "chkStatus", "approvedBy", "approvedDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e) @@ -609,15 +701,46 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + getModel(lbGuid.Text); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } + + private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) + { + if (e.FocusedRowHandle >= 0) + { + DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle); + lbMxGuid.Text = row["guid"].ToString(); + ucBtnPrint1.guidKey = row["guid"].ToString(); + txtWlid.Text = row["itemNo"].ToString(); + txtWlgg.Text = row["itemModel"].ToString(); + txtWlmc.Text = row["itemName"].ToString(); + txtQuantity.Text = row["sqQty"].ToString();//鐢宠鎬婚噺 + txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 + txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 + } + else + { + lbMxGuid.Text = ""; + ucBtnPrint1.guidKey = ""; + txtWlid.Text = ""; + txtWlgg.Text = ""; + txtWlmc.Text = ""; + txtQuantity.Text = ""; + txt_yQty.Text = ""; + txt_kQty.Text = ""; + txt_psnQty_1.Text = ""; + txt_iCount_1.Text = ""; + } + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs deleted file mode 100644 index e4e74f4..0000000 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs +++ /dev/null @@ -1,370 +0,0 @@ -/* Create By GS EasyCode */ -namespace Gs.DevApp.DevFrm -{ - partial class Frm_PrintUser - { - /// <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.components = new System.ComponentModel.Container(); - this.lb_isStatus = new DevExpress.XtraEditors.LabelControl(); - this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn(); - this.lb_remark1 = new DevExpress.XtraEditors.LabelControl(); - this.txt_remark1 = new DevExpress.XtraEditors.TextEdit(); - this.gv_remark1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.lb_printId = new DevExpress.XtraEditors.LabelControl(); - this.gv_printId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.lb_userId = new DevExpress.XtraEditors.LabelControl(); - this.gv_userId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); - this.gcMain = new DevExpress.XtraGrid.GridControl(); - this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); - this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); - this.pageBar1 = new UserControls.Data.UcPageBar(); - this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); - this.panel1 = new System.Windows.Forms.Panel(); - this.txt_isStatus = new DevExpress.XtraEditors.CheckEdit(); - this.txt_printId = new Gs.DevApp.UserControl.UcLookPrint(); - this.txt_userId = new Gs.DevApp.UserControl.UcLookUser(); - this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); - this.lbGuid = new System.Windows.Forms.Label(); - this.tips = new DevExpress.Utils.ToolTipController(this.components); - ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); - this.xtraTabControl1.SuspendLayout(); - this.xtraTabPage1.SuspendLayout(); - this.xtraTabPage2.SuspendLayout(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit(); - this.SuspendLayout(); - // - // lb_isStatus - // - this.lb_isStatus.Appearance.Options.UseFont = true; - this.lb_isStatus.Location = new System.Drawing.Point(44, 125); - this.lb_isStatus.Name = "lb_isStatus"; - this.lb_isStatus.Size = new System.Drawing.Size(65, 18); - this.lb_isStatus.TabIndex = 222; - this.lb_isStatus.Text = "鏄惁鍚敤:"; - // - // gv_isStatus - // - this.gv_isStatus.AppearanceCell.Options.UseFont = true; - this.gv_isStatus.Caption = "鏄惁鍚敤 "; - this.gv_isStatus.FieldName = "isStatus"; - this.gv_isStatus.MinWidth = 50; - this.gv_isStatus.Name = "gv_isStatus"; - this.gv_isStatus.OptionsColumn.AllowEdit = false; - this.gv_isStatus.Tag = "query_a.is_status"; - this.gv_isStatus.Visible = true; - this.gv_isStatus.VisibleIndex = 4; - this.gv_isStatus.Width = 94; - // - // lb_remark1 - // - this.lb_remark1.Appearance.Options.UseFont = true; - this.lb_remark1.Location = new System.Drawing.Point(78, 91); - this.lb_remark1.Name = "lb_remark1"; - this.lb_remark1.Size = new System.Drawing.Size(35, 18); - this.lb_remark1.TabIndex = 216; - this.lb_remark1.Text = "澶囨敞:"; - // - // txt_remark1 - // - this.txt_remark1.Location = new System.Drawing.Point(126, 91); - this.txt_remark1.Name = "txt_remark1"; - this.txt_remark1.Properties.Appearance.Options.UseFont = true; - this.txt_remark1.Size = new System.Drawing.Size(194, 24); - this.txt_remark1.TabIndex = 216; - // - // gv_remark1 - // - this.gv_remark1.AppearanceCell.Options.UseFont = true; - this.gv_remark1.Caption = "澶囨敞"; - this.gv_remark1.FieldName = "remark1"; - this.gv_remark1.MinWidth = 120; - this.gv_remark1.Name = "gv_remark1"; - this.gv_remark1.OptionsColumn.AllowEdit = false; - this.gv_remark1.Tag = "query_a.remark1"; - this.gv_remark1.Visible = true; - this.gv_remark1.VisibleIndex = 3; - this.gv_remark1.Width = 120; - // - // lb_printId - // - this.lb_printId.Appearance.Options.UseFont = true; - this.lb_printId.Location = new System.Drawing.Point(44, 61); - this.lb_printId.Name = "lb_printId"; - this.lb_printId.Size = new System.Drawing.Size(65, 18); - this.lb_printId.TabIndex = 213; - this.lb_printId.Text = "閫夋墦鍗版満:"; - // - // gv_printId - // - this.gv_printId.AppearanceCell.Options.UseFont = true; - this.gv_printId.Caption = "鎵撳嵃鏈虹紪鍙�"; - this.gv_printId.FieldName = "printNo"; - this.gv_printId.MinWidth = 120; - this.gv_printId.Name = "gv_printId"; - this.gv_printId.OptionsColumn.AllowEdit = false; - this.gv_printId.Tag = "query_a.print_id"; - this.gv_printId.Visible = true; - this.gv_printId.VisibleIndex = 2; - this.gv_printId.Width = 120; - // - // lb_userId - // - this.lb_userId.Appearance.Options.UseFont = true; - this.lb_userId.Location = new System.Drawing.Point(44, 20); - this.lb_userId.Name = "lb_userId"; - this.lb_userId.Size = new System.Drawing.Size(65, 18); - this.lb_userId.TabIndex = 211; - this.lb_userId.Text = "閫夋嫨鐢ㄦ埛:"; - // - // gv_userId - // - this.gv_userId.AppearanceCell.Options.UseFont = true; - this.gv_userId.Caption = "鐢ㄦ埛璐﹀彿"; - this.gv_userId.FieldName = "account"; - this.gv_userId.MinWidth = 100; - this.gv_userId.Name = "gv_userId"; - this.gv_userId.OptionsColumn.AllowEdit = false; - this.gv_userId.Tag = "query_a.user_id"; - this.gv_userId.Visible = true; - this.gv_userId.VisibleIndex = 0; - this.gv_userId.Width = 100; - // - // toolBarMenu1 - // - this.toolBarMenu1.chkParameter = null; - this.toolBarMenu1.currentAction = null; - this.toolBarMenu1.defaultActions = null; - this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; - this.toolBarMenu1.guidKey = null; - this.toolBarMenu1.isSetBtn = false; - this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); - this.toolBarMenu1.Name = "toolBarMenu1"; - this.toolBarMenu1.rptParameter = null; - this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); - this.toolBarMenu1.TabIndex = 0; - this.toolBarMenu1.xlsInService = null; - this.toolBarMenu1.xlsOutParameter = null; - // - // gcMain - // - this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.gcMain.Location = new System.Drawing.Point(0, 0); - this.gcMain.MainView = this.gridView1; - this.gcMain.Name = "gcMain"; - this.gcMain.Size = new System.Drawing.Size(1126, 531); - this.gcMain.TabIndex = 1; - this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { - this.gridView1}); - // - // gridView1 - // - this.gridView1.Appearance.Row.Options.UseFont = true; - this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gv_userId, - this.gridColumn1, - this.gv_printId, - this.gv_remark1, - this.gv_isStatus}); - this.gridView1.GridControl = this.gcMain; - this.gridView1.IndicatorWidth = 50; - this.gridView1.Name = "gridView1"; - this.gridView1.OptionsFind.ShowSearchNavButtons = false; - this.gridView1.OptionsView.ShowAutoFilterRow = true; - this.gridView1.OptionsView.ShowGroupPanel = false; - // - // gridColumn1 - // - this.gridColumn1.Caption = "鐢ㄦ埛鍚嶇О"; - this.gridColumn1.FieldName = "userName"; - this.gridColumn1.MinWidth = 100; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 1; - this.gridColumn1.Width = 100; - // - // xtraTabControl1 - // - this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; - this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); - this.xtraTabControl1.Name = "xtraTabControl1"; - this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; - this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); - this.xtraTabControl1.TabIndex = 3; - this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { - this.xtraTabPage1, - this.xtraTabPage2}); - // - // xtraTabPage1 - // - this.xtraTabPage1.Controls.Add(this.gcMain); - this.xtraTabPage1.Controls.Add(this.pageBar1); - this.xtraTabPage1.Name = "xtraTabPage1"; - this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); - this.xtraTabPage1.Text = "鏁版嵁鏌ヨ"; - // - // pageBar1 - // - this.pageBar1.CurrentPage = 1; - this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pageBar1.Location = new System.Drawing.Point(0, 531); - this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); - this.pageBar1.Name = "pageBar1"; - this.pageBar1.RecordCount = 0; - this.pageBar1.Size = new System.Drawing.Size(1126, 39); - this.pageBar1.TabIndex = 3; - this.pageBar1.TotalPages = 0; - // - // xtraTabPage2 - // - this.xtraTabPage2.Controls.Add(this.panel1); - this.xtraTabPage2.Name = "xtraTabPage2"; - this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); - this.xtraTabPage2.Text = "鏁版嵁缂栬緫"; - // - // panel1 - // - this.panel1.BackColor = System.Drawing.Color.White; - this.panel1.Controls.Add(this.txt_isStatus); - this.panel1.Controls.Add(this.txt_printId); - this.panel1.Controls.Add(this.txt_userId); - this.panel1.Controls.Add(this.labelControl11); - this.panel1.Controls.Add(this.lbGuid); - this.panel1.Controls.Add(this.lb_isStatus); - this.panel1.Controls.Add(this.lb_remark1); - this.panel1.Controls.Add(this.txt_remark1); - this.panel1.Controls.Add(this.lb_printId); - this.panel1.Controls.Add(this.lb_userId); - this.panel1.Location = new System.Drawing.Point(76, 20); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(664, 264); - this.panel1.TabIndex = 1; - // - // txt_isStatus - // - this.txt_isStatus.Location = new System.Drawing.Point(126, 123); - this.txt_isStatus.Name = "txt_isStatus"; - this.txt_isStatus.Properties.Caption = ""; - this.txt_isStatus.Size = new System.Drawing.Size(94, 24); - this.txt_isStatus.TabIndex = 225; - this.txt_isStatus.Tag = "moren.true"; - // - // txt_printId - // - this.txt_printId.IsReadly = false; - this.txt_printId.Location = new System.Drawing.Point(126, 55); - this.txt_printId.Name = "txt_printId"; - this.txt_printId.Size = new System.Drawing.Size(194, 30); - this.txt_printId.TabIndex = 224; - // - // txt_userId - // - this.txt_userId.IsReadly = false; - this.txt_userId.Location = new System.Drawing.Point(126, 20); - this.txt_userId.Name = "txt_userId"; - this.txt_userId.Size = new System.Drawing.Size(194, 30); - this.txt_userId.TabIndex = 223; - // - // labelControl11 - // - this.labelControl11.Location = new System.Drawing.Point(403, 30); - this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.labelControl11.Name = "labelControl11"; - this.labelControl11.Size = new System.Drawing.Size(45, 18); - this.labelControl11.TabIndex = 130; - this.labelControl11.Text = "涓婚敭锛�"; - this.labelControl11.Visible = false; - // - // lbGuid - // - this.lbGuid.AutoSize = true; - this.lbGuid.Location = new System.Drawing.Point(454, 30); - this.lbGuid.Name = "lbGuid"; - this.lbGuid.Size = new System.Drawing.Size(0, 18); - this.lbGuid.TabIndex = 1; - this.lbGuid.Visible = false; - // - // Frm_PrintUser - // - 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.xtraTabControl1); - this.Controls.Add(this.toolBarMenu1); - this.Name = "Frm_PrintUser"; - this.Text = "鎵撳嵃鏈虹粦瀹�"; - ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); - this.xtraTabControl1.ResumeLayout(false); - this.xtraTabPage1.ResumeLayout(false); - this.xtraTabPage2.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit(); - this.ResumeLayout(false); - - } - #endregion - private UserControl.UcToolBarMenu toolBarMenu1; - private DevExpress.XtraGrid.GridControl gcMain; - private DevExpress.XtraGrid.Views.Grid.GridView gridView1; - private DevExpress.XtraTab.XtraTabControl xtraTabControl1; - private DevExpress.XtraTab.XtraTabPage xtraTabPage1; - private DevExpress.XtraTab.XtraTabPage xtraTabPage2; - private UserControls.Data.UcPageBar pageBar1; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label lbGuid; - private DevExpress.XtraEditors.LabelControl labelControl11; - //BQCreateConrolObejct -private DevExpress.XtraEditors.LabelControl lb_isStatus; - private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus; - -private DevExpress.XtraEditors.LabelControl lb_remark1; -private DevExpress.XtraEditors.TextEdit txt_remark1; - private DevExpress.XtraGrid.Columns.GridColumn gv_remark1; - -private DevExpress.XtraEditors.LabelControl lb_printId; - private DevExpress.XtraGrid.Columns.GridColumn gv_printId; - -private DevExpress.XtraEditors.LabelControl lb_userId; - private DevExpress.XtraGrid.Columns.GridColumn gv_userId; - private UserControl.UcLookUser txt_userId; - private UserControl.UcLookPrint txt_printId; - private DevExpress.XtraEditors.CheckEdit txt_isStatus; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private DevExpress.Utils.ToolTipController tips; - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs deleted file mode 100644 index a35334f..0000000 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs +++ /dev/null @@ -1,326 +0,0 @@ -using Gs.DevApp.Entity; -using Gs.DevApp.ToolBox; -using Gs.DevApp.UserControl; -using MES.Service.Modes; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Data; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Gs.DevApp.DevFrm -{ - public partial class Frm_PrintUser : DevExpress.XtraEditors.XtraForm - { - string _webServiceName = "PrintUserManager/"; - List<FilterEntity> _filterList = new List<FilterEntity>(); - public Frm_PrintUser() - { - InitializeComponent(); - this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; - this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; - this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; - this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; - this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; - this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; - this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; - this.toolBarMenu1.getXmlConfig(); - Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) => - { - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0); - }, tips); - Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) => - { - getModel(value); - }, (value) => - { - getPageList(this.pageBar1.CurrentPage); - }, lbGuid); - getPageList(1); - pageBar1.PagerEvent += PageBar1_PagerEvent; - } - private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) - { - _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); - await Task.Delay(100); - getPageList(1); - } - - /// <summary> - /// 鍒嗛〉浜嬩欢 - /// </summary> - /// <param name="curPage"></param> - /// <param name="pageSize"></param> - private void PageBar1_PagerEvent(int curPage, int pageSize) - { - getPageList(curPage); - } - /// <summary> - /// 鏌ヨ浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) - { - gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; - gridView1.ActiveFilter.Clear(); - gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName); - frm.UpdateParent += Frm_UpdateParent; - frm.ShowDialog(); - } - /// <summary> - /// 鏌ヨ鍥炶皟 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) - { - _filterList = e.FilterList; - getPageList(1); - } - - /// <summary> - /// 鍙栨秷浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) - { - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1); - } - - /// <summary> - /// 鍒犻櫎浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) - { - string rowGuid = "", rowName = ""; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_remark1, gridView1); - if (string.IsNullOrEmpty(rowGuid)) - { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) - return; - List<dynamic> lst = new List<dynamic>(); - lst.Add(rowGuid); - var _obj = lst; - try - { - string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); - ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - if (xtraTabControl1.SelectedTabPageIndex == 0) - { } - else - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); - getPageList(this.pageBar1.CurrentPage); - } - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - - /// <summary> - /// 鍒锋柊浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) - { - if (xtraTabControl1.SelectedTabPageIndex == 1) - getModel(lbGuid.Text.Trim()); - else - { - //_filterList.Clear(); - //if (gridView1.ActiveFilter.Count > 0) - //{ - // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; - // gridView1.ActiveFilter.Clear(); - // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - //} - //getPageList(1); - getPageList(this.pageBar1.CurrentPage); - } - } - /// <summary> - /// 淇敼浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) - { - string rowGuid = "", rowName = ""; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_remark1, gridView1); - if (string.IsNullOrEmpty(rowGuid)) - { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); - if (xtraTabControl1.SelectedTabPageIndex == 1) - { - getModel(rowGuid); - } - else - { - UtilityHelper.ChangeEnableByControl(panel1.Controls, true); - } - - } - /// <summary> - /// 鏂板浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) - { - lbGuid.Text = ""; - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4); - UtilityHelper.CleanValueByControl(panel1.Controls, true); - } - /// <summary> - /// 淇濆瓨浜嬩欢 - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) - { - string _userId = txt_userId.GetGuid(); - string _printId = txt_printId.GetGuid(); - toolBarMenu1.isSetBtn = false; - if (string.IsNullOrEmpty(_userId)) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢ㄦ埛锛�"); - txt_userId.Focus(); - return; - } - if (string.IsNullOrEmpty(_printId)) - { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鎵撳嵃鏈猴紒"); - txt_printId.Focus(); - return; - } - var _obj = new PrintUser - { - Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 - UserId = UtilityHelper.ToGuid(_userId), - PrintId = UtilityHelper.ToGuid(_printId), - Remark1 = txt_remark1.Text.Trim(), - IsStatus = txt_isStatus.Checked, //鐘舵�� - }; - try - { - string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); - ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - if (_rtn.rtnCode > 0) - { - lbGuid.Text = _rtn.rtnData; - toolBarMenu1.isSetBtn = true; - UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); - toolBarMenu1.currentAction = ""; - Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); - } - } - catch (Exception ex) - { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - - /// <summary> - /// - /// </summary> - /// <param name="curPage">绗嚑椤�</param> - /// <param name="pageSize">姣忛〉鍑犳潯</param> - private void getPageList(int curPage) - { - gcMain.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); - _sbSqlWhere += " and c.GUID is not null and b.guid is not null"; - var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "c.ACCOUNT", - "asc", "", _sbSqlWhere.ToString()); - var json = JsonConvert.SerializeObject(pgq); - try - { - var strReturn = UtilityHelper.HttpPost("", - _webServiceName + "GetListPage", json); - var dd = UtilityHelper.ReturnToTablePage(strReturn); - if (dd.rtnCode > 0) - { - DataTable dt = dd.rtnData.list; - gcMain.BindingContext = new BindingContext(); - gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; - if (dt.Rows.Count > 0) - { - gcMain.DataSource = dt; - gcMain.ForceInitialize(); - gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); - } - else - UtilityHelper.SetDefaultTable(gcMain, gridView1); - gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; - pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 - pageBar1.CurrentPage = curPage;//褰撳墠椤� - pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 - } - else - { - ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); - } - } - catch (Exception ex) - { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - - } - /// <summary> - /// - /// </summary> - /// <param name="strGuid">涓婚敭</param> - /// <param name="isEdit">鏄惁鍙紪杈�</param> - /// <param name="tabIdx">閫夐」鍗″簭鍙�</param> - private void getModel(string strGuid) - { - bool isEdit = false; - if (toolBarMenu1.currentAction == "add") return; - if (toolBarMenu1.currentAction == "edit") isEdit = true; - if (string.IsNullOrEmpty(strGuid)) - { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - var _obj = new - { - guid = strGuid,//涓诲缓 - }; - try - { - string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); - ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0) - { - dynamic dy = _rtn.rtnData; - lbGuid.Text = strGuid; - UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit); - } - else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); - } - catch (Exception ex) - { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); - } - } - } -} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx deleted file mode 100644 index a4826a3..0000000 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx +++ /dev/null @@ -1,123 +0,0 @@ -<?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> - <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> - </metadata> -</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs index fc7e1ff..aaf2e0f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs @@ -63,7 +63,8 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + gridView1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); @@ -75,7 +76,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs index ec3ff79..5569fec 100644 --- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs +++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs @@ -106,7 +106,7 @@ lbGuid, txt_roleName, gridView1, "roleName"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵\n璇ユ搷浣滃皢浼氭竻绌虹浉搴旂殑鐢ㄦ埛鏉冮檺")) @@ -121,17 +121,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -169,7 +171,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -205,14 +207,14 @@ toolBarMenu1.isSetBtn = false; if (string.IsNullOrEmpty(txt_roleName.Text.Trim())) { - MsgHelper.Warning("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�"); + MsgHelper.ShowError("瑙掕壊鍚嶇О涓嶈兘涓虹┖锛�"); txt_roleName.Focus(); return; } if (string.IsNullOrEmpty(txt_roleRemark.Text.Trim())) { - MsgHelper.Warning("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�"); + MsgHelper.ShowError("瑙掕壊澶囨敞涓嶈兘涓虹┖锛�"); txt_roleRemark.Focus(); return; } @@ -228,19 +230,21 @@ var strJson = UtilityHelper.HttpPost("", "Role/EditModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false); toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -283,7 +287,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -297,7 +301,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -318,12 +322,12 @@ } else { - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } // 閬嶅巻TreeView涓殑鎵�鏈夎妭鐐� diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs index c382656..44372c0 100644 --- a/DevApp/Gs.DevApp/DevFrm/User/User.cs +++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs @@ -105,7 +105,7 @@ lbGuid, txt_userName, gridView1, "userName"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } @@ -121,14 +121,16 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } + else - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { @@ -169,7 +171,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -207,21 +209,21 @@ toolBarMenu1.isSetBtn = false; if (string.IsNullOrEmpty(txt_account.Text.Trim())) { - MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); + MsgHelper.ShowError("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); txt_account.Focus(); return; } if (string.IsNullOrEmpty(txt_password.Text.Trim())) { - MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�"); + MsgHelper.ShowError("瀵嗙爜涓嶈兘涓虹┖锛�"); txt_password.Focus(); return; } if (string.IsNullOrEmpty(txt_userName.Text.Trim())) { - MsgHelper.Warning("濮撳悕涓嶈兘涓虹┖锛�"); + MsgHelper.ShowError("濮撳悕涓嶈兘涓虹┖锛�"); txt_userName.Focus(); return; } @@ -245,15 +247,17 @@ var strJson = UtilityHelper.HttpPost("", "User/EditModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData; toolBarMenu1.isSetBtn = true; UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false); toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { @@ -301,7 +305,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -315,7 +319,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -336,12 +340,12 @@ } else { - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs index 92979ef..839920c 100644 --- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs +++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs @@ -26,7 +26,7 @@ { if (string.IsNullOrEmpty(_userGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勭敤鎴凤紒"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勭敤鎴凤紒"); return; } @@ -52,12 +52,15 @@ strJson = UtilityHelper.HttpPost("", "Role/SetUserRole", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg); + if (_rtn.rtnCode > 0) + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg); Close(); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -92,7 +95,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -166,7 +169,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs index e850eef..021522d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs @@ -287,7 +287,6 @@ { array1.Add(a); } - DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString()); if (dt1.Rows.Count > 0) { @@ -321,11 +320,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs index 6566a59..1d1c252 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs @@ -352,8 +352,6 @@ this.gv_factory.Name = "gv_factory"; this.gv_factory.OptionsColumn.AllowEdit = false; this.gv_factory.Tag = "query_a.ebelnK3id"; - this.gv_factory.Visible = true; - this.gv_factory.VisibleIndex = 0; this.gv_factory.Width = 80; // // gv_billNo @@ -366,7 +364,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.BILL_NO"; this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 1; + this.gv_billNo.VisibleIndex = 0; this.gv_billNo.Width = 120; // // gv_documentStatus @@ -379,7 +377,7 @@ this.gv_documentStatus.OptionsColumn.AllowEdit = false; this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS"; this.gv_documentStatus.Visible = true; - this.gv_documentStatus.VisibleIndex = 2; + this.gv_documentStatus.VisibleIndex = 1; this.gv_documentStatus.Width = 70; // // gv_documentType @@ -392,7 +390,7 @@ this.gv_documentType.OptionsColumn.AllowEdit = false; this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE"; this.gv_documentType.Visible = true; - this.gv_documentType.VisibleIndex = 3; + this.gv_documentType.VisibleIndex = 2; this.gv_documentType.Width = 80; // // gv_businessType @@ -404,8 +402,6 @@ this.gv_businessType.Name = "gv_businessType"; this.gv_businessType.OptionsColumn.AllowEdit = false; this.gv_businessType.Tag = "query_a.BUSINESS_TYPE"; - this.gv_businessType.Visible = true; - this.gv_businessType.VisibleIndex = 4; this.gv_businessType.Width = 80; // // gv_purchaseDate @@ -418,7 +414,7 @@ this.gv_purchaseDate.OptionsColumn.AllowEdit = false; this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE"; this.gv_purchaseDate.Visible = true; - this.gv_purchaseDate.VisibleIndex = 5; + this.gv_purchaseDate.VisibleIndex = 3; this.gv_purchaseDate.Width = 170; // // bandedGridColumn1 @@ -430,7 +426,7 @@ this.bandedGridColumn1.OptionsColumn.AllowEdit = false; this.bandedGridColumn1.Tag = "query_a.suppName"; this.bandedGridColumn1.Visible = true; - this.bandedGridColumn1.VisibleIndex = 6; + this.bandedGridColumn1.VisibleIndex = 4; this.bandedGridColumn1.Width = 134; // // gv_supplier @@ -443,7 +439,7 @@ this.gv_supplier.OptionsColumn.AllowEdit = false; this.gv_supplier.Tag = "query_a.SUPPLIER"; this.gv_supplier.Visible = true; - this.gv_supplier.VisibleIndex = 7; + this.gv_supplier.VisibleIndex = 5; this.gv_supplier.Width = 66; // // gv_closeStatus @@ -456,7 +452,7 @@ this.gv_closeStatus.OptionsColumn.AllowEdit = false; this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS"; this.gv_closeStatus.Visible = true; - this.gv_closeStatus.VisibleIndex = 8; + this.gv_closeStatus.VisibleIndex = 6; this.gv_closeStatus.Width = 80; // // bandedGridColumn2 @@ -468,7 +464,7 @@ this.bandedGridColumn2.OptionsColumn.AllowEdit = false; this.bandedGridColumn2.Tag = "query_a.departmentname"; this.bandedGridColumn2.Visible = true; - this.bandedGridColumn2.VisibleIndex = 9; + this.bandedGridColumn2.VisibleIndex = 7; this.bandedGridColumn2.Width = 80; // // gv_purchaseDept @@ -480,8 +476,6 @@ this.gv_purchaseDept.Name = "gv_purchaseDept"; this.gv_purchaseDept.OptionsColumn.AllowEdit = false; this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT"; - this.gv_purchaseDept.Visible = true; - this.gv_purchaseDept.VisibleIndex = 10; this.gv_purchaseDept.Width = 50; // // gv_purchaser @@ -494,7 +488,7 @@ this.gv_purchaser.OptionsColumn.AllowEdit = false; this.gv_purchaser.Tag = "query_a.PURCHASER"; this.gv_purchaser.Visible = true; - this.gv_purchaser.VisibleIndex = 11; + this.gv_purchaser.VisibleIndex = 8; this.gv_purchaser.Width = 60; // // gv_qualityReq @@ -507,7 +501,7 @@ this.gv_qualityReq.OptionsColumn.AllowEdit = false; this.gv_qualityReq.Tag = "query_a.QUALITY_REQ"; this.gv_qualityReq.Visible = true; - this.gv_qualityReq.VisibleIndex = 12; + this.gv_qualityReq.VisibleIndex = 9; this.gv_qualityReq.Width = 80; // // gv_settlementParty @@ -542,7 +536,7 @@ this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.REMARKS"; this.gv_remarks.Visible = true; - this.gv_remarks.VisibleIndex = 13; + this.gv_remarks.VisibleIndex = 10; this.gv_remarks.Width = 100; // // gv_cancellationStatus @@ -555,7 +549,7 @@ this.gv_cancellationStatus.OptionsColumn.AllowEdit = false; this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS"; this.gv_cancellationStatus.Visible = true; - this.gv_cancellationStatus.VisibleIndex = 14; + this.gv_cancellationStatus.VisibleIndex = 11; this.gv_cancellationStatus.Width = 60; // // gv_cancellationPerson @@ -568,7 +562,7 @@ this.gv_cancellationPerson.OptionsColumn.AllowEdit = false; this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON"; this.gv_cancellationPerson.Visible = true; - this.gv_cancellationPerson.VisibleIndex = 15; + this.gv_cancellationPerson.VisibleIndex = 12; this.gv_cancellationPerson.Width = 60; // // gv_cancellationDate @@ -581,7 +575,7 @@ this.gv_cancellationDate.OptionsColumn.AllowEdit = false; this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE"; this.gv_cancellationDate.Visible = true; - this.gv_cancellationDate.VisibleIndex = 16; + this.gv_cancellationDate.VisibleIndex = 13; this.gv_cancellationDate.Width = 180; // // gv_createBy @@ -594,7 +588,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.CREATE_BY"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 17; + this.gv_createBy.VisibleIndex = 14; this.gv_createBy.Width = 80; // // gv_createDate @@ -607,7 +601,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.CREATE_DATE"; this.gv_createDate.Visible = true; - this.gv_createDate.VisibleIndex = 18; + this.gv_createDate.VisibleIndex = 15; this.gv_createDate.Width = 180; // // gv_lastupdateDate @@ -620,7 +614,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE"; this.gv_lastupdateDate.Visible = true; - this.gv_lastupdateDate.VisibleIndex = 19; + this.gv_lastupdateDate.VisibleIndex = 16; this.gv_lastupdateDate.Width = 200; // // gv_lastupdateBy @@ -633,7 +627,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY"; this.gv_lastupdateBy.Visible = true; - this.gv_lastupdateBy.VisibleIndex = 20; + this.gv_lastupdateBy.VisibleIndex = 17; this.gv_lastupdateBy.Width = 100; // // gv_erpCheckBy @@ -646,7 +640,7 @@ this.gv_erpCheckBy.OptionsColumn.AllowEdit = false; this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY"; this.gv_erpCheckBy.Visible = true; - this.gv_erpCheckBy.VisibleIndex = 21; + this.gv_erpCheckBy.VisibleIndex = 18; this.gv_erpCheckBy.Width = 80; // // gv_erpCheckDate @@ -659,7 +653,7 @@ this.gv_erpCheckDate.OptionsColumn.AllowEdit = false; this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE"; this.gv_erpCheckDate.Visible = true; - this.gv_erpCheckDate.VisibleIndex = 22; + this.gv_erpCheckDate.VisibleIndex = 19; this.gv_erpCheckDate.Width = 180; // // gv_changereason @@ -672,7 +666,7 @@ this.gv_changereason.OptionsColumn.AllowEdit = false; this.gv_changereason.Tag = "query_a.CHANGEREASON"; this.gv_changereason.Visible = true; - this.gv_changereason.VisibleIndex = 23; + this.gv_changereason.VisibleIndex = 20; this.gv_changereason.Width = 100; // // gridColumn4 @@ -682,7 +676,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 24; + this.gridColumn4.VisibleIndex = 21; this.gridColumn4.Width = 94; // // gridColumn5 @@ -716,7 +710,7 @@ this.gridColumn11.MinWidth = 25; this.gridColumn11.Name = "gridColumn11"; this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 25; + this.gridColumn11.VisibleIndex = 22; this.gridColumn11.Width = 94; // // pageBar1 @@ -1190,8 +1184,6 @@ this.gv_erpid.FieldName = "ebelnK3id"; this.gv_erpid.MinWidth = 25; this.gv_erpid.Name = "gv_erpid"; - this.gv_erpid.Visible = true; - this.gv_erpid.VisibleIndex = 1; this.gv_erpid.Width = 46; // // gvMx1itemId @@ -1211,7 +1203,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 2; + this.gridColumn2.VisibleIndex = 1; this.gridColumn2.Width = 46; // // gridColumn1 @@ -1221,7 +1213,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 3; + this.gridColumn1.VisibleIndex = 2; this.gridColumn1.Width = 55; // // gvMx1pricingQty @@ -1253,7 +1245,7 @@ this.gvMx1deliveryDate.Name = "gvMx1deliveryDate"; this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE"; this.gvMx1deliveryDate.Visible = true; - this.gvMx1deliveryDate.VisibleIndex = 13; + this.gvMx1deliveryDate.VisibleIndex = 12; this.gvMx1deliveryDate.Width = 92; // // gvMx1earliestDeliveryDate @@ -1265,7 +1257,7 @@ this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate"; this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE"; this.gvMx1earliestDeliveryDate.Visible = true; - this.gvMx1earliestDeliveryDate.VisibleIndex = 14; + this.gvMx1earliestDeliveryDate.VisibleIndex = 13; this.gvMx1earliestDeliveryDate.Width = 92; // // gvMx1latestDeliveryDate @@ -1277,7 +1269,7 @@ this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate"; this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE"; this.gvMx1latestDeliveryDate.Visible = true; - this.gvMx1latestDeliveryDate.VisibleIndex = 15; + this.gvMx1latestDeliveryDate.VisibleIndex = 14; this.gvMx1latestDeliveryDate.Width = 92; // // gvMx1purchaseQty @@ -1289,7 +1281,7 @@ this.gvMx1purchaseQty.Name = "gvMx1purchaseQty"; this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY"; this.gvMx1purchaseQty.Visible = true; - this.gvMx1purchaseQty.VisibleIndex = 4; + this.gvMx1purchaseQty.VisibleIndex = 3; this.gvMx1purchaseQty.Width = 25; // // gvMx1purchaseUnit @@ -1301,7 +1293,7 @@ this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit"; this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gvMx1purchaseUnit.Visible = true; - this.gvMx1purchaseUnit.VisibleIndex = 7; + this.gvMx1purchaseUnit.VisibleIndex = 6; this.gvMx1purchaseUnit.Width = 25; // // gvMx1inventoryUnit @@ -1333,7 +1325,7 @@ this.gvMx1isGift.Name = "gvMx1isGift"; this.gvMx1isGift.Tag = "query_a.IS_GIFT"; this.gvMx1isGift.Visible = true; - this.gvMx1isGift.VisibleIndex = 8; + this.gvMx1isGift.VisibleIndex = 7; this.gvMx1isGift.Width = 25; // // gvMx1remarks @@ -1345,7 +1337,7 @@ this.gvMx1remarks.Name = "gvMx1remarks"; this.gvMx1remarks.Tag = "query_a.REMARKS"; this.gvMx1remarks.Visible = true; - this.gvMx1remarks.VisibleIndex = 9; + this.gvMx1remarks.VisibleIndex = 8; this.gvMx1remarks.Width = 46; // // gvMx1businessTerminate @@ -1357,7 +1349,7 @@ this.gvMx1businessTerminate.Name = "gvMx1businessTerminate"; this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE"; this.gvMx1businessTerminate.Visible = true; - this.gvMx1businessTerminate.VisibleIndex = 10; + this.gvMx1businessTerminate.VisibleIndex = 9; this.gvMx1businessTerminate.Width = 25; // // gvMx1businessClose @@ -1369,7 +1361,7 @@ this.gvMx1businessClose.Name = "gvMx1businessClose"; this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE"; this.gvMx1businessClose.Visible = true; - this.gvMx1businessClose.VisibleIndex = 11; + this.gvMx1businessClose.VisibleIndex = 10; this.gvMx1businessClose.Width = 25; // // gvMx1businessFreeze @@ -1381,7 +1373,7 @@ this.gvMx1businessFreeze.Name = "gvMx1businessFreeze"; this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE"; this.gvMx1businessFreeze.Visible = true; - this.gvMx1businessFreeze.VisibleIndex = 12; + this.gvMx1businessFreeze.VisibleIndex = 11; this.gvMx1businessFreeze.Width = 25; // // gvMx1freezer @@ -1491,7 +1483,7 @@ this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty"; this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY"; this.gvMx1remainingStoredQty.Visible = true; - this.gvMx1remainingStoredQty.VisibleIndex = 5; + this.gvMx1remainingStoredQty.VisibleIndex = 4; this.gvMx1remainingStoredQty.Width = 32; // // gvMx1returnableReceivedQty @@ -1526,12 +1518,12 @@ this.gridColumn20.AppearanceCell.Options.UseForeColor = true; this.gridColumn20.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridColumn20.AppearanceHeader.Options.UseForeColor = true; - this.gridColumn20.Caption = "绱瀹炴敹閲�"; + this.gridColumn20.Caption = "绱瀹炲叆搴�"; this.gridColumn20.FieldName = "qty9"; this.gridColumn20.MinWidth = 25; this.gridColumn20.Name = "gridColumn20"; this.gridColumn20.Visible = true; - this.gridColumn20.VisibleIndex = 6; + this.gridColumn20.VisibleIndex = 5; this.gridColumn20.Width = 94; // // gvMx1returnableStoredQty @@ -1603,7 +1595,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 16; + this.gridColumn8.VisibleIndex = 15; this.gridColumn8.Width = 43; // // gridColumn9 @@ -1613,7 +1605,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 17; + this.gridColumn9.VisibleIndex = 16; this.gridColumn9.Width = 94; // // gridColumn19 @@ -1623,7 +1615,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 18; + this.gridColumn19.VisibleIndex = 17; this.gridColumn19.Width = 94; // // rptHistory diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs index 3cf93b3..dcb8848 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs @@ -146,7 +146,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -160,7 +160,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -216,12 +216,12 @@ } else { - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs index dc569ff..6f81eea 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs @@ -67,7 +67,7 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); - this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup(); + this.txt_fHasLinkRad = new DevExpress.XtraEditors.RadioGroup(); this.txt_fCustId = new Gs.DevApp.UserControl.UcLookCustomer(); this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); this.lbGuid = new System.Windows.Forms.Label(); @@ -95,9 +95,9 @@ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); + this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -141,7 +141,7 @@ this.splitMx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit(); this.layoutMx1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); @@ -164,9 +164,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -303,7 +303,7 @@ // this.gv_returnType.AppearanceCell.Options.UseFont = true; this.gv_returnType.Caption = "鏈夋棤婧愬崟"; - this.gv_returnType.FieldName = "fIsLink"; + this.gv_returnType.FieldName = "fHasLinkTxt"; this.gv_returnType.Name = "gv_returnType"; this.gv_returnType.OptionsColumn.AllowEdit = false; this.gv_returnType.Tag = "query_a.RETURN_TYPE"; @@ -479,7 +479,7 @@ // // layoutMx1 // - this.layoutMx1.Controls.Add(this.txt_fIsLink); + this.layoutMx1.Controls.Add(this.txt_fHasLinkRad); this.layoutMx1.Controls.Add(this.txt_fCustId); this.layoutMx1.Controls.Add(this.btnSelect); this.layoutMx1.Controls.Add(this.lbGuid); @@ -505,26 +505,26 @@ this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // - // txt_fIsLink + // txt_fHasLinkRad // - this.txt_fIsLink.EditValue = "1"; - this.txt_fIsLink.Location = new System.Drawing.Point(385, 74); - this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0); - this.txt_fIsLink.Name = "txt_fIsLink"; - this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { + this.txt_fHasLinkRad.EditValue = "1"; + this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 43); + 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)}); - this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0); - this.txt_fIsLink.Size = new System.Drawing.Size(165, 27); - this.txt_fIsLink.StyleController = this.layoutMx1; - this.txt_fIsLink.TabIndex = 533; + this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0); + this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 27); + this.txt_fHasLinkRad.StyleController = this.layoutMx1; + this.txt_fHasLinkRad.TabIndex = 533; // // txt_fCustId // this.txt_fCustId.IsReadly = false; - this.txt_fCustId.Location = new System.Drawing.Point(385, 43); + this.txt_fCustId.Location = new System.Drawing.Point(355, 74); this.txt_fCustId.Name = "txt_fCustId"; - this.txt_fCustId.Size = new System.Drawing.Size(165, 24); + this.txt_fCustId.Size = new System.Drawing.Size(195, 24); this.txt_fCustId.TabIndex = 532; // // btnSelect @@ -549,17 +549,17 @@ // txt_fStockOrgId // this.txt_fStockOrgId.IsReadly = false; - this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 43); + this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 43); this.txt_fStockOrgId.Name = "txt_fStockOrgId"; - this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 24); + this.txt_fStockOrgId.Size = new System.Drawing.Size(195, 24); this.txt_fStockOrgId.TabIndex = 526; // // txt_billNo // - this.txt_billNo.Location = new System.Drawing.Point(114, 12); + 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(165, 24); + this.txt_billNo.Size = new System.Drawing.Size(195, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; this.txt_billNo.Tag = "readonly"; @@ -567,7 +567,7 @@ // txt_fReturnStyle // this.txt_fReturnStyle.EditValue = "-璇烽�夋嫨-"; - this.txt_fReturnStyle.Location = new System.Drawing.Point(385, 12); + this.txt_fReturnStyle.Location = new System.Drawing.Point(355, 12); this.txt_fReturnStyle.Name = "txt_fReturnStyle"; this.txt_fReturnStyle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -576,16 +576,16 @@ "閫�鏂欎笉琛ユ枡(ReturnNoFeed)", "閫�鏂欒ˉ鏂�(ReturnFeed)"}); this.txt_fReturnStyle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.txt_fReturnStyle.Size = new System.Drawing.Size(165, 24); + this.txt_fReturnStyle.Size = new System.Drawing.Size(195, 24); this.txt_fReturnStyle.StyleController = this.layoutMx1; this.txt_fReturnStyle.TabIndex = 520; // // txt_checkDate // - this.txt_checkDate.Location = new System.Drawing.Point(927, 43); + this.txt_checkDate.Location = new System.Drawing.Point(897, 43); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; - this.txt_checkDate.Size = new System.Drawing.Size(166, 24); + this.txt_checkDate.Size = new System.Drawing.Size(196, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 226; this.txt_checkDate.Tag = "readonly"; @@ -593,27 +593,27 @@ // txt_fStockId // this.txt_fStockId.IsReadly = false; - this.txt_fStockId.Location = new System.Drawing.Point(114, 74); + this.txt_fStockId.Location = new System.Drawing.Point(84, 74); this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0); this.txt_fStockId.Name = "txt_fStockId"; - this.txt_fStockId.Size = new System.Drawing.Size(165, 24); + this.txt_fStockId.Size = new System.Drawing.Size(195, 24); this.txt_fStockId.TabIndex = 260; // // txt_remark // - this.txt_remark.Location = new System.Drawing.Point(385, 105); + this.txt_remark.Location = new System.Drawing.Point(355, 105); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; - this.txt_remark.Size = new System.Drawing.Size(436, 24); + this.txt_remark.Size = new System.Drawing.Size(466, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 252; // // txt_checkUser // - this.txt_checkUser.Location = new System.Drawing.Point(927, 12); + this.txt_checkUser.Location = new System.Drawing.Point(897, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; - this.txt_checkUser.Size = new System.Drawing.Size(166, 24); + this.txt_checkUser.Size = new System.Drawing.Size(196, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 222; this.txt_checkUser.Tag = "readonly"; @@ -640,18 +640,18 @@ // // txt_lastUpdateUser // - this.txt_lastUpdateUser.Location = new System.Drawing.Point(656, 12); + this.txt_lastUpdateUser.Location = new System.Drawing.Point(626, 12); this.txt_lastUpdateUser.Name = "txt_lastUpdateUser"; - this.txt_lastUpdateUser.Size = new System.Drawing.Size(165, 24); + this.txt_lastUpdateUser.Size = new System.Drawing.Size(195, 24); this.txt_lastUpdateUser.StyleController = this.layoutMx1; this.txt_lastUpdateUser.TabIndex = 530; this.txt_lastUpdateUser.Tag = "readonly"; // // txt_lastUpdateTime // - this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43); + this.txt_lastUpdateTime.Location = new System.Drawing.Point(626, 43); this.txt_lastUpdateTime.Name = "txt_lastUpdateTime"; - this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24); + this.txt_lastUpdateTime.Size = new System.Drawing.Size(195, 24); this.txt_lastUpdateTime.StyleController = this.layoutMx1; this.txt_lastUpdateTime.TabIndex = 531; this.txt_lastUpdateTime.Tag = "readonly"; @@ -684,9 +684,9 @@ this.layoutControlItem12, this.layoutControlItem11, this.layoutControlItem5, - this.layoutControlItem4, + this.layoutControlItem7, this.layoutControlItem6, - this.layoutControlItem7}); + this.layoutControlItem4}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -725,7 +725,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(271, 31); this.layoutControlItem1.Text = "鐢宠鍗曞彿"; - this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // @@ -735,7 +735,7 @@ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(271, 31); this.layoutControlItem2.Text = "閫夋嫨缁勭粐"; - this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // @@ -744,8 +744,8 @@ this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem3.Text = "閫夋嫨浠撳簱"; - this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem3.Text = "浠g浠撳簱"; + this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // @@ -755,7 +755,7 @@ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem9.Size = new System.Drawing.Size(272, 31); this.layoutControlItem9.Text = "瀹℃牳浜�"; - this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // @@ -766,7 +766,7 @@ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem10.Size = new System.Drawing.Size(272, 31); this.layoutControlItem10.Text = "瀹℃牳鏃堕棿"; - this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // @@ -775,19 +775,20 @@ this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉"; - this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem14.Text = "鏇存柊浜哄憳"; + this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_lastUpdateTime; + this.layoutControlItem15.CustomizationFormText = "鏇存柊鏃堕棿"; this.layoutControlItem15.Location = new System.Drawing.Point(542, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem15.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�"; - this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem15.Text = "鏇存柊鏃堕棿"; + this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // @@ -835,31 +836,7 @@ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(271, 31); this.layoutControlItem5.Text = "閫�鏂欐柟寮�"; - this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem4 - // - this.layoutControlItem4.Control = this.txt_fCustId; - this.layoutControlItem4.Location = new System.Drawing.Point(271, 31); - this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛"; - this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); - // - // layoutControlItem6 - // - this.layoutControlItem6.Control = this.txt_fIsLink; - this.layoutControlItem6.Location = new System.Drawing.Point(271, 62); - this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30); - this.layoutControlItem6.Name = "layoutControlItem6"; - this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem6.Size = new System.Drawing.Size(271, 31); - this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem6.Text = "鏈夋棤婧愬崟"; - this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // @@ -871,7 +848,31 @@ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem7.Size = new System.Drawing.Size(542, 31); this.layoutControlItem7.Text = "鐢宠澶囨敞"; - this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); + this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem6 + // + this.layoutControlItem6.Control = this.txt_fHasLinkRad; + this.layoutControlItem6.Location = new System.Drawing.Point(271, 31); + this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30); + this.layoutControlItem6.Name = "layoutControlItem6"; + this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; + this.layoutControlItem6.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; + this.layoutControlItem6.Text = "鏈夋棤婧愬崟"; + this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); + // + // layoutControlItem4 + // + this.layoutControlItem4.Control = this.txt_fCustId; + this.layoutControlItem4.Location = new System.Drawing.Point(271, 62); + this.layoutControlItem4.Name = "layoutControlItem4"; + this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1; + this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem4.Size = new System.Drawing.Size(271, 31); + this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛"; + this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -978,8 +979,6 @@ this.gvMx1itemId.MinWidth = 50; this.gvMx1itemId.Name = "gvMx1itemId"; this.gvMx1itemId.Tag = "query_a.ITEM_ID"; - this.gvMx1itemId.Visible = true; - this.gvMx1itemId.VisibleIndex = 1; this.gvMx1itemId.Width = 94; // // gridColumn2 @@ -989,7 +988,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 2; + this.gridColumn2.VisibleIndex = 1; this.gridColumn2.Width = 94; // // gridColumn5 @@ -999,7 +998,7 @@ this.gridColumn5.MinWidth = 25; this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 3; + this.gridColumn5.VisibleIndex = 2; this.gridColumn5.Width = 94; // // gridColumn3 @@ -1009,7 +1008,7 @@ this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 4; + this.gridColumn3.VisibleIndex = 8; this.gridColumn3.Width = 94; // // gridColumn4 @@ -1019,7 +1018,7 @@ this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 5; + this.gridColumn4.VisibleIndex = 3; this.gridColumn4.Width = 94; // // gvMx1sqNum @@ -1035,7 +1034,7 @@ this.gvMx1sqNum.Name = "gvMx1sqNum"; this.gvMx1sqNum.Tag = "yz_quantity_0_edit"; this.gvMx1sqNum.Visible = true; - this.gvMx1sqNum.VisibleIndex = 6; + this.gvMx1sqNum.VisibleIndex = 4; this.gvMx1sqNum.Width = 94; // // gvMx1ysNum @@ -1047,7 +1046,7 @@ this.gvMx1ysNum.Name = "gvMx1ysNum"; this.gvMx1ysNum.Tag = "query_a.YS_NUM"; this.gvMx1ysNum.Visible = true; - this.gvMx1ysNum.VisibleIndex = 7; + this.gvMx1ysNum.VisibleIndex = 5; this.gvMx1ysNum.Width = 94; // // gvMx1remark @@ -1063,7 +1062,7 @@ this.gvMx1remark.Name = "gvMx1remark"; this.gvMx1remark.Tag = "edit"; this.gvMx1remark.Visible = true; - this.gvMx1remark.VisibleIndex = 8; + this.gvMx1remark.VisibleIndex = 6; this.gvMx1remark.Width = 94; // // gridColumn6 @@ -1079,7 +1078,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "edit"; this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 9; + this.gridColumn6.VisibleIndex = 7; this.gridColumn6.Width = 94; // // repositoryItemComboBox1 @@ -1110,7 +1109,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 10; + this.gridColumn8.VisibleIndex = 9; this.gridColumn8.Width = 94; // // gvMxDel @@ -1120,7 +1119,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 12; + this.gvMxDel.VisibleIndex = 11; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1141,7 +1140,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 11; + this.gridColumn9.VisibleIndex = 10; this.gridColumn9.Width = 94; // // picCheckBox @@ -1184,7 +1183,7 @@ this.splitMx1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit(); this.layoutMx1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); @@ -1207,9 +1206,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1291,15 +1290,15 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; - private DevExpress.XtraEditors.RadioGroup txt_fIsLink; + private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad; private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs index ae48c2b..1bc9673 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs @@ -52,7 +52,8 @@ if (string.IsNullOrEmpty(orgId)) return; txt_fCustId.getSuppler(orgId, _ucKh); - txt_fStockId.getSuppler(orgId, _ucCk); + //2025-08-11鍔犱笂鍙兘鏄唬绠′粨 + txt_fStockId.getSuppler(orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁Dgc]=1 )"); }; //閫夋嫨闇�瑕佺殑鏄庣粏 btnSelect.Click += (s, e) => @@ -75,7 +76,7 @@ this.txt_fStockId.Focus(); return; } - var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fIsLink.SelectedIndex.ToString()); + var frm = new SelectShuoTuiSq(this.txt_fCustId.GetId(), txt_fStockOrgId.GetId(), txt_fStockId.GetId(), txt_fHasLinkRad.SelectedIndex.ToString()); //璧嬪�肩粰鏄庣粏琛� frm.UpdateParent += (ss, ee) => { @@ -106,7 +107,7 @@ } catch (Exception ex) { - MessageBox.Show(ex.Message); + Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message); } }; frm.ShowDialog(); @@ -206,7 +207,7 @@ lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -224,20 +225,20 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } - } /// <summary> @@ -275,7 +276,7 @@ lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -289,6 +290,10 @@ gvList.Add(gvMx1); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } + //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼 + txt_fStockOrgId.IsReadly = true; + txt_fCustId.IsReadly = true; + txt_fHasLinkRad.ReadOnly = true; } /// <summary> /// 鏂板浜嬩欢 @@ -318,28 +323,27 @@ var _ckId = txt_fStockId.GetId(); var _khId = txt_fCustId.GetId(); string _orgId = txt_fStockOrgId.GetId(); - int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0; if (string.IsNullOrEmpty(_orgId)) { - MsgHelper.Warning("璇烽�夋嫨缁勭粐锛�"); + MsgHelper.ShowError("璇烽�夋嫨缁勭粐锛�"); txt_fStockOrgId.Focus(); return; } if (string.IsNullOrEmpty(_ckId)) { - MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�"); + MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�"); txt_fStockId.Focus(); return; } if (string.IsNullOrEmpty(_khId)) { - MsgHelper.Warning("璇烽�夋嫨瀹㈡埛锛�"); + MsgHelper.ShowError("璇烽�夋嫨瀹㈡埛锛�"); txt_fCustId.Focus(); return; } if (txt_fReturnStyle.SelectedIndex <= 0) { - MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒"); + MsgHelper.ShowError("璇烽�夋嫨閫�鏂欐柟寮忥紒"); txt_fReturnStyle.Focus(); return; } @@ -350,14 +354,13 @@ Remark = txt_remark.Text.Trim(), //澶囨敞 CusId = int.Parse(_khId), DepotId = int.Parse(_ckId), - FIsLink = _fIsLink,//鏈夋棤婧愬崟 + FIsLink = txt_fHasLinkRad.SelectedIndex,//鏈夋棤婧愬崟 FReturnStyle = txt_fReturnStyle.Text,//閫�鏂欐柟寮� list = new List<dynamic>(), - }; gvMx1.PostEditor(); + }; + gvMx1.PostEditor(); gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); - - if (gvMx1.DataRowCount <= 0) { MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�"); @@ -397,9 +400,9 @@ _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData.outGuid; txt_billNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; @@ -409,10 +412,12 @@ toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -465,7 +470,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -507,11 +512,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } /// <summary> @@ -535,7 +540,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -551,9 +556,10 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -562,10 +568,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) @@ -600,13 +608,15 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + getModel(lbGuid.Text); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs index 185d2ac..490e421 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs @@ -72,6 +72,7 @@ this.gv_qt010 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -348,7 +349,8 @@ this.gv_qt002, this.gv_qt010, this.gridColumn13, - this.gv18}); + this.gv18, + this.gridColumn23}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -359,7 +361,7 @@ // gv_qt015 // this.gv_qt015.AppearanceCell.Options.UseFont = true; - this.gv_qt015.Caption = "瀹℃牳鐘舵�� "; + this.gv_qt015.Caption = "鍒跺崟鐘舵�� "; this.gv_qt015.FieldName = "isCheck"; this.gv_qt015.MinWidth = 25; this.gv_qt015.Name = "gv_qt015"; @@ -387,7 +389,7 @@ this.gv_qtck.OptionsColumn.AllowEdit = false; this.gv_qtck.Tag = "query_a.qtck"; this.gv_qtck.Visible = true; - this.gv_qtck.VisibleIndex = 1; + this.gv_qtck.VisibleIndex = 2; this.gv_qtck.Width = 180; // // gridColumn14 @@ -405,7 +407,7 @@ this.gridColumn17.MinWidth = 25; this.gridColumn17.Name = "gridColumn17"; this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 2; + this.gridColumn17.VisibleIndex = 3; this.gridColumn17.Width = 94; // // gridColumn18 @@ -423,7 +425,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 3; + this.gridColumn19.VisibleIndex = 4; this.gridColumn19.Width = 94; // // gv_qt005 @@ -436,7 +438,7 @@ this.gv_qt005.OptionsColumn.AllowEdit = false; this.gv_qt005.Tag = "query_a.qt005"; this.gv_qt005.Visible = true; - this.gv_qt005.VisibleIndex = 4; + this.gv_qt005.VisibleIndex = 5; this.gv_qt005.Width = 94; // // gv_qt001 @@ -449,7 +451,7 @@ this.gv_qt001.OptionsColumn.AllowEdit = false; this.gv_qt001.Tag = "query_a.qt001"; this.gv_qt001.Visible = true; - this.gv_qt001.VisibleIndex = 5; + this.gv_qt001.VisibleIndex = 6; this.gv_qt001.Width = 200; // // gv_qt016 @@ -462,7 +464,7 @@ this.gv_qt016.OptionsColumn.AllowEdit = false; this.gv_qt016.Tag = "query_a.qt016"; this.gv_qt016.Visible = true; - this.gv_qt016.VisibleIndex = 6; + this.gv_qt016.VisibleIndex = 7; this.gv_qt016.Width = 94; // // gv_qt002 @@ -475,7 +477,7 @@ this.gv_qt002.OptionsColumn.AllowEdit = false; this.gv_qt002.Tag = "query_a.qt002"; this.gv_qt002.Visible = true; - this.gv_qt002.VisibleIndex = 7; + this.gv_qt002.VisibleIndex = 8; this.gv_qt002.Width = 180; // // gv_qt010 @@ -488,7 +490,7 @@ this.gv_qt010.OptionsColumn.AllowEdit = false; this.gv_qt010.Tag = "query_a.qt010"; this.gv_qt010.Visible = true; - this.gv_qt010.VisibleIndex = 8; + this.gv_qt010.VisibleIndex = 9; this.gv_qt010.Width = 94; // // gridColumn13 @@ -498,7 +500,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 9; + this.gridColumn13.VisibleIndex = 10; this.gridColumn13.Width = 94; // // gv18 @@ -508,6 +510,16 @@ this.gv18.MinWidth = 25; this.gv18.Name = "gv18"; this.gv18.Width = 94; + // + // gridColumn23 + // + this.gridColumn23.Caption = "閲囪喘瀹℃牳"; + this.gridColumn23.FieldName = "isCgChk"; + this.gridColumn23.MinWidth = 25; + this.gridColumn23.Name = "gridColumn23"; + this.gridColumn23.Visible = true; + this.gridColumn23.VisibleIndex = 1; + this.gridColumn23.Width = 94; // // pageBar1 // @@ -839,11 +851,12 @@ // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fStockId; + this.layoutControlItem8.CustomizationFormText = "浠g浠撳簱"; this.layoutControlItem8.Location = new System.Drawing.Point(286, 0); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(287, 28); - this.layoutControlItem8.Text = "鏀舵枡浠撳簱"; + this.layoutControlItem8.Text = "浠g浠撳簱"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 @@ -1955,5 +1968,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24; private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn23; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs index fc317c4..8ffc01c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs @@ -1,4 +1,5 @@ using DevExpress.XtraEditors; +using DevExpress.XtraRichEdit.Model; using Gs.DevApp.DevFrm.Rpt; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -32,6 +33,8 @@ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; + toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick; + toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2); @@ -55,7 +58,8 @@ if (string.IsNullOrEmpty(_orgId)) return; txt_fCustId.getSuppler(_orgId, _ucKh); - txt_fStockId.getSuppler(_orgId, _ucCk); + //2025-08-11鍔犱笂鍙兘鏄唬绠′粨 + txt_fStockId.getSuppler(_orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁Dgc]=1 )"); System.Text.StringBuilder sbWhere = new System.Text.StringBuilder(); sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'"); var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), ""); @@ -70,7 +74,7 @@ } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } }; gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged; @@ -115,34 +119,39 @@ this.ucBtnPrint1.rptParameter = "return false"; return; } - SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍙楁墭鍏ュ簱"); + SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.鍙楁墭鍏ュ簱.ToString()); string strCodeList = ""; + string strAction = ""; frm.UpdateParent += (ss, ee) => { strCodeList = ee.StringSingle; + strAction = ee.Data; }; frm.ShowDialog(); if (string.IsNullOrEmpty(strCodeList)) return; - try + if (strAction == "print") { - string rptParameter = "rpt_Strk{" - + "100" - + "," + "" - + "," + "" - + "," + "" - + "," + "" - + "," + strCodeList - + "}"; - using (Form rpt = new RptPreview(rowGuid, rptParameter)) + try { - rpt.ShowDialog(); + string rptParameter = "rpt_Strk{" + + "100" + + "," + "" + + "," + "" + + "," + "" + + "," + "" + + "," + strCodeList + + "}"; + using (Form rpt = new RptPreview(rowGuid, rptParameter)) + { + rpt.ShowDialog(); + } + frm.Close(); } - frm.Close(); - } - catch (Exception ex) - { - MsgHelper.ShowError(ex.Message); + catch (Exception ex) + { + MsgHelper.ShowError(ex.Message); + } } }; //鑷姩璁$畻鎵撳嵃閲� @@ -150,7 +159,6 @@ { Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1); }; - radOut.SelectedIndexChanged += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1); @@ -231,7 +239,7 @@ lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) @@ -249,17 +257,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -297,7 +307,7 @@ lbGuid, txt_billNo, gridView1); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3); @@ -312,6 +322,9 @@ gvList.Add(gvMx2); UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList); } + //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼 + txt_fStockOrgId.IsReadly = true; + txt_fCustId.IsReadly = true; } /// <summary> /// 鏂板浜嬩欢 @@ -345,19 +358,19 @@ string kh = txt_fCustId.GetId();//瀹㈡埛 if (string.IsNullOrEmpty(kcZz)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨搴撳瓨缁勭粐锛�"); txt_fStockOrgId.Focus(); return; } if (string.IsNullOrEmpty(kcCk)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鏀舵枡浠撳簱锛�"); txt_fStockId.Focus(); return; } if (string.IsNullOrEmpty(kh)) { - Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨瀹㈡埛锛�"); + Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀹㈡埛锛�"); txt_fCustId.Focus(); return; } @@ -403,9 +416,9 @@ { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { + ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData.outGuid; txt_billNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; @@ -416,10 +429,12 @@ toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } + else + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -430,7 +445,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "billNo", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -473,7 +488,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -534,11 +549,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -584,13 +599,15 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { - if (_rtn.rtnCode > 0) getModel(lbGuid.Text); + MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg); + getModel(lbGuid.Text); } - MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + else + MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } @@ -615,7 +632,25 @@ { _toolCk(0); } + /// <summary> + /// 閲囪喘瀹℃牳 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e) + { + _toolCk(40); + } + /// <summary> + /// 閲囪喘鍙嶅鏍� + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e) + { + _toolCk(41); + } /// <summary> /// 宸ュ叿鏉′簨浠� /// </summary> @@ -631,14 +666,21 @@ case 0: strMsg = "鍙嶅鏍�"; break; - }; + case 40: + strMsg = "閲囪喘瀹℃牳"; + break; + case 41: + strMsg = "閲囪喘鍙嶅鏍�"; + break; + } + ; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -654,9 +696,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -665,10 +707,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e) diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs index eb06806..6b1689f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs @@ -175,7 +175,7 @@ } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -186,7 +186,7 @@ if (toolBarMenu1.currentAction == "edit") isEdit = true; if (string.IsNullOrEmpty(strGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } var _obj = new @@ -242,11 +242,11 @@ } } else - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg); } catch (Exception ex) { - ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } @@ -272,7 +272,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { - MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); return; } if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵")) @@ -289,9 +289,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); - MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { + MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -300,10 +300,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString()); } + else + MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { - MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } } } diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 0b5697d..1054851 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -695,12 +695,6 @@ <Compile Include="DevFrm\RkQC\Frm_WwrkDetect01.Designer.cs"> <DependentUpon>Frm_WwrkDetect01.cs</DependentUpon> </Compile> - <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="DevFrm\RkQC\Frm_XsthDetect01.Designer.cs"> - <DependentUpon>Frm_XsthDetect01.cs</DependentUpon> - </Compile> <Compile Include="DevFrm\RkQC\RkDetect01.cs"> <SubType>UserControl</SubType> </Compile> diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index fbf24e5..c206f49 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -2487,6 +2487,7 @@ cqcjno,//閲嶆鏂规 浜х嚎绉伴噸, iqc绉伴噸, + 鍙楁墭鍏ュ簱 } diff --git a/DevApp/Gs.DevApp/UserControl/Toast.cs b/DevApp/Gs.DevApp/UserControl/Toast.cs index f33d494..b6e37b0 100644 --- a/DevApp/Gs.DevApp/UserControl/Toast.cs +++ b/DevApp/Gs.DevApp/UserControl/Toast.cs @@ -1,4 +1,5 @@ 锘縰sing System; +using System.Configuration; using System.Drawing; using System.Windows.Forms; @@ -9,15 +10,25 @@ private System.Windows.Forms.Timer tmr; private System.Windows.Forms.Timer tmr2; + /// <summary> /// /// </summary> /// <param name="it">1鎴愬姛锛�-1澶辫触</param> /// <param name="messageText"></param> - /// <param name="vanishingSeconds"></param> - public Toast(int it, string messageText, int vanishingSeconds = 2) + /// <param name="vanishingSeconds">鍔ㄧ敾寤堕暱鏃堕棿</param> + public Toast(int it, string messageText, int vanishingSeconds = 3) { InitializeComponent(); + try + { + string _vanishingSeconds = ConfigurationManager.AppSettings["ToastSeconds"]; + if (!string.IsNullOrEmpty(_vanishingSeconds)) + vanishingSeconds = int.Parse(_vanishingSeconds); + } + catch (Exception) + { + } System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Toast)); if (it > 0) this.panel1.BackgroundImage = global::Gs.DevApp.Properties.Resources.ok123; diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs index f410fb1..96bda08 100644 --- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs +++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs @@ -35,12 +35,14 @@ /// </summary> /// <param name="orgId"></param> /// <param name="_dftVale"></param> - public void getSuppler(string orgId, string _dftVale = "") + public void getSuppler(string orgId, string _dftVale = "", string strWhere = "") { lookSearchSupplier.EditValue = null; string _keyWhere = ""; if (!string.IsNullOrEmpty(orgId)) - _keyWhere = " and a.FSubsidiary ='" + orgId + "'"; + _keyWhere = (_keyWhere + " and a.FSubsidiary ='" + orgId + "'"); + if (!string.IsNullOrEmpty(strWhere)) + _keyWhere = (_keyWhere + strWhere); var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,a.depot_code", "asc", "", " and is_ng='A'" + _keyWhere); var json = JsonConvert.SerializeObject(pgq); diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 4488ac2..bd2410e 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -454,6 +454,7 @@ lst.Add(btnLianBan.Name); // lst.Add(btnEsc.Name); lst.Add(btnGx.Name); + lst.Add(btnWeight.Name); _enabledBtn(lst); this.currentAction = "esc"; if (btnEscClick != null) btnEscClick(this, e); -- Gitblit v1.9.3