From 27c04c726187ca50c6c693c4aec92a1c43ef115b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 19 四月 2025 08:12:17 +0800
Subject: [PATCH] 修改登录页
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 1
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 45 +
DevApp/Gs.DevApp/Resources/login_bg.jpg | 0
DevApp/Gs.DevApp/Resources/login_bg1.jpg | 0
DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs | 87 ++-
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 3
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs | 9
DevApp/Gs.DevApp/Gs.DevApp.csproj | 3
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs | 2
DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 114 ++--
DevApp/Gs.DevApp/Resources/login_bgOk.jpg | 0
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 265 ++++++-------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs | 236 ++++++-----
/dev/null | 0
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 18
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 23
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs | 83 ++--
DevApp/Gs.DevApp/Properties/Resources.resx | 231 +++++-----
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 22
22 files changed, 602 insertions(+), 550 deletions(-)
diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
index e58d822..fdf8c86 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_MesCgthSqDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesCgthSqDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesInvItemOut_SCLL.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesInvItemOut_SCLL.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBl.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBlDJ.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemBlDJ.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemCl.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemCl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemClDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemClDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQtDj.cs"},{"SourceFile":"DevFrm\\Ck\\Frm_MesItemQtDj.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlcl.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlcl.Designer.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclDj.cs"},{"SourceFile":"DevFrm\\Ck\\UcBlclDj.Designer.cs"},{"SourceFile":"DevFrm\\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\\Frm_FqcDetect01Check.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_FqcDetect01Check.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\\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\\SelectPage.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPage.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_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\\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\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemInCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem3.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.Designer.cs"},{"SourceFile":"DevFrm\\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_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":"Properties\\Resources.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":"DevFrm\\QC\\SelectCheckDt.cs"},{"SourceFile":"DevFrm\\QC\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.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":"UserControl\\showZhongTai.cs"},{"SourceFile":"UserControl\\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\\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\\Frm_FqcDetect01Check.cs"},{"SourceFile":"DevFrm\\FQC\\Frm_FqcDetect01Check.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\\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\\SelectPage.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPage.Designer.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.cs"},{"SourceFile":"DevFrm\\PDA\\SelectPrint.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesDefectCode.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_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\\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\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemInCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem3.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesScrkDj.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWorkProd.Designer.cs"},{"SourceFile":"DevFrm\\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_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":"Properties\\Resources.Designer.cs"},{"SourceFile":"UserControl\\SelectCk.cs"},{"SourceFile":"UserControl\\SelectCk.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":"DevFrm\\QC\\SelectCheckDt.cs"},{"SourceFile":"DevFrm\\QC\\SelectCheckDt.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":"UserControl\\showZhongTai.cs"},{"SourceFile":"UserControl\\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\\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 2ad734f..5bad92a 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <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="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
index 2c3e649..c514f3d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -1,3 +1,4 @@
+using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -41,7 +42,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
-
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
index 0327b94..de4bfa4 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.Designer.cs
@@ -30,13 +30,13 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmLogin));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.lbVersion = new System.Windows.Forms.Label();
this.table1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
@@ -52,6 +52,7 @@
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.panelLog = new System.Windows.Forms.Panel();
this.table1.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.lay1)).BeginInit();
@@ -71,7 +72,7 @@
//
this.lbVersion.AutoSize = true;
this.lbVersion.BackColor = System.Drawing.Color.Transparent;
- this.lbVersion.Location = new System.Drawing.Point(3, 763);
+ this.lbVersion.Location = new System.Drawing.Point(3, 767);
this.lbVersion.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.lbVersion.Name = "lbVersion";
this.lbVersion.Size = new System.Drawing.Size(143, 18);
@@ -83,15 +84,16 @@
this.table1.BackColor = System.Drawing.Color.Transparent;
this.table1.ColumnCount = 1;
this.table1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.table1.Controls.Add(this.lbVersion, 0, 1);
- this.table1.Controls.Add(this.panel1, 0, 0);
+ this.table1.Controls.Add(this.lbVersion, 0, 2);
+ this.table1.Controls.Add(this.panel1, 0, 1);
+ this.table1.Controls.Add(this.panelLog, 0, 0);
this.table1.Dock = System.Windows.Forms.DockStyle.Fill;
this.table1.Location = new System.Drawing.Point(0, 0);
this.table1.Name = "table1";
- this.table1.RowCount = 2;
- this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
- this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ this.table1.RowCount = 3;
+ this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 49.02216F));
+ this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.97784F));
+ this.table1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 25F));
this.table1.Size = new System.Drawing.Size(734, 793);
this.table1.TabIndex = 247;
//
@@ -100,7 +102,7 @@
this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
this.panel1.BackColor = System.Drawing.Color.Transparent;
this.panel1.Controls.Add(this.lay1);
- this.panel1.Location = new System.Drawing.Point(179, 501);
+ this.panel1.Location = new System.Drawing.Point(179, 505);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(375, 258);
@@ -201,29 +203,29 @@
this.layoutControlItem5});
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;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 50D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition1,
+ columnDefinition2});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 50D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.AutoSize;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(375, 258);
this.Root.TextVisible = false;
//
@@ -291,6 +293,16 @@
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
//
+ // panelLog
+ //
+ this.panelLog.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+ this.panelLog.BackgroundImage = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.panelLog.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+ this.panelLog.Location = new System.Drawing.Point(312, 263);
+ this.panelLog.Name = "panelLog";
+ this.panelLog.Size = new System.Drawing.Size(110, 110);
+ this.panelLog.TabIndex = 246;
+ //
// FrmLogin
//
this.Appearance.BackColor = System.Drawing.Color.Black;
@@ -298,7 +310,7 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Stretch;
- this.BackgroundImageStore = global::Gs.DevApp.Properties.Resources.login_bg6;
+ this.BackgroundImageStore = global::Gs.DevApp.Properties.Resources.login_bgOk;
this.ClientSize = new System.Drawing.Size(734, 793);
this.Controls.Add(this.table1);
this.DoubleBuffered = true;
@@ -342,5 +354,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private System.Windows.Forms.Panel panelLog;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 8736984..78e48dc 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -302,7 +302,7 @@
/// <param name="tabText">褰撳墠閫夐」鍗￠〉Text鏍囬</param>
/// <param name="newFormName">褰撳墠閫夐」鍗′腑鐨勬柊绐椾綋璺緞锛岀被鍚�</param>
public void AddTabpage(XtraTabControl tabControl, string tabPageName,
- string tabText, string newFormName, Image imgIcon)
+ string tabText, string newFormName, Image imgIcon,string InitializeVal="")
{
if (IsTabpageExsit(tabControl, tabPageName)) return;
var newPage = new XtraTabPage();
@@ -311,7 +311,7 @@
newPage.Tooltip = newPage.Name;
newPage.Appearance.Header.Font = tab.Appearance.Font;
newPage.ImageOptions.Image = imgIcon;
- var fm = AddNewForm(newFormName);
+ var fm = AddNewForm(newFormName, InitializeVal);
if (fm != null)
{
newPage.Controls.Add(fm);
@@ -367,7 +367,7 @@
/// 鍦ㄩ�夐」鍗′腑鐢熸垚绐椾綋
/// </summary>
/// <param name="form">绐椾綋鍚嶇О</param>
- private Form AddNewForm(string formName)
+ private Form AddNewForm(string formName,string InitializeVal)
{
try
{
@@ -390,6 +390,13 @@
);
if (evt != null)
evt.AddEventHandler(newForm, new EventHandler<UpdateParentEventArgs>(UpdateParent_OnChange));
+ if (!string.IsNullOrEmpty(InitializeVal)) {
+ Assembly assembly = Assembly.GetExecutingAssembly();
+ Type type = assembly.GetType(formName);
+ MethodInfo method = type.GetMethod("Initialize"); // 鑾峰彇Initialize鏂规硶鐨勪俊鎭�
+ if (method != null)
+ method.Invoke(newForm, new object[] { InitializeVal }); // 璋冪敤Initialize鏂规硶骞朵紶閫掑弬鏁�
+ }
//瀹炵幇瀛愮獥浣撶殑濮旀墭end
return newForm;
}
@@ -404,13 +411,31 @@
private void UpdateParent_OnChange(object sender, UpdateParentEventArgs e)
{
List<string> _val = e.StringList;
- MsgHelper.ShowError(_val[0]);
- var tabPageName = _val + "_page";
- var tabText = ""; //褰撳墠閫夐」鍗￠〉Text鏍囬
- var newFormName = "Gs.DevApp.DevFrm.Frm_MesInvItemOut_SCLL"; //瀛樿矾寰勶紝绫诲悕
- Image imgIcon = null;
- AddTabpage(tab, tabPageName, tabText,
- newFormName, imgIcon);
+ string _formName = _val[0];//绫诲悕
+ string _parm1= _val[1];
+ var _obj = new
+ {
+ guid = _formName //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MenuAction/GetModelByNameSpace",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ string tabPageName = dy.guid.ToString() + "_page";
+ string tabText = dy.name.ToString(); //褰撳墠閫夐」鍗￠〉Text鏍囬
+ string newFormName = dy.formPath.ToString(); //瀛樿矾寰勶紝绫诲悕
+ Image imgIcon = UtilityHelper.GetImgFromResource(dy.icon.ToString(), 2);
+ AddTabpage(tab, tabPageName, tabText,newFormName, imgIcon, _parm1);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
}
//瀹炵幇瀛愮獥浣撶殑濮旀墭end
private int _userOut()
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 045d8cc..14dcf72 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -790,7 +790,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1342, 688);
- this.splitMx1.SplitterPosition = 185;
+ this.splitMx1.SplitterPosition = 186;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -827,7 +827,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1094, 495, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
+ this.layoutMx1.Size = new System.Drawing.Size(1342, 186);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -1209,7 +1209,7 @@
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
- this.layoutControlItem16.Text = "瀹℃牳浜�";
+ this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
@@ -1370,7 +1370,7 @@
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 491);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 490);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1381,7 +1381,7 @@
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 459);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 458);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1400,7 +1400,7 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 412);
+ this.splitMx2.Size = new System.Drawing.Size(1340, 411);
this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
@@ -1665,7 +1665,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 113);
+ this.splitYangLi.Size = new System.Drawing.Size(1340, 112);
this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
@@ -1675,7 +1675,7 @@
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(676, 113);
+ this.groupControl1.Size = new System.Drawing.Size(676, 112);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
@@ -1685,7 +1685,7 @@
this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(672, 83);
+ this.gcMx2.Size = new System.Drawing.Size(672, 82);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1773,7 +1773,7 @@
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(652, 113);
+ this.groupControl2.Size = new System.Drawing.Size(652, 112);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -1783,7 +1783,7 @@
this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(648, 83);
+ this.gcMx3.Size = new System.Drawing.Size(648, 82);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index fd90553..3cd5733 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -554,10 +554,26 @@
private void setEable(bool bl)
{
-
txtJianYan.ReadOnly = !bl;
btnLoad.Enabled = bl;
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
+
+ #region 鎵撳紑鐖朵翰绐楀彛濮旀墭
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+ private void simpleButton1_Click(object sender, EventArgs e)
+ {
+ if (UpdateParent != null)
+ {
+ List<string> lst = new List<string>();
+ lst.Add("Gs.DevApp.DevFrm.QC.MesQcExceptional");//绫诲悕
+ lst.Add("22222222");//寮傚父鎶ュ憡涓婚敭
+ lst.Add("3");//鍏跺畠
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { StringList = lst });
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index c3205b8..2a8c044 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -70,6 +70,7 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -87,7 +88,7 @@
this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.txt_chooseQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_chooseType = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_chooseGoodQty = new DevExpress.XtraEditors.TextEdit();
@@ -141,8 +142,6 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -174,7 +173,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).BeginInit();
@@ -222,7 +221,6 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -319,7 +317,8 @@
this.gridColumn11,
this.gridColumn12,
this.gridColumn13,
- this.gridColumn14});
+ this.gridColumn14,
+ this.gridColumn15});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -408,13 +407,13 @@
// gv_pba006
//
this.gv_pba006.AppearanceCell.Options.UseFont = true;
- this.gv_pba006.Caption = "澶勭疆鎰忚";
+ this.gv_pba006.Caption = "澶勭悊缁撴灉";
this.gv_pba006.FieldName = "handSuggestion";
this.gv_pba006.Name = "gv_pba006";
this.gv_pba006.OptionsColumn.AllowEdit = false;
this.gv_pba006.Tag = "query_a.pba006";
this.gv_pba006.Visible = true;
- this.gv_pba006.VisibleIndex = 6;
+ this.gv_pba006.VisibleIndex = 7;
this.gv_pba006.Width = 180;
//
// gv_pba009
@@ -426,7 +425,7 @@
this.gv_pba009.OptionsColumn.AllowEdit = false;
this.gv_pba009.Tag = "query_a.pba009";
this.gv_pba009.Visible = true;
- this.gv_pba009.VisibleIndex = 7;
+ this.gv_pba009.VisibleIndex = 9;
this.gv_pba009.Width = 100;
//
// gridColumn5
@@ -444,7 +443,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 8;
+ this.gridColumn3.VisibleIndex = 10;
this.gridColumn3.Width = 94;
//
// gridColumn6
@@ -454,7 +453,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 11;
this.gridColumn6.Width = 94;
//
// gridColumn7
@@ -464,7 +463,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.VisibleIndex = 6;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -474,7 +473,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 11;
+ this.gridColumn8.VisibleIndex = 12;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -484,7 +483,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
+ this.gridColumn9.VisibleIndex = 13;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -494,7 +493,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 13;
+ this.gridColumn10.VisibleIndex = 14;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -504,7 +503,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 14;
+ this.gridColumn11.VisibleIndex = 15;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -514,7 +513,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 15;
+ this.gridColumn12.VisibleIndex = 16;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -524,7 +523,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 16;
+ this.gridColumn13.VisibleIndex = 17;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -534,8 +533,18 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 17;
+ this.gridColumn14.VisibleIndex = 18;
this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "澶勭悊鏂瑰紡";
+ this.gridColumn15.FieldName = "fmrmode";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 8;
+ this.gridColumn15.Width = 94;
//
// pageBar1
//
@@ -574,12 +583,11 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 185;
+ this.splitMx1.SplitterPosition = 202;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.simpleButton1);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_createBy);
@@ -593,7 +601,7 @@
this.layoutMx1.Controls.Add(this.txt_gysName);
this.layoutMx1.Controls.Add(this.txt_fbatchQty);
this.layoutMx1.Controls.Add(this.txt_chooseQty);
- this.layoutMx1.Controls.Add(this.txt_chooseType);
+ this.layoutMx1.Controls.Add(this.txt_fmrmode);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_fBillNo);
this.layoutMx1.Controls.Add(this.txt_chooseGoodQty);
@@ -610,7 +618,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(706, 510, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 185);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 202);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -625,114 +633,114 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(386, 167);
+ this.txt_remark.Location = new System.Drawing.Point(391, 162);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(435, 24);
+ this.txt_remark.Size = new System.Drawing.Size(445, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(657, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(667, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(164, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(169, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 273;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(657, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(667, 42);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(164, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(169, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 267;
this.txt_createDate.Tag = "readonly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(928, 105);
+ this.txt_fType.Location = new System.Drawing.Point(943, 102);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(165, 24);
+ this.txt_fType.Size = new System.Drawing.Size(171, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(386, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(391, 72);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(169, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(657, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(667, 72);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(164, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(169, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(386, 105);
+ this.txt_itemModel.Location = new System.Drawing.Point(391, 102);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(435, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(445, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(386, 12);
+ this.txt_dhdNo.Location = new System.Drawing.Point(391, 12);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_dhdNo.Size = new System.Drawing.Size(169, 24);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(386, 136);
+ this.txt_gysNo.Location = new System.Drawing.Point(391, 132);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(169, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(657, 136);
+ this.txt_gysName.Location = new System.Drawing.Point(667, 132);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(164, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(169, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(115, 74);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(115, 72);
this.txt_fbatchQty.Name = "txt_fbatchQty";
- this.txt_fbatchQty.Size = new System.Drawing.Size(164, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(169, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 470;
//
// txt_chooseQty
//
- this.txt_chooseQty.Location = new System.Drawing.Point(115, 105);
+ this.txt_chooseQty.Location = new System.Drawing.Point(115, 102);
this.txt_chooseQty.Name = "txt_chooseQty";
- this.txt_chooseQty.Size = new System.Drawing.Size(164, 24);
+ this.txt_chooseQty.Size = new System.Drawing.Size(169, 24);
this.txt_chooseQty.StyleController = this.layoutMx1;
this.txt_chooseQty.TabIndex = 471;
//
- // txt_chooseType
+ // txt_fmrmode
//
- this.txt_chooseType.Location = new System.Drawing.Point(928, 74);
- this.txt_chooseType.Name = "txt_chooseType";
- this.txt_chooseType.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
- this.txt_chooseType.Properties.Appearance.Options.UseForeColor = true;
- this.txt_chooseType.Size = new System.Drawing.Size(165, 24);
- this.txt_chooseType.StyleController = this.layoutMx1;
- this.txt_chooseType.TabIndex = 473;
+ this.txt_fmrmode.Location = new System.Drawing.Point(943, 72);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_fmrmode.Size = new System.Drawing.Size(171, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 473;
//
// txt_guid
//
@@ -746,60 +754,60 @@
//
this.txt_fBillNo.Location = new System.Drawing.Point(115, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(169, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
// txt_chooseGoodQty
//
- this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 136);
+ this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 132);
this.txt_chooseGoodQty.Name = "txt_chooseGoodQty";
- this.txt_chooseGoodQty.Size = new System.Drawing.Size(164, 24);
+ this.txt_chooseGoodQty.Size = new System.Drawing.Size(169, 24);
this.txt_chooseGoodQty.StyleController = this.layoutMx1;
this.txt_chooseGoodQty.TabIndex = 479;
//
// txt_chooseBadQty
//
- this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 167);
+ this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 162);
this.txt_chooseBadQty.Name = "txt_chooseBadQty";
- this.txt_chooseBadQty.Size = new System.Drawing.Size(164, 24);
+ this.txt_chooseBadQty.Size = new System.Drawing.Size(169, 24);
this.txt_chooseBadQty.StyleController = this.layoutMx1;
this.txt_chooseBadQty.TabIndex = 480;
//
// txt_workLine
//
- this.txt_workLine.Location = new System.Drawing.Point(386, 43);
+ this.txt_workLine.Location = new System.Drawing.Point(391, 42);
this.txt_workLine.Name = "txt_workLine";
- this.txt_workLine.Size = new System.Drawing.Size(164, 24);
+ this.txt_workLine.Size = new System.Drawing.Size(169, 24);
this.txt_workLine.StyleController = this.layoutMx1;
this.txt_workLine.TabIndex = 481;
//
// txt_jydNo
//
- this.txt_jydNo.Location = new System.Drawing.Point(115, 43);
+ this.txt_jydNo.Location = new System.Drawing.Point(115, 42);
this.txt_jydNo.Name = "txt_jydNo";
- this.txt_jydNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_jydNo.Size = new System.Drawing.Size(169, 24);
this.txt_jydNo.StyleController = this.layoutMx1;
this.txt_jydNo.TabIndex = 482;
//
// txt_handResult
//
- this.txt_handResult.Location = new System.Drawing.Point(928, 12);
+ this.txt_handResult.Location = new System.Drawing.Point(943, 12);
this.txt_handResult.Name = "txt_handResult";
this.txt_handResult.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_handResult.Properties.Appearance.Options.UseForeColor = true;
- this.txt_handResult.Size = new System.Drawing.Size(165, 24);
+ this.txt_handResult.Size = new System.Drawing.Size(171, 24);
this.txt_handResult.StyleController = this.layoutMx1;
this.txt_handResult.TabIndex = 483;
this.txt_handResult.Tag = "readonly";
//
// txt_handSuggestion
//
- this.txt_handSuggestion.Location = new System.Drawing.Point(928, 43);
+ this.txt_handSuggestion.Location = new System.Drawing.Point(943, 42);
this.txt_handSuggestion.Name = "txt_handSuggestion";
this.txt_handSuggestion.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_handSuggestion.Properties.Appearance.Options.UseForeColor = true;
- this.txt_handSuggestion.Size = new System.Drawing.Size(165, 24);
+ this.txt_handSuggestion.Size = new System.Drawing.Size(171, 24);
this.txt_handSuggestion.StyleController = this.layoutMx1;
this.txt_handSuggestion.TabIndex = 484;
this.txt_handSuggestion.Tag = "readonly";
@@ -851,8 +859,7 @@
this.layoutControlItem20,
this.layoutControlItem1,
this.layoutControlItem21,
- this.layoutControlItem19,
- this.layoutControlItem22});
+ this.layoutControlItem19});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -887,26 +894,26 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 206);
+ this.Root.Size = new System.Drawing.Size(1126, 202);
this.Root.TextVisible = false;
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_fbatchQty;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 60);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺";
this.layoutControlItem17.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_chooseQty;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem18.Text = "閫夊埆鏁伴噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(91, 18);
//
@@ -915,27 +922,27 @@
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem2.Text = "寮傚父缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_chooseGoodQty;
- this.layoutControlItem25.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem25.Location = new System.Drawing.Point(0, 120);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_chooseBadQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 150);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem26.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem26.Size = new System.Drawing.Size(276, 32);
this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟";
this.layoutControlItem26.TextSize = new System.Drawing.Size(91, 18);
//
@@ -943,163 +950,164 @@
//
this.layoutControlItem7.Control = this.txt_remark;
this.layoutControlItem7.CustomizationFormText = "IQC澶囨敞";
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 155);
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 150);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(552, 32);
this.layoutControlItem7.Text = "IQC澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(271, 124);
+ this.layoutControlItem15.Location = new System.Drawing.Point(276, 120);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(542, 124);
+ this.layoutControlItem16.Location = new System.Drawing.Point(552, 120);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(271, 93);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 90);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(542, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(552, 30);
this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem13.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem12.Location = new System.Drawing.Point(552, 60);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem12.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem11.Location = new System.Drawing.Point(276, 60);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
this.layoutControlItem11.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_jydNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem6.Text = "妫�楠屽崟鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_workLine;
- this.layoutControlItem4.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(276, 30);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem4.Text = "鍒拌揣鍗曞簭鍙�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createBy;
- this.layoutControlItem5.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem5.Text = "IQC鎻愪氦浜哄憳";
this.layoutControlItem5.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 30);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem3.Text = "IQC鎻愪氦鏃ユ湡 ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem20
//
- this.layoutControlItem20.Control = this.txt_chooseType;
- this.layoutControlItem20.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem20.Control = this.txt_fmrmode;
+ this.layoutControlItem20.CustomizationFormText = "澶勭悊鏂瑰紡";
+ this.layoutControlItem20.Location = new System.Drawing.Point(828, 60);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem20.Text = "閫�鏂欐柟寮�";
this.layoutControlItem20.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(813, 93);
+ this.layoutControlItem1.Location = new System.Drawing.Point(828, 90);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem1.Text = "寮傚父绫诲瀷";
this.layoutControlItem1.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_handResult;
- this.layoutControlItem21.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem21.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem21.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
this.layoutControlItem21.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_handSuggestion;
- this.layoutControlItem19.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem19.Location = new System.Drawing.Point(828, 30);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(278, 30);
this.layoutControlItem19.Text = "澶勭悊缁撴灉";
this.layoutControlItem19.TextSize = new System.Drawing.Size(91, 18);
//
@@ -1109,7 +1117,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 373);
+ this.tabMx.Size = new System.Drawing.Size(1126, 356);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1118,7 +1126,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 341);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 324);
this.tabMxPage1.Text = "閫夊埆鏄庣粏";
//
// gcMx1
@@ -1133,7 +1141,7 @@
this.repositoryItemButtonEdit1,
this.rptJYBZ,
this.repositoryItemDateEdit3});
- this.gcMx1.Size = new System.Drawing.Size(1124, 341);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 324);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1340,27 +1348,6 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
- // simpleButton1
- //
- this.simpleButton1.Location = new System.Drawing.Point(825, 136);
- this.simpleButton1.Name = "simpleButton1";
- this.simpleButton1.Size = new System.Drawing.Size(268, 27);
- this.simpleButton1.StyleController = this.layoutMx1;
- this.simpleButton1.TabIndex = 485;
- this.simpleButton1.Text = "simpleButton1";
- this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.simpleButton1;
- this.layoutControlItem22.Location = new System.Drawing.Point(813, 124);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem22.Size = new System.Drawing.Size(272, 31);
- this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem22.TextVisible = false;
- //
// MesQcExceptional
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1402,7 +1389,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).EndInit();
@@ -1450,7 +1437,6 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
this.ResumeLayout(false);
}
@@ -1511,7 +1497,7 @@
private DevExpress.XtraEditors.TextEdit txt_gysName;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
private DevExpress.XtraEditors.TextEdit txt_chooseQty;
- private DevExpress.XtraEditors.TextEdit txt_chooseType;
+ private DevExpress.XtraEditors.TextEdit txt_fmrmode;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraEditors.TextEdit txt_guid;
@@ -1552,7 +1538,6 @@
private DevExpress.XtraEditors.TextEdit txt_handSuggestion;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index 5ac946a..a9c690c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -15,6 +15,13 @@
{
string _webServiceName = "MesQcExceptionalManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+
+ public void Initialize(string param)
+ {
+ // 浣跨敤param杩涜鍒濆鍖栧伐浣�
+ MessageBox.Show(param);
+ }
+
public MesQcExceptional()
{
InitializeComponent();
@@ -252,20 +259,6 @@
};
frm.ShowDialog();
}
-
- public event EventHandler<UpdateParentEventArgs> UpdateParent;
- private void simpleButton1_Click(object sender, EventArgs e)
- {
- if (UpdateParent != null)
- {
- List<string> lst = new List<string>();
- lst.Add("1");
- lst.Add("2");
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = lst });
- }
-
-
- }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index 7d2df63..f34a688 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -171,7 +171,6 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
-
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
if (string.IsNullOrEmpty(rowGuid))
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 253ba12..cfafaf5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -345,8 +345,6 @@
this.gv_tbl020.Name = "gv_tbl020";
this.gv_tbl020.OptionsColumn.AllowEdit = false;
this.gv_tbl020.Tag = "query_a.tbl020";
- this.gv_tbl020.Visible = true;
- this.gv_tbl020.VisibleIndex = 1;
this.gv_tbl020.Width = 50;
//
// gv_billNo
@@ -359,7 +357,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 2;
+ this.gv_billNo.VisibleIndex = 1;
this.gv_billNo.Width = 94;
//
// gv_tbl003
@@ -372,7 +370,7 @@
this.gv_tbl003.OptionsColumn.AllowEdit = false;
this.gv_tbl003.Tag = "query_a.tbl003";
this.gv_tbl003.Visible = true;
- this.gv_tbl003.VisibleIndex = 3;
+ this.gv_tbl003.VisibleIndex = 2;
this.gv_tbl003.Width = 94;
//
// gv_tbl002
@@ -385,7 +383,7 @@
this.gv_tbl002.OptionsColumn.AllowEdit = false;
this.gv_tbl002.Tag = "query_a.tbl002";
this.gv_tbl002.Visible = true;
- this.gv_tbl002.VisibleIndex = 4;
+ this.gv_tbl002.VisibleIndex = 3;
this.gv_tbl002.Width = 94;
//
// gridColumn6
@@ -395,7 +393,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.VisibleIndex = 4;
this.gridColumn6.Width = 94;
//
// gridColumn10
@@ -405,7 +403,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 6;
+ this.gridColumn10.VisibleIndex = 5;
this.gridColumn10.Width = 94;
//
// gv_tbl004
@@ -418,7 +416,7 @@
this.gv_tbl004.OptionsColumn.AllowEdit = false;
this.gv_tbl004.Tag = "query_a.tbl004";
this.gv_tbl004.Visible = true;
- this.gv_tbl004.VisibleIndex = 7;
+ this.gv_tbl004.VisibleIndex = 6;
this.gv_tbl004.Width = 94;
//
// gv_tbl005
@@ -431,7 +429,7 @@
this.gv_tbl005.OptionsColumn.AllowEdit = false;
this.gv_tbl005.Tag = "query_a.tbl005";
this.gv_tbl005.Visible = true;
- this.gv_tbl005.VisibleIndex = 8;
+ this.gv_tbl005.VisibleIndex = 7;
this.gv_tbl005.Width = 94;
//
// gv_tbl009
@@ -444,7 +442,7 @@
this.gv_tbl009.OptionsColumn.AllowEdit = false;
this.gv_tbl009.Tag = "query_a.tbl009";
this.gv_tbl009.Visible = true;
- this.gv_tbl009.VisibleIndex = 9;
+ this.gv_tbl009.VisibleIndex = 8;
this.gv_tbl009.Width = 94;
//
// gv_tbl010
@@ -457,7 +455,7 @@
this.gv_tbl010.OptionsColumn.AllowEdit = false;
this.gv_tbl010.Tag = "query_a.tbl010";
this.gv_tbl010.Visible = true;
- this.gv_tbl010.VisibleIndex = 10;
+ this.gv_tbl010.VisibleIndex = 9;
this.gv_tbl010.Width = 94;
//
// gv_tbl011
@@ -470,7 +468,7 @@
this.gv_tbl011.OptionsColumn.AllowEdit = false;
this.gv_tbl011.Tag = "query_a.tbl011";
this.gv_tbl011.Visible = true;
- this.gv_tbl011.VisibleIndex = 11;
+ this.gv_tbl011.VisibleIndex = 10;
this.gv_tbl011.Width = 94;
//
// gv_tbl012
@@ -483,7 +481,7 @@
this.gv_tbl012.OptionsColumn.AllowEdit = false;
this.gv_tbl012.Tag = "query_a.tbl012";
this.gv_tbl012.Visible = true;
- this.gv_tbl012.VisibleIndex = 12;
+ this.gv_tbl012.VisibleIndex = 11;
this.gv_tbl012.Width = 94;
//
// gridColumn11
@@ -493,7 +491,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 13;
+ this.gridColumn11.VisibleIndex = 12;
this.gridColumn11.Width = 94;
//
// pageBar1
@@ -584,10 +582,10 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(626, 43);
+ this.txt_itemName.Location = new System.Drawing.Point(636, 43);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(200, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 464;
this.txt_itemName.Tag = "readonly";
@@ -605,7 +603,7 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(195, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(200, 24);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
@@ -614,7 +612,7 @@
this.txt_tbl002.IsReadly = false;
this.txt_tbl002.Location = new System.Drawing.Point(84, 43);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(200, 24);
this.txt_tbl002.TabIndex = 462;
//
// txt_billNo
@@ -622,85 +620,85 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(200, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
+ this.txt_tbl012.Location = new System.Drawing.Point(912, 43);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(202, 24);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(355, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(360, 12);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(195, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(200, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 217;
this.txt_daa014.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(626, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(636, 12);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 298;
this.txt_itemNo.Tag = "readonly";
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
+ this.txt_tbl011.Location = new System.Drawing.Point(912, 12);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
+ this.txt_tbl011.Size = new System.Drawing.Size(202, 24);
this.txt_tbl011.StyleController = this.layoutMx1;
this.txt_tbl011.TabIndex = 243;
this.txt_tbl011.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(626, 74);
+ this.txt_itemModel.Location = new System.Drawing.Point(636, 74);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(200, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "readonly";
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(355, 74);
+ this.txt_tbl006.Location = new System.Drawing.Point(360, 74);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(195, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(200, 24);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
+ this.txt_tbl013.Location = new System.Drawing.Point(840, 74);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(274, 24);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 465;
this.txt_tbl013.Tag = "readonly";
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 43);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(360, 43);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(200, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 467;
this.txt_erpProductionOrderNo.Tag = "readonly";
@@ -763,7 +761,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1105, 144);
+ this.Root.Size = new System.Drawing.Size(1126, 144);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -771,27 +769,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem2.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_itemNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem3.Text = "浜у搧缂栫爜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -801,29 +799,29 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem4.Text = "濮斿宸ュ崟";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemName;
- this.layoutControlItem5.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(552, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem5.Text = "浜у搧鍚嶇О";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(552, 62);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem6.Text = "浜у搧鍨嬪彿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
@@ -833,39 +831,39 @@
this.layoutControlItem7.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem7.Text = "閫�鏂欑被鍨�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem9.Text = "瀹℃牳浜�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -873,22 +871,22 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(276, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem15.Text = "浠诲姟鍗曞彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_tbl006;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(276, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem8.Text = "澶囨敞";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
@@ -900,7 +898,7 @@
this.layoutControlItem13.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "閫夋嫨鎸夐挳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
index 32e7cf9..7224644 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
@@ -30,15 +30,15 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -73,7 +73,7 @@
this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
this.txt_inType = new DevExpress.XtraEditors.TextEdit();
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
@@ -130,6 +130,7 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -152,7 +153,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_inType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
@@ -232,6 +233,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -244,7 +246,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -450,8 +453,8 @@
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞 ";
- this.gv_remark.FieldName = "remark";
+ this.gv_remark.Caption = "鐢宠澶囨敞 ";
+ this.gv_remark.FieldName = "sqRemark";
this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -556,7 +559,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -567,6 +570,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 133;
this.splitMx1.TabIndex = 0;
@@ -577,7 +581,7 @@
this.layoutMx1.Controls.Add(this.txt_depotName);
this.layoutMx1.Controls.Add(this.txt_inType);
this.layoutMx1.Controls.Add(this.txt_workNo);
- this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_sqRemark);
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_taskNo);
this.layoutMx1.Controls.Add(this.txt_createBy);
@@ -615,104 +619,104 @@
this.txt_depotName.Location = new System.Drawing.Point(114, 40);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(170, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(165, 24);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 573;
//
// txt_inType
//
- this.txt_inType.Location = new System.Drawing.Point(666, 12);
+ this.txt_inType.Location = new System.Drawing.Point(656, 12);
this.txt_inType.Name = "txt_inType";
this.txt_inType.Properties.Appearance.Options.UseFont = true;
- this.txt_inType.Size = new System.Drawing.Size(170, 24);
+ this.txt_inType.Size = new System.Drawing.Size(165, 24);
this.txt_inType.StyleController = this.layoutMx1;
this.txt_inType.TabIndex = 574;
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(390, 68);
+ this.txt_workNo.Location = new System.Drawing.Point(385, 68);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_workNo.Size = new System.Drawing.Size(165, 24);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 387;
//
- // txt_remark
+ // txt_sqRemark
//
- this.txt_remark.Location = new System.Drawing.Point(114, 96);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(446, 24);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 243;
+ this.txt_sqRemark.Location = new System.Drawing.Point(114, 96);
+ this.txt_sqRemark.Name = "txt_sqRemark";
+ this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_sqRemark.Size = new System.Drawing.Size(436, 24);
+ this.txt_sqRemark.StyleController = this.layoutMx1;
+ this.txt_sqRemark.TabIndex = 243;
//
// txt_billNo
//
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(165, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(390, 12);
+ this.txt_taskNo.Location = new System.Drawing.Point(385, 12);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
- this.txt_taskNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_taskNo.Size = new System.Drawing.Size(165, 24);
this.txt_taskNo.StyleController = this.layoutMx1;
this.txt_taskNo.TabIndex = 216;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(942, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(927, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(172, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(166, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 222;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(942, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(927, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(172, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(166, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(942, 68);
+ this.txt_checkUser.Location = new System.Drawing.Point(927, 68);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 258;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(942, 96);
+ this.txt_checkDate.Location = new System.Drawing.Point(927, 96);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_reason
//
- this.txt_reason.Location = new System.Drawing.Point(390, 40);
+ this.txt_reason.Location = new System.Drawing.Point(385, 40);
this.txt_reason.Name = "txt_reason";
- this.txt_reason.Size = new System.Drawing.Size(170, 24);
+ this.txt_reason.Size = new System.Drawing.Size(165, 24);
this.txt_reason.StyleController = this.layoutMx1;
this.txt_reason.TabIndex = 575;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(666, 40);
+ this.txt_daa014.Location = new System.Drawing.Point(656, 40);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(170, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(165, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 576;
//
@@ -720,32 +724,32 @@
//
this.txt_cbillNo.Location = new System.Drawing.Point(114, 68);
this.txt_cbillNo.Name = "txt_cbillNo";
- this.txt_cbillNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_cbillNo.Size = new System.Drawing.Size(165, 24);
this.txt_cbillNo.StyleController = this.layoutMx1;
this.txt_cbillNo.TabIndex = 577;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(840, 124);
+ this.txt_status.Location = new System.Drawing.Point(825, 124);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(274, 24);
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 578;
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(666, 68);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(656, 68);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Size = new System.Drawing.Size(170, 24);
+ this.txt_lastupdateBy.Size = new System.Drawing.Size(165, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
this.txt_lastupdateBy.TabIndex = 579;
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(666, 96);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(656, 96);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
- this.txt_lastupdateDate.Size = new System.Drawing.Size(170, 24);
+ this.txt_lastupdateDate.Size = new System.Drawing.Size(165, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 580;
//
@@ -784,36 +788,36 @@
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1126, 160);
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.Root.Size = new System.Drawing.Size(1105, 160);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -821,70 +825,70 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem1.Text = "閫�鏂欏崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_inType;
- this.layoutControlItem2.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_taskNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem3.Text = "鐢宠鍗曞彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_createBy;
- this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem4.Text = "鍒涘缓浜�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createDate;
- this.layoutControlItem5.Location = new System.Drawing.Point(828, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(813, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem5.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_checkUser;
- this.layoutControlItem6.Location = new System.Drawing.Point(828, 56);
+ this.layoutControlItem6.Location = new System.Drawing.Point(813, 56);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem6.Text = "瀹℃牳浜�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_checkDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(828, 84);
+ this.layoutControlItem7.Location = new System.Drawing.Point(813, 84);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem7.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -894,63 +898,63 @@
this.layoutControlItem8.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem8.Text = "鍏ュ簱浠撳簱";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_reason;
- this.layoutControlItem9.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem9.Location = new System.Drawing.Point(271, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem9.Text = "閫�鏂欑被鍨�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa014;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem12.Location = new System.Drawing.Point(542, 28);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem12.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_status;
- this.layoutControlItem14.Location = new System.Drawing.Point(828, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(813, 112);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
//
// layoutControlItem10
//
- this.layoutControlItem10.Control = this.txt_remark;
+ this.layoutControlItem10.Control = this.txt_sqRemark;
this.layoutControlItem10.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(552, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(542, 28);
this.layoutControlItem10.Text = "澶囨敞淇℃伅";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_workNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem11.Text = "浠诲姟鍗曞彿";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
@@ -960,29 +964,29 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem13.Text = "濮斿宸ュ崟鍙�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_lastupdateBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 56);
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 56);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem15.Text = "鏈�鍚庢洿鏂颁汉";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_lastupdateDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(552, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(542, 84);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem16.Text = "鏈�鍚庢洿鏂版椂闂�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1025,7 +1029,8 @@
this.gvMx2quantity,
this.gvMx2unit,
this.gridColumn5,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn8});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1272,6 +1277,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐢宠澶囨敞";
+ this.gridColumn8.FieldName = "sqRemark";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 94;
+ //
// Frm_WwTblDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1304,7 +1319,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_inType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
@@ -1386,7 +1401,7 @@
private DevExpress.XtraEditors.TextEdit txt_workNo;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.TextEdit txt_checkUser;
- private DevExpress.XtraEditors.TextEdit txt_remark;
+ private DevExpress.XtraEditors.TextEdit txt_sqRemark;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_taskNo;
@@ -1439,5 +1454,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
index 50a6efc..6bfa4a6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs
@@ -16,7 +16,6 @@
public SelectWwTbl(string _daaGuid)
{
InitializeComponent();
-
this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
@@ -78,7 +77,6 @@
gcMain.DataSource = dt;
gcMain.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
index b2ae271..d8b30c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -237,6 +237,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -249,7 +250,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -601,7 +603,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -612,6 +614,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 141;
this.splitMx1.TabIndex = 0;
@@ -887,7 +890,7 @@
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem4.Text = "瀹℃牳浜�";
+ this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
index 547291a..928e7bc 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
@@ -28,15 +28,15 @@
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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -245,6 +245,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -257,7 +258,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -584,7 +586,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -595,6 +597,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 168;
this.splitMx1.TabIndex = 0;
@@ -843,35 +846,35 @@
this.lb_rwd});
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});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9,
- rowDefinition10});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1126, 168);
this.Root.TextVisible = false;
//
@@ -911,7 +914,7 @@
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(278, 29);
- this.layoutControlItem4.Text = "鍒涘缓浜�";
+ this.layoutControlItem4.Text = "鍒涘缓浜哄憳";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
@@ -997,7 +1000,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem12.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem12.Text = "瀹℃牳浜�";
+ this.layoutControlItem12.Text = "瀹℃牳浜哄憳";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 6c8a0c2..6e3a223 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1892,6 +1892,9 @@
<None Include="Resources\ok123.jpg" />
<None Include="Resources\pencolor_32x32.png" />
<None Include="Resources\calculatenow_32x32.png" />
+ <None Include="Resources\login_bg.jpg" />
+ <None Include="Resources\login_bg1.jpg" />
+ <None Include="Resources\login_bgOk.jpg" />
<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 6bf1bfe..7c6ab52 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1403,9 +1403,9 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
- internal static System.Drawing.Bitmap login_bg6 {
+ internal static System.Drawing.Bitmap login_bgOk {
get {
- object obj = ResourceManager.GetObject("login_bg6", resourceCulture);
+ object obj = ResourceManager.GetObject("login_bgOk", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index d86743e..d753b34 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,10 +124,8 @@
<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 name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x321.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>
@@ -146,21 +144,11 @@
<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="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>
</data>
<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>
@@ -190,6 +178,9 @@
<data name="defaultprinter" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\defaultprinter.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="calculatenow_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\calculatenow_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="time2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\time2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -209,11 +200,11 @@
<data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="splinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\splinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="trackingchanges_showmarkup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_showmarkup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="copymodeldifferences_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\copymodeldifferences_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="publicfix_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\publicfix_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -228,11 +219,6 @@
</data>
<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="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>
@@ -251,16 +237,17 @@
<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="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.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="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 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="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -268,8 +255,8 @@
<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="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
+ <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>
@@ -302,19 +289,26 @@
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,
+ <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="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="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="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>
<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="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="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>
@@ -344,22 +338,27 @@
<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="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 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="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="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="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refresh_32x321.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="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -367,21 +366,14 @@
<data name="calculatenow" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\calculatenow.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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="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="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="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>
@@ -546,11 +538,6 @@
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>
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -588,11 +575,14 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.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>
@@ -611,8 +601,8 @@
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="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="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>
@@ -634,6 +624,11 @@
<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="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="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>
@@ -645,8 +640,8 @@
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 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>
@@ -656,10 +651,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</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 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="last_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\last_16x16.png;System.Drawing.Bitmap,
@@ -701,11 +694,17 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="copymodeldifferences_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\copymodeldifferences_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="printlayoutview_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printlayoutview_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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>
@@ -715,11 +714,6 @@
</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>
@@ -795,9 +789,6 @@
<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>
@@ -814,9 +805,6 @@
</data>
<data name="ok123" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ok123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="splinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\splinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -849,6 +837,11 @@
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>
<data name="group2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\group2_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -862,39 +855,36 @@
<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="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 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>
<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="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="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="login_bg6" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\login_bg6.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="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="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="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="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -909,22 +899,34 @@
<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="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ <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="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="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="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 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="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>
@@ -959,22 +961,22 @@
<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="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 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="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="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 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="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 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="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 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="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>
@@ -992,16 +994,15 @@
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>
- <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
+ <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="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="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>
<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>
@@ -1015,8 +1016,8 @@
<data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_32x32.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="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -1031,12 +1032,10 @@
<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 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="calculatenow_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\calculatenow_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="login_bgOk" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\login_bgOk.jpg;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/login_bg.jpg b/DevApp/Gs.DevApp/Resources/login_bg.jpg
new file mode 100644
index 0000000..3c7fef2
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/login_bg.jpg
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/login_bg1.jpg b/DevApp/Gs.DevApp/Resources/login_bg1.jpg
new file mode 100644
index 0000000..b297d64
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/login_bg1.jpg
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/login_bg6.png b/DevApp/Gs.DevApp/Resources/login_bg6.png
deleted file mode 100644
index b409892..0000000
--- a/DevApp/Gs.DevApp/Resources/login_bg6.png
+++ /dev/null
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/login_bgOk.jpg b/DevApp/Gs.DevApp/Resources/login_bgOk.jpg
new file mode 100644
index 0000000..b582adb
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/login_bgOk.jpg
Binary files differ
--
Gitblit v1.9.3