From 34e30e2261a057fc9f46f67a3d216e3d9a9e67be Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 03 六月 2025 17:17:21 +0800 Subject: [PATCH] 上线梳理 --- DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10 DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.cs | 64 +++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 10 DevApp/Gs.DevApp/App.config | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 251 ++++++++---- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 59 ++ DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2 DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.resx | 120 ++++++ DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 17 DevApp/Gs.DevApp/Resources/historyitem_16x16.png | 0 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs | 228 ++++++++++++ DevApp/Gs.DevApp/Properties/Resources.resx | 353 +++++++++--------- DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.resx | 3 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 17 15 files changed, 865 insertions(+), 273 deletions(-) diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json index 40ab1a9..865806f 100644 --- a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json +++ b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_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\\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\\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\\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\\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\\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\\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\\Rpt\\CKTmkc.cs"},{"SourceFile":"DevFrm\\Rpt\\CKTmkc.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\\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\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.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\\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\\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":"Properties\\Resources.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.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":"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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.WinForms.129.0.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\NModbus.3.0.81\\lib\\net46\\NModbus.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshopLine.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSq.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_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\\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\\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\\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\\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\\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\\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\\CKTmkc.cs"},{"SourceFile":"DevFrm\\Rpt\\CKTmkc.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\\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\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.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\\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\\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":"Properties\\Resources.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.WinForms.129.0.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\NModbus.3.0.81\\lib\\net46\\NModbus.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Management.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"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:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config index 057f052..1a9adea 100644 --- a/DevApp/Gs.DevApp/App.config +++ b/DevApp/Gs.DevApp/App.config @@ -31,7 +31,7 @@ <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> - <add key="ProductName" value="G-MES V2.0" /> + <add key="ProductName" value="GS-MES V2.0" /> <add key="PageSize" value="50" /> <add key="Version" value="0.1" /> <add key="IsAutoUpdater" value="0" /> diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs index a7464e0..3444b7f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs @@ -49,6 +49,11 @@ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -146,6 +151,9 @@ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn18 = 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(); @@ -204,6 +212,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -985,7 +994,8 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1, - this.repositoryItemButtonEdit2}); + this.repositoryItemButtonEdit2, + this.rptHistory}); this.gcMx1.Size = new System.Drawing.Size(1229, 351); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1024,7 +1034,9 @@ this.gridColumn14, this.gridColumn15, this.gridColumn16, - this.gridColumn2}); + this.gridColumn2, + this.gridColumn17, + this.gridColumn18}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False; @@ -1055,8 +1067,8 @@ // gvMx1ebelnLine // this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true; - this.gvMx1ebelnLine.Caption = "ERP琛孖D"; - this.gvMx1ebelnLine.FieldName = "ebelnK3id"; + this.gvMx1ebelnLine.Caption = "Erp琛孖d"; + this.gvMx1ebelnLine.FieldName = "lineK3id"; this.gvMx1ebelnLine.MinWidth = 90; this.gvMx1ebelnLine.Name = "gvMx1ebelnLine"; this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true; @@ -1193,7 +1205,7 @@ // gvMx1subQty // this.gvMx1subQty.AppearanceCell.Options.UseFont = true; - this.gvMx1subQty.Caption = "鏈敹鏁伴噺"; + this.gvMx1subQty.Caption = "绱鏈敹閲�"; this.gvMx1subQty.FieldName = "wssl"; this.gvMx1subQty.MinWidth = 25; this.gvMx1subQty.Name = "gvMx1subQty"; @@ -1210,7 +1222,7 @@ this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true; this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺"; + this.gvMx1quantity.Caption = "鏈鏀堕噺"; this.gvMx1quantity.FieldName = "quantity"; this.gvMx1quantity.MinWidth = 25; this.gvMx1quantity.Name = "gvMx1quantity"; @@ -1239,7 +1251,7 @@ // gvMx1okRkqty // this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true; - this.gvMx1okRkqty.Caption = "宸叉敹鏁伴噺"; + this.gvMx1okRkqty.Caption = "绱瀹炴敹"; this.gvMx1okRkqty.FieldName = "yssl"; this.gvMx1okRkqty.MinWidth = 25; this.gvMx1okRkqty.Name = "gvMx1okRkqty"; @@ -1412,6 +1424,35 @@ this.gridColumn2.VisibleIndex = 17; this.gridColumn2.Width = 94; // + // gridColumn17 + // + this.gridColumn17.Caption = "鍒拌揣璁板綍"; + this.gridColumn17.ColumnEdit = this.rptHistory; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 23; + this.gridColumn17.Width = 94; + // + // rptHistory + // + this.rptHistory.AutoHeight = false; + editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16; + editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptHistory.Name = "rptHistory"; + this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick); + // + // gridColumn18 + // + this.gridColumn18.Caption = "ErpId"; + this.gridColumn18.FieldName = "ebelnK3id"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Width = 94; + // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; @@ -1489,6 +1530,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -1593,5 +1635,8 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs index d4ae8aa..ed2f9fd 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs @@ -1,6 +1,7 @@ using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid.Views.Grid; +using Gs.DevApp.DevFrm.Rk; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -640,5 +641,21 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + + /// <summary> + /// 鏌ョ湅鍒拌揣璁板綍锛屾牴鎹噰璐槑缁唃uid + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptHistory_ButtonClick(object sender, ButtonPressedEventArgs e) + { + var rowhandle = gvMx1.FocusedRowHandle; + if (rowhandle < 0) + return; + var dr = gvMx1.GetDataRow(rowhandle); + var mxGuid = dr["aboutGuid"].ToString(); + HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid); + frm.ShowDialog(); + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs new file mode 100644 index 0000000..5b50155 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.Designer.cs @@ -0,0 +1,228 @@ +锘縩amespace Gs.DevApp.DevFrm.Rk +{ + partial class HistoryDhmxcs + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + this.SuspendLayout(); + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(993, 620); + this.gcMain.TabIndex = 2; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; + this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; + this.gridView1.ColumnPanelRowHeight = 60; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn13, + this.gridColumn14, + this.gridColumn15, + this.gridColumn16, + this.gridColumn17, + this.gridColumn22, + this.gridColumn47, + this.gridColumn48, + this.gridColumn12, + this.gridColumn18, + this.gridColumn1}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + // + // gridColumn13 + // + this.gridColumn13.Caption = "ERP琛孖D"; + this.gridColumn13.FieldName = "ebelnK3id"; + this.gridColumn13.MinWidth = 25; + this.gridColumn13.Name = "gridColumn13"; + this.gridColumn13.Visible = true; + this.gridColumn13.VisibleIndex = 0; + this.gridColumn13.Width = 46; + // + // gridColumn14 + // + this.gridColumn14.AppearanceCell.Options.UseFont = true; + this.gridColumn14.Caption = "鐗╂枡ID"; + this.gridColumn14.FieldName = "itemId"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Tag = "query_a.ITEM_ID"; + this.gridColumn14.Width = 100; + // + // gridColumn15 + // + this.gridColumn15.Caption = "鐗╂枡缂栫爜"; + this.gridColumn15.FieldName = "itemNo"; + this.gridColumn15.MinWidth = 25; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 3; + this.gridColumn15.Width = 46; + // + // gridColumn16 + // + this.gridColumn16.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn16.FieldName = "itemName"; + this.gridColumn16.MinWidth = 25; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 4; + this.gridColumn16.Width = 55; + // + // gridColumn17 + // + this.gridColumn17.AppearanceCell.Options.UseFont = true; + this.gridColumn17.Caption = "鐗╂枡瑙勬牸"; + this.gridColumn17.FieldName = "itemModel"; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Tag = "query_a.PRICING_QTY"; + this.gridColumn17.Width = 25; + // + // gridColumn22 + // + this.gridColumn22.AppearanceCell.Options.UseFont = true; + this.gridColumn22.Caption = "鍒拌揣鏁伴噺"; + this.gridColumn22.FieldName = "quantity"; + this.gridColumn22.MinWidth = 25; + this.gridColumn22.Name = "gridColumn22"; + this.gridColumn22.Tag = "query_a.PURCHASE_QTY"; + this.gridColumn22.Width = 25; + // + // gridColumn47 + // + this.gridColumn47.Caption = "鏀舵枡浜�"; + this.gridColumn47.FieldName = "createBy"; + this.gridColumn47.MinWidth = 25; + this.gridColumn47.Name = "gridColumn47"; + this.gridColumn47.Visible = true; + this.gridColumn47.VisibleIndex = 7; + this.gridColumn47.Width = 43; + // + // gridColumn48 + // + this.gridColumn48.Caption = "鏀舵枡鏃堕棿"; + this.gridColumn48.FieldName = "createDate"; + this.gridColumn48.MinWidth = 25; + this.gridColumn48.Name = "gridColumn48"; + this.gridColumn48.Visible = true; + this.gridColumn48.VisibleIndex = 6; + this.gridColumn48.Width = 94; + // + // gridColumn12 + // + this.gridColumn12.Caption = "鍒拌揣鍗曞彿"; + this.gridColumn12.FieldName = "dhdh"; + this.gridColumn12.MinWidth = 25; + this.gridColumn12.Name = "gridColumn12"; + this.gridColumn12.Visible = true; + this.gridColumn12.VisibleIndex = 2; + this.gridColumn12.Width = 94; + // + // gridColumn18 + // + this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn18.AppearanceCell.Options.UseForeColor = true; + this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn18.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn18.Caption = "瀹炴敹鏁伴噺"; + this.gridColumn18.FieldName = "sjQuantity"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 5; + this.gridColumn18.Width = 94; + // + // gridColumn1 + // + this.gridColumn1.Caption = "閲囪喘鍗曞彿"; + this.gridColumn1.FieldName = "billNo"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 94; + // + // historyDhmxcs + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(993, 620); + this.Controls.Add(this.gcMain); + this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "historyDhmxcs"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "鏀舵枡鏄庣粏"; + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn13; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn22; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn47; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.cs b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.cs new file mode 100644 index 0000000..ce92dc4 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.cs @@ -0,0 +1,64 @@ +锘縰sing DevExpress.XtraEditors; +using Gs.DevApp.ToolBox; +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.Rk +{ + public partial class HistoryDhmxcs : DevExpress.XtraEditors.XtraForm + { + private readonly string _webServiceName = "MesInvItemInsManager/"; + string cgmxGuid = ""; + + /// <summary> + /// 閲囪喘鏄庣粏guid + /// </summary> + /// <param name="_cgmxGuid"></param> + public HistoryDhmxcs(string _cgmxGuid) + { + InitializeComponent(); + this.cgmxGuid = _cgmxGuid; + getPageList(1); + } + + + /// <summary> + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + var _obj = new + { + currentPage = curPage, + everyPageSize = 999999, + sortName = "", + keyWhere = cgmxGuid, + }; + var json = Newtonsoft.Json.JsonConvert.SerializeObject(_obj); + try + { + var strReturn = UtilityHelper.HttpPost("", + _webServiceName + "GetHistory", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + var dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + gridView1.BestFitColumns(); + Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.resx b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/Rk/HistoryDhmxcs.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs index ba22fb6..fc7e1ff 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs @@ -48,7 +48,7 @@ private void getPageList(int curPage) { gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); - var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString()); + var pgq = new PageQueryModel(curPage, 999999, "fNumber", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try { diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs index a3a55a6..6566a59 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs @@ -30,13 +30,18 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.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(); @@ -135,11 +140,13 @@ this.gvMx1terminator = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1terminateTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1totalReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1totalStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gvMx1remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1totalReturnedQty = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1sourceDocumentType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -148,6 +155,8 @@ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -160,8 +169,8 @@ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -214,6 +223,7 @@ this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit(); this.tabMxPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); @@ -336,7 +346,7 @@ // // gv_factory // - this.gv_factory.Caption = "ERPID鍙�"; + this.gv_factory.Caption = "ErpId"; this.gv_factory.FieldName = "ebelnK3id"; this.gv_factory.MinWidth = 25; this.gv_factory.Name = "gv_factory"; @@ -929,29 +939,29 @@ this.layoutControlItem14}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - 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(1342, 104); this.Root.TextVisible = false; // @@ -1105,6 +1115,8 @@ this.gcMx1.Location = new System.Drawing.Point(0, 0); this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; + this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { + this.rptHistory}); this.gcMx1.Size = new System.Drawing.Size(1361, 426); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { @@ -1140,11 +1152,13 @@ this.gvMx1terminator, this.gvMx1terminateTime, this.gvMx1totalReceivedQty, - this.gridColumn10, this.gvMx1totalStoredQty, - this.gvMx1remainingStoredQty, this.gvMx1totalReturnedQty, + this.gridColumn10, + this.gvMx1remainingStoredQty, this.gvMx1returnableReceivedQty, + this.gridColumn21, + this.gridColumn20, this.gvMx1returnableStoredQty, this.gvMx1sourceDocumentType, this.gvMx1planTrackingId, @@ -1152,7 +1166,8 @@ this.gvMx1demandDocumentLineId, this.gridColumn6, this.gridColumn8, - this.gridColumn9}); + this.gridColumn9, + this.gridColumn19}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1171,7 +1186,7 @@ // // gv_erpid // - this.gv_erpid.Caption = "ERP涓ID"; + this.gv_erpid.Caption = "Erp琛孖d"; this.gv_erpid.FieldName = "ebelnK3id"; this.gv_erpid.MinWidth = 25; this.gv_erpid.Name = "gv_erpid"; @@ -1238,7 +1253,7 @@ this.gvMx1deliveryDate.Name = "gvMx1deliveryDate"; this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE"; this.gvMx1deliveryDate.Visible = true; - this.gvMx1deliveryDate.VisibleIndex = 18; + this.gvMx1deliveryDate.VisibleIndex = 13; this.gvMx1deliveryDate.Width = 92; // // gvMx1earliestDeliveryDate @@ -1250,7 +1265,7 @@ this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate"; this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE"; this.gvMx1earliestDeliveryDate.Visible = true; - this.gvMx1earliestDeliveryDate.VisibleIndex = 19; + this.gvMx1earliestDeliveryDate.VisibleIndex = 14; this.gvMx1earliestDeliveryDate.Width = 92; // // gvMx1latestDeliveryDate @@ -1262,7 +1277,7 @@ this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate"; this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE"; this.gvMx1latestDeliveryDate.Visible = true; - this.gvMx1latestDeliveryDate.VisibleIndex = 20; + this.gvMx1latestDeliveryDate.VisibleIndex = 15; this.gvMx1latestDeliveryDate.Width = 92; // // gvMx1purchaseQty @@ -1286,7 +1301,7 @@ this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit"; this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gvMx1purchaseUnit.Visible = true; - this.gvMx1purchaseUnit.VisibleIndex = 12; + this.gvMx1purchaseUnit.VisibleIndex = 7; this.gvMx1purchaseUnit.Width = 25; // // gvMx1inventoryUnit @@ -1318,7 +1333,7 @@ this.gvMx1isGift.Name = "gvMx1isGift"; this.gvMx1isGift.Tag = "query_a.IS_GIFT"; this.gvMx1isGift.Visible = true; - this.gvMx1isGift.VisibleIndex = 13; + this.gvMx1isGift.VisibleIndex = 8; this.gvMx1isGift.Width = 25; // // gvMx1remarks @@ -1330,7 +1345,7 @@ this.gvMx1remarks.Name = "gvMx1remarks"; this.gvMx1remarks.Tag = "query_a.REMARKS"; this.gvMx1remarks.Visible = true; - this.gvMx1remarks.VisibleIndex = 14; + this.gvMx1remarks.VisibleIndex = 9; this.gvMx1remarks.Width = 46; // // gvMx1businessTerminate @@ -1342,7 +1357,7 @@ this.gvMx1businessTerminate.Name = "gvMx1businessTerminate"; this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE"; this.gvMx1businessTerminate.Visible = true; - this.gvMx1businessTerminate.VisibleIndex = 15; + this.gvMx1businessTerminate.VisibleIndex = 10; this.gvMx1businessTerminate.Width = 25; // // gvMx1businessClose @@ -1354,7 +1369,7 @@ this.gvMx1businessClose.Name = "gvMx1businessClose"; this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE"; this.gvMx1businessClose.Visible = true; - this.gvMx1businessClose.VisibleIndex = 16; + this.gvMx1businessClose.VisibleIndex = 11; this.gvMx1businessClose.Width = 25; // // gvMx1businessFreeze @@ -1366,7 +1381,7 @@ this.gvMx1businessFreeze.Name = "gvMx1businessFreeze"; this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE"; this.gvMx1businessFreeze.Visible = true; - this.gvMx1businessFreeze.VisibleIndex = 17; + this.gvMx1businessFreeze.VisibleIndex = 12; this.gvMx1businessFreeze.Width = 25; // // gvMx1freezer @@ -1411,15 +1426,45 @@ // // gvMx1totalReceivedQty // + this.gvMx1totalReceivedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gvMx1totalReceivedQty.AppearanceCell.Options.UseFont = true; - this.gvMx1totalReceivedQty.Caption = "绱鏀舵枡鏁伴噺"; + this.gvMx1totalReceivedQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1totalReceivedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalReceivedQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1totalReceivedQty.Caption = "绱鏀堕噺"; this.gvMx1totalReceivedQty.FieldName = "qty1"; this.gvMx1totalReceivedQty.MinWidth = 25; this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty"; this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY"; - this.gvMx1totalReceivedQty.Visible = true; - this.gvMx1totalReceivedQty.VisibleIndex = 5; this.gvMx1totalReceivedQty.Width = 32; + // + // gvMx1totalStoredQty + // + this.gvMx1totalStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true; + this.gvMx1totalStoredQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1totalStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalStoredQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1totalStoredQty.Caption = "绱鍏ュ簱閲�"; + this.gvMx1totalStoredQty.FieldName = "qty2"; + this.gvMx1totalStoredQty.MinWidth = 25; + this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty"; + this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY"; + this.gvMx1totalStoredQty.Width = 28; + // + // gvMx1totalReturnedQty + // + this.gvMx1totalReturnedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true; + this.gvMx1totalReturnedQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1totalReturnedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1totalReturnedQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1totalReturnedQty.Caption = "绱閫�閲�"; + this.gvMx1totalReturnedQty.FieldName = "qty3"; + this.gvMx1totalReturnedQty.MinWidth = 25; + this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty"; + this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY"; + this.gvMx1totalReturnedQty.Width = 32; // // gridColumn10 // @@ -1427,25 +1472,11 @@ this.gridColumn10.AppearanceCell.Options.UseForeColor = true; this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridColumn10.AppearanceHeader.Options.UseForeColor = true; - this.gridColumn10.Caption = "鍓╀綑鏀舵枡鏁伴噺"; - this.gridColumn10.FieldName = "qty2"; + this.gridColumn10.Caption = "绱楠岄��"; + this.gridColumn10.FieldName = "qty4"; this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 6; this.gridColumn10.Width = 37; - // - // gvMx1totalStoredQty - // - this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true; - this.gvMx1totalStoredQty.Caption = "绱鍏ュ簱鏁伴噺"; - this.gvMx1totalStoredQty.FieldName = "qty3"; - this.gvMx1totalStoredQty.MinWidth = 25; - this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty"; - this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY"; - this.gvMx1totalStoredQty.Visible = true; - this.gvMx1totalStoredQty.VisibleIndex = 7; - this.gvMx1totalStoredQty.Width = 28; // // gvMx1remainingStoredQty // @@ -1454,49 +1485,67 @@ this.gvMx1remainingStoredQty.AppearanceCell.Options.UseForeColor = true; this.gvMx1remainingStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gvMx1remainingStoredQty.AppearanceHeader.Options.UseForeColor = true; - this.gvMx1remainingStoredQty.Caption = "鍓╀綑鍏ュ簱鏁伴噺"; - this.gvMx1remainingStoredQty.FieldName = "qty4"; + this.gvMx1remainingStoredQty.Caption = "鍓╀綑鏀舵枡"; + this.gvMx1remainingStoredQty.FieldName = "qty5"; this.gvMx1remainingStoredQty.MinWidth = 25; this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty"; this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY"; this.gvMx1remainingStoredQty.Visible = true; - this.gvMx1remainingStoredQty.VisibleIndex = 8; + this.gvMx1remainingStoredQty.VisibleIndex = 5; this.gvMx1remainingStoredQty.Width = 32; - // - // gvMx1totalReturnedQty - // - this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true; - this.gvMx1totalReturnedQty.Caption = "绱閫�鏂欐暟閲�"; - this.gvMx1totalReturnedQty.FieldName = "qty5"; - this.gvMx1totalReturnedQty.MinWidth = 25; - this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty"; - this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY"; - this.gvMx1totalReturnedQty.Visible = true; - this.gvMx1totalReturnedQty.VisibleIndex = 9; - this.gvMx1totalReturnedQty.Width = 32; // // gvMx1returnableReceivedQty // + this.gvMx1returnableReceivedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseFont = true; - this.gvMx1returnableReceivedQty.Caption = "鏀舵枡鍙��鏁伴噺"; + this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1returnableReceivedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1returnableReceivedQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1returnableReceivedQty.Caption = "鍓╀綑鍏ュ簱閲�"; this.gvMx1returnableReceivedQty.FieldName = "qty6"; this.gvMx1returnableReceivedQty.MinWidth = 25; this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty"; this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY"; - this.gvMx1returnableReceivedQty.Visible = true; - this.gvMx1returnableReceivedQty.VisibleIndex = 10; this.gvMx1returnableReceivedQty.Width = 32; + // + // gridColumn21 + // + this.gridColumn21.AppearanceCell.ForeColor = System.Drawing.Color.Red; + this.gridColumn21.AppearanceCell.Options.UseForeColor = true; + this.gridColumn21.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gridColumn21.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn21.Caption = "搴撳瓨鍙��閲�"; + this.gridColumn21.FieldName = "qty8"; + this.gridColumn21.MinWidth = 25; + this.gridColumn21.Name = "gridColumn21"; + this.gridColumn21.Width = 94; + // + // gridColumn20 + // + this.gridColumn20.AppearanceCell.ForeColor = System.Drawing.Color.Red; + 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.FieldName = "qty9"; + this.gridColumn20.MinWidth = 25; + this.gridColumn20.Name = "gridColumn20"; + this.gridColumn20.Visible = true; + this.gridColumn20.VisibleIndex = 6; + this.gridColumn20.Width = 94; // // gvMx1returnableStoredQty // + this.gvMx1returnableStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gvMx1returnableStoredQty.AppearanceCell.Options.UseFont = true; - this.gvMx1returnableStoredQty.Caption = "搴撳瓨鍙��鏁伴噺"; + this.gvMx1returnableStoredQty.AppearanceCell.Options.UseForeColor = true; + this.gvMx1returnableStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red; + this.gvMx1returnableStoredQty.AppearanceHeader.Options.UseForeColor = true; + this.gvMx1returnableStoredQty.Caption = "鏀舵枡鍙��閲�"; this.gvMx1returnableStoredQty.FieldName = "qty7"; this.gvMx1returnableStoredQty.MinWidth = 25; this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty"; this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY"; - this.gvMx1returnableStoredQty.Visible = true; - this.gvMx1returnableStoredQty.VisibleIndex = 11; this.gvMx1returnableStoredQty.Width = 32; // // gvMx1sourceDocumentType @@ -1541,7 +1590,7 @@ // // gridColumn6 // - this.gridColumn6.Caption = "涓婚敭Guid"; + this.gridColumn6.Caption = "鏄庣粏琛ㄤ富閿瓽uid"; this.gridColumn6.FieldName = "guid"; this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; @@ -1554,7 +1603,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 21; + this.gridColumn8.VisibleIndex = 16; this.gridColumn8.Width = 43; // // gridColumn9 @@ -1564,8 +1613,29 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 22; + this.gridColumn9.VisibleIndex = 17; this.gridColumn9.Width = 94; + // + // gridColumn19 + // + this.gridColumn19.Caption = "鍒拌揣璁板綍"; + this.gridColumn19.ColumnEdit = this.rptHistory; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 18; + this.gridColumn19.Width = 94; + // + // rptHistory + // + this.rptHistory.AutoHeight = false; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + this.rptHistory.Name = "rptHistory"; + this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; + this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick); // // tabMxPage2 // @@ -1776,6 +1846,7 @@ this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit(); this.tabMxPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); @@ -1908,5 +1979,9 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; + private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn21; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn20; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs index 81841d5..3cf93b3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs @@ -1,5 +1,6 @@ using DevExpress.XtraEditors; using DevExpress.XtraGrid.Views.Grid; +using Gs.DevApp.DevFrm.Rk; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -223,5 +224,21 @@ MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } } + + /// <summary> + /// 鏌ョ湅鍒拌揣璁板綍锛屾牴鎹噰璐槑缁唃uid + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void rptHistory_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e) + { + var rowhandle = gvMx1.FocusedRowHandle; + if (rowhandle < 0) + return; + var dr = gvMx1.GetDataRow(rowhandle); + var mxGuid = dr["guid"].ToString(); + HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid); + frm.ShowDialog(); + } } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.resx index a4826a3..25d6b3c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.resx +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.resx @@ -120,4 +120,7 @@ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> + <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>25</value> + </metadata> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 65db5bb..497ee52 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -554,6 +554,12 @@ <Compile Include="DevFrm\Rk\Frm_MesItemQtrkDj.Designer.cs"> <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\Rk\HistoryDhmxcs.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\Rk\HistoryDhmxcs.Designer.cs"> + <DependentUpon>HistoryDhmxcs.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\Rpt\CKTmkc.cs"> <SubType>Form</SubType> </Compile> @@ -1417,6 +1423,9 @@ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrkDj.resx"> <DependentUpon>Frm_MesItemQtrkDj.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="DevFrm\Rk\HistoryDhmxcs.resx"> + <DependentUpon>HistoryDhmxcs.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="DevFrm\Rpt\CKTmkc.resx"> <DependentUpon>CKTmkc.cs</DependentUpon> </EmbeddedResource> @@ -2021,6 +2030,7 @@ <None Include="Resources\chartselectdata_16x16.png" /> <None Include="Resources\copy_16x16.png" /> <None Include="Resources\exporttoxls_16x16.png" /> + <None Include="Resources\historyitem_16x16.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs index b55efee..7d3b684 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs @@ -1473,6 +1473,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap historyitem_16x16 { + get { + object obj = ResourceManager.GetObject("historyitem_16x16", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap ico_check { get { object obj = ResourceManager.GetObject("ico_check", resourceCulture); diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index 6cdae09..ff41707 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -121,21 +121,16 @@ <data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, + <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> - </data> - <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="zoom100_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\zoom100_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -151,8 +146,10 @@ <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -160,14 +157,25 @@ <data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="meeting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\meeting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="exporttoxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\exporttoxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap, @@ -225,6 +233,14 @@ <data name="error123" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\error123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -242,14 +258,19 @@ <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> + <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bouser_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bouser_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -263,8 +284,13 @@ <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap, + <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -279,8 +305,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="csharp_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\csharp_16x16.png;System.Drawing.Bitmap, @@ -295,30 +321,26 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, + <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -335,11 +357,6 @@ <data name="editname_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\editname_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="logo_png" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -347,25 +364,24 @@ <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap, @@ -390,17 +406,16 @@ <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> + <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="redtoblack" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\redtoblack.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> @@ -473,13 +488,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap, @@ -532,6 +542,11 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="user_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, @@ -556,11 +571,16 @@ <data name="boperson_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boperson_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -573,8 +593,8 @@ <data name="user_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -586,9 +606,6 @@ <value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap, @@ -611,9 +628,6 @@ </data> <data name="user_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\user_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="trackingchanges_previous_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_previous_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -643,6 +657,9 @@ <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="fontsizeincrease_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fontsizeincrease_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -663,8 +680,13 @@ <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="boreport2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boreport2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="subreport_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\subreport_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -674,9 +696,6 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -685,11 +704,10 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\last_16x16.png;System.Drawing.Bitmap, @@ -723,6 +741,9 @@ <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> + <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -740,22 +761,19 @@ <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\task_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -770,10 +788,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="alignhorizontalcenter" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignhorizontalcenter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="first_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\first_16x16.png;System.Drawing.Bitmap, @@ -809,8 +825,10 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="employee_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\employee_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="fontsizeincrease_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\fontsizeincrease_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -831,6 +849,9 @@ <data name="snapmodifytablecellstyle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\snapmodifytablecellstyle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -838,9 +859,6 @@ <value>..\Resources\bouser_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -877,19 +895,16 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -903,25 +918,27 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap, @@ -931,16 +948,11 @@ <data name="boreport2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boreport2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> - </data> <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap, @@ -955,37 +967,25 @@ <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="copy_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\copy_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap, + <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1012,10 +1012,8 @@ <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="checkbuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbuttons_16x16.png;System.Drawing.Bitmap, @@ -1025,33 +1023,33 @@ <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="lookup&reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bodetails_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="trackingchanges_accept_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_accept_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap, + <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1061,18 +1059,24 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap, + <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="lookup&reference_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1082,11 +1086,6 @@ </data> <data name="trackingchanges_previous_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\trackingchanges_previous_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -1100,26 +1099,30 @@ <data name="chartselectdata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\chartselectdata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap, + <data name="find_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\find_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap, + <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="exporttoxls_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\exporttoxls_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="historyitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\historyitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Resources/historyitem_16x16.png b/DevApp/Gs.DevApp/Resources/historyitem_16x16.png new file mode 100644 index 0000000..c98c769 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/historyitem_16x16.png Binary files differ -- Gitblit v1.9.3