From 08cd6d0fb4a1dee5996a9ec27f52f2b9b4fe6068 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 10 十二月 2024 13:17:07 +0800 Subject: [PATCH] 缺陷资料 --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx | 120 +++ DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2 DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs | 101 ++ DevApp/Gs.DevApp/UserControl/UcLookDefectType.resx | 120 +++ DevApp/Gs.DevApp/Gs.DevApp.csproj | 29 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs | 300 ++++++++ DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs | 111 +++ DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs | 475 +++++++++++++ DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 29 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 18 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.resx | 120 +++ DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs | 346 +++++++++ DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 320 +++++++++ 15 files changed, 2,075 insertions(+), 20 deletions(-) diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json index bd43464..c309f19 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":[],"References":[],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDaaDirectOut.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesDaaDirectOut.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshop.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshop.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\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql2.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql3.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitem.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookupTypes.cs"},{"SourceFile":"DevFrm\\QiTa\\Frm_MesInvItemMoves.cs"},{"SourceFile":"DevFrm\\QiTa\\Frm_MesInvItemMoves.Designer.cs"},{"SourceFile":"DevFrm\\QiTa\\Frm_MesItemQt.cs"},{"SourceFile":"DevFrm\\QiTa\\Frm_MesItemQt.Designer.cs"},{"SourceFile":"DevFrm\\QiTa\\Frm_MesItemQtrk.cs"},{"SourceFile":"DevFrm\\QiTa\\Frm_MesItemQtrk.Designer.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\FileSelector.cs"},{"SourceFile":"DevFrm\\FrmLogin.cs"},{"SourceFile":"DevFrm\\FrmLogin.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintInfo.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_PrintUser.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintInfo.cs"},{"SourceFile":"DevFrm\\Sys\\Mode\\PrintUser.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.cs"},{"SourceFile":"DevFrm\\Sys\\SysHelp.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemIns.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemIns.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemOuts.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemOut_SCLL.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemOut_SCLL.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemInCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem3.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.Designer.cs"},{"SourceFile":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"TestForm\\XtraForm1.cs"},{"SourceFile":"TestForm\\XtraForm1.Designer.cs"},{"SourceFile":"TestForm\\XtraForm2.cs"},{"SourceFile":"TestForm\\XtraForm2.Designer.cs"},{"SourceFile":"ToolBox\\LogHelper.cs"},{"SourceFile":"ToolBox\\MsgHelper.cs"},{"SourceFile":"ToolBox\\UpdateParentEventArgs.cs"},{"SourceFile":"ToolBox\\UtilityHelper.cs"},{"SourceFile":"UserControl\\SelectCgMx.cs"},{"SourceFile":"UserControl\\SelectCgMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\SelectWomdaahb.cs"},{"SourceFile":"UserControl\\SelectWomdaahb.Designer.cs"},{"SourceFile":"UserControl\\SelectWompba.cs"},{"SourceFile":"UserControl\\SelectWompba.Designer.cs"},{"SourceFile":"UserControl\\ShowFile.cs"},{"SourceFile":"UserControl\\ShowFile.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\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookCustomer.cs"},{"SourceFile":"UserControl\\UcLookCustomer.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookOrg.cs"},{"SourceFile":"UserControl\\UcLookOrg.Designer.cs"},{"SourceFile":"UserControl\\UcLookPrint.cs"},{"SourceFile":"UserControl\\UcLookPrint.Designer.cs"},{"SourceFile":"UserControl\\UcLookStaff.cs"},{"SourceFile":"UserControl\\UcLookStaff.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcLookUnit.cs"},{"SourceFile":"UserControl\\UcLookUnit.Designer.cs"},{"SourceFile":"UserControl\\UcLookUser.cs"},{"SourceFile":"UserControl\\UcLookUser.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkline.cs"},{"SourceFile":"UserControl\\UcLookWorkline.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\UCUpFile.cs"},{"SourceFile":"UserControl\\UCUpFile.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\CefSharp.WinForms.129.0.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient2\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient2\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs new file mode 100644 index 0000000..fed885e --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs @@ -0,0 +1,475 @@ +/* Create By GS EasyCode */ +namespace Gs.DevApp.DevFrm +{ + partial class Frm_MesDefectCode + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_defectRate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_defectSort = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_memo = new DevExpress.XtraEditors.LabelControl(); + this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_defectName = new DevExpress.XtraEditors.LabelControl(); + this.txt_defectName = new DevExpress.XtraEditors.TextEdit(); + this.gv_defectName = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_defectCode = new DevExpress.XtraEditors.LabelControl(); + this.txt_defectCode = new DevExpress.XtraEditors.TextEdit(); + this.gv_defectCode = new DevExpress.XtraGrid.Columns.GridColumn(); + this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.panel1 = new System.Windows.Forms.Panel(); + this.txt_pid = new Gs.DevApp.UserControl.UcLookDefectType(); + this.txt_memo = new DevExpress.XtraEditors.MemoEdit(); + this.txt_typeMemo = new DevExpress.XtraEditors.MemoEdit(); + this.lb_typeMemo = new DevExpress.XtraEditors.LabelControl(); + this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); + this.lbGuid = new System.Windows.Forms.Label(); + this.lb_pid = new DevExpress.XtraEditors.LabelControl(); + ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + this.xtraTabPage2.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).BeginInit(); + this.SuspendLayout(); + // + // gv_lastupdateDate + // + this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿 "; + this.gv_lastupdateDate.FieldName = "lastupdateDate"; + this.gv_lastupdateDate.MinWidth = 50; + this.gv_lastupdateDate.Name = "gv_lastupdateDate"; + this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; + this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; + this.gv_lastupdateDate.Visible = true; + this.gv_lastupdateDate.VisibleIndex = 8; + this.gv_lastupdateDate.Width = 94; + // + // gv_lastupdateBy + // + this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateBy.Caption = "鏇存柊浜� "; + this.gv_lastupdateBy.FieldName = "lastupdateBy"; + this.gv_lastupdateBy.MinWidth = 50; + this.gv_lastupdateBy.Name = "gv_lastupdateBy"; + this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; + this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; + this.gv_lastupdateBy.Visible = true; + this.gv_lastupdateBy.VisibleIndex = 7; + this.gv_lastupdateBy.Width = 94; + // + // gv_createDate + // + this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createDate.AppearanceCell.Options.UseFont = true; + this.gv_createDate.Caption = "鍒涘缓鏃堕棿 "; + this.gv_createDate.FieldName = "createDate"; + this.gv_createDate.MinWidth = 50; + this.gv_createDate.Name = "gv_createDate"; + this.gv_createDate.OptionsColumn.AllowEdit = false; + this.gv_createDate.Tag = "query_a.create_date"; + this.gv_createDate.Visible = true; + this.gv_createDate.VisibleIndex = 6; + this.gv_createDate.Width = 94; + // + // gv_createBy + // + this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createBy.AppearanceCell.Options.UseFont = true; + this.gv_createBy.Caption = "鍒涘缓浜� "; + this.gv_createBy.FieldName = "createBy"; + this.gv_createBy.MinWidth = 50; + this.gv_createBy.Name = "gv_createBy"; + this.gv_createBy.OptionsColumn.AllowEdit = false; + this.gv_createBy.Tag = "query_a.create_by"; + this.gv_createBy.Visible = true; + this.gv_createBy.VisibleIndex = 5; + this.gv_createBy.Width = 94; + // + // gv_defectRate + // + this.gv_defectRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_defectRate.AppearanceCell.Options.UseFont = true; + this.gv_defectRate.Caption = "缂洪櫡绫诲埆鎻忚堪"; + this.gv_defectRate.FieldName = "typeMemo"; + this.gv_defectRate.MinWidth = 50; + this.gv_defectRate.Name = "gv_defectRate"; + this.gv_defectRate.OptionsColumn.AllowEdit = false; + this.gv_defectRate.Tag = "query_a.defect_rate"; + this.gv_defectRate.Visible = true; + this.gv_defectRate.VisibleIndex = 4; + this.gv_defectRate.Width = 94; + // + // gv_defectSort + // + this.gv_defectSort.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_defectSort.AppearanceCell.Options.UseFont = true; + this.gv_defectSort.Caption = "缂洪櫡绫诲埆"; + this.gv_defectSort.FieldName = "typeNo"; + this.gv_defectSort.MinWidth = 50; + this.gv_defectSort.Name = "gv_defectSort"; + this.gv_defectSort.OptionsColumn.AllowEdit = false; + this.gv_defectSort.Tag = "query_a.defect_sort"; + this.gv_defectSort.Visible = true; + this.gv_defectSort.VisibleIndex = 3; + this.gv_defectSort.Width = 94; + // + // lb_memo + // + this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_memo.Appearance.Options.UseFont = true; + this.lb_memo.Location = new System.Drawing.Point(41, 108); + this.lb_memo.Name = "lb_memo"; + this.lb_memo.Size = new System.Drawing.Size(40, 21); + this.lb_memo.TabIndex = 216; + this.lb_memo.Text = "澶囨敞:"; + // + // gv_memo + // + this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_memo.AppearanceCell.Options.UseFont = true; + this.gv_memo.Caption = "缂洪櫡澶囨敞"; + this.gv_memo.FieldName = "memo"; + this.gv_memo.MinWidth = 50; + this.gv_memo.Name = "gv_memo"; + this.gv_memo.OptionsColumn.AllowEdit = false; + this.gv_memo.Tag = "query_a.memo"; + this.gv_memo.Visible = true; + this.gv_memo.VisibleIndex = 2; + this.gv_memo.Width = 94; + // + // lb_defectName + // + this.lb_defectName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_defectName.Appearance.Options.UseFont = true; + this.lb_defectName.Location = new System.Drawing.Point(7, 68); + this.lb_defectName.Name = "lb_defectName"; + this.lb_defectName.Size = new System.Drawing.Size(74, 21); + this.lb_defectName.TabIndex = 213; + this.lb_defectName.Text = "缂洪櫡鍚嶇О:"; + // + // txt_defectName + // + this.txt_defectName.Location = new System.Drawing.Point(87, 64); + this.txt_defectName.Name = "txt_defectName"; + this.txt_defectName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_defectName.Properties.Appearance.Options.UseFont = true; + this.txt_defectName.Size = new System.Drawing.Size(210, 28); + this.txt_defectName.TabIndex = 213; + // + // gv_defectName + // + this.gv_defectName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_defectName.AppearanceCell.Options.UseFont = true; + this.gv_defectName.Caption = "缂洪櫡鍚嶇О"; + this.gv_defectName.FieldName = "defectName"; + this.gv_defectName.MinWidth = 50; + this.gv_defectName.Name = "gv_defectName"; + this.gv_defectName.OptionsColumn.AllowEdit = false; + this.gv_defectName.Tag = "query_a.defect_name"; + this.gv_defectName.Visible = true; + this.gv_defectName.VisibleIndex = 1; + this.gv_defectName.Width = 94; + // + // lb_defectCode + // + this.lb_defectCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_defectCode.Appearance.Options.UseFont = true; + this.lb_defectCode.Location = new System.Drawing.Point(7, 27); + this.lb_defectCode.Name = "lb_defectCode"; + this.lb_defectCode.Size = new System.Drawing.Size(74, 21); + this.lb_defectCode.TabIndex = 211; + this.lb_defectCode.Text = "缂洪櫡浠g爜:"; + // + // txt_defectCode + // + this.txt_defectCode.Location = new System.Drawing.Point(87, 27); + this.txt_defectCode.Name = "txt_defectCode"; + this.txt_defectCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_defectCode.Properties.Appearance.Options.UseFont = true; + this.txt_defectCode.Size = new System.Drawing.Size(210, 28); + this.txt_defectCode.TabIndex = 211; + // + // gv_defectCode + // + this.gv_defectCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_defectCode.AppearanceCell.Options.UseFont = true; + this.gv_defectCode.Caption = "缂洪櫡浠g爜"; + this.gv_defectCode.FieldName = "defectCode"; + this.gv_defectCode.MinWidth = 50; + this.gv_defectCode.Name = "gv_defectCode"; + this.gv_defectCode.OptionsColumn.AllowEdit = false; + this.gv_defectCode.Tag = "query_a.defect_code"; + this.gv_defectCode.Visible = true; + this.gv_defectCode.VisibleIndex = 0; + this.gv_defectCode.Width = 94; + // + // toolBarMenu1 + // + this.toolBarMenu1.chkParameter = null; + this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; + this.toolBarMenu1.guidKey = null; + this.toolBarMenu1.isSetBtn = false; + this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Name = "toolBarMenu1"; + this.toolBarMenu1.rptParameter = null; + this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.TabIndex = 0; + this.toolBarMenu1.xlsInService = null; + this.toolBarMenu1.xlsOutParameter = null; + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(1126, 531); + this.gcMain.TabIndex = 1; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_defectCode, + this.gv_defectName, + this.gv_memo, + this.gv_defectSort, + this.gv_defectRate, + this.gv_createBy, + this.gv_createDate, + this.gv_lastupdateBy, + this.gv_lastupdateDate}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.IndicatorWidth = 50; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; + this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); + this.xtraTabControl1.TabIndex = 3; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gcMain); + this.xtraTabPage1.Controls.Add(this.pageBar1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Text = "鏁版嵁鏌ヨ"; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 1; + this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pageBar1.Location = new System.Drawing.Point(0, 531); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Name = "pageBar1"; + this.pageBar1.RecordCount = 0; + this.pageBar1.Size = new System.Drawing.Size(1126, 39); + this.pageBar1.TabIndex = 3; + this.pageBar1.TotalPages = 0; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.panel1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.PageEnabled = false; + this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Text = "鏁版嵁缂栬緫"; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_pid); + this.panel1.Controls.Add(this.txt_memo); + this.panel1.Controls.Add(this.txt_typeMemo); + this.panel1.Controls.Add(this.lb_typeMemo); + this.panel1.Controls.Add(this.labelControl11); + this.panel1.Controls.Add(this.lbGuid); + this.panel1.Controls.Add(this.lb_pid); + this.panel1.Controls.Add(this.lb_memo); + this.panel1.Controls.Add(this.lb_defectName); + this.panel1.Controls.Add(this.txt_defectName); + this.panel1.Controls.Add(this.lb_defectCode); + this.panel1.Controls.Add(this.txt_defectCode); + this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); + this.panel1.Location = new System.Drawing.Point(76, 20); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(726, 300); + this.panel1.TabIndex = 1; + // + // txt_pid + // + this.txt_pid.IsReadly = false; + this.txt_pid.Location = new System.Drawing.Point(424, 67); + this.txt_pid.Name = "txt_pid"; + this.txt_pid.Size = new System.Drawing.Size(209, 28); + this.txt_pid.TabIndex = 310; + // + // txt_memo + // + this.txt_memo.Location = new System.Drawing.Point(87, 99); + this.txt_memo.Name = "txt_memo"; + this.txt_memo.Size = new System.Drawing.Size(210, 38); + this.txt_memo.TabIndex = 309; + // + // txt_typeMemo + // + this.txt_typeMemo.Enabled = false; + this.txt_typeMemo.Location = new System.Drawing.Point(423, 99); + this.txt_typeMemo.Name = "txt_typeMemo"; + this.txt_typeMemo.Size = new System.Drawing.Size(210, 38); + this.txt_typeMemo.TabIndex = 308; + // + // lb_typeMemo + // + this.lb_typeMemo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_typeMemo.Appearance.Options.UseFont = true; + this.lb_typeMemo.Location = new System.Drawing.Point(309, 108); + this.lb_typeMemo.Name = "lb_typeMemo"; + this.lb_typeMemo.Size = new System.Drawing.Size(108, 21); + this.lb_typeMemo.TabIndex = 307; + this.lb_typeMemo.Text = "缂洪櫡绫诲埆鎻忚堪:"; + // + // labelControl11 + // + this.labelControl11.Location = new System.Drawing.Point(403, 164); + this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl11.Name = "labelControl11"; + this.labelControl11.Size = new System.Drawing.Size(45, 18); + this.labelControl11.TabIndex = 130; + this.labelControl11.Text = "涓婚敭锛�"; + this.labelControl11.Visible = false; + // + // lbGuid + // + this.lbGuid.AutoSize = true; + this.lbGuid.Location = new System.Drawing.Point(454, 164); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(0, 21); + this.lbGuid.TabIndex = 1; + this.lbGuid.Visible = false; + // + // lb_pid + // + this.lb_pid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_pid.Appearance.Options.UseFont = true; + this.lb_pid.Location = new System.Drawing.Point(343, 68); + this.lb_pid.Name = "lb_pid"; + this.lb_pid.Size = new System.Drawing.Size(74, 21); + this.lb_pid.TabIndex = 306; + this.lb_pid.Text = "缂洪櫡绫诲埆:"; + // + // Frm_MesDefectCode + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1128, 682); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + this.Name = "Frm_MesDefectCode"; + ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + this.xtraTabPage2.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).EndInit(); + this.ResumeLayout(false); + + } + #endregion + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private UserControls.Data.UcPageBar pageBar1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.LabelControl labelControl11; + private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_defectRate; + private DevExpress.XtraGrid.Columns.GridColumn gv_defectSort; + +private DevExpress.XtraEditors.LabelControl lb_memo; + private DevExpress.XtraGrid.Columns.GridColumn gv_memo; + +private DevExpress.XtraEditors.LabelControl lb_defectName; +private DevExpress.XtraEditors.TextEdit txt_defectName; + private DevExpress.XtraGrid.Columns.GridColumn gv_defectName; + +private DevExpress.XtraEditors.LabelControl lb_defectCode; +private DevExpress.XtraEditors.TextEdit txt_defectCode; + private DevExpress.XtraGrid.Columns.GridColumn gv_defectCode; + private DevExpress.XtraEditors.LabelControl lb_pid; + private DevExpress.XtraEditors.MemoEdit txt_typeMemo; + private DevExpress.XtraEditors.LabelControl lb_typeMemo; + private DevExpress.XtraEditors.MemoEdit txt_memo; + private UserControl.UcLookDefectType txt_pid; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs new file mode 100644 index 0000000..a3eece3 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs @@ -0,0 +1,320 @@ +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using MES.Service.Modes; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm +{ + public partial class Frm_MesDefectCode : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "MesDefectCodeManager/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_MesDefectCode() + { + InitializeComponent(); + this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; + this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; + this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; + Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + txt_pid.EditChanged += (s, e) => + { + txt_typeMemo.Text = this.txt_pid.GetMemo(); + }; + } + + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + await Task.Delay(100); + getPageList(1); + } + /// <summary> + /// 鍙屽嚮浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) + { + string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); + if (!string.IsNullOrEmpty(rowGuid)) + getModel(rowGuid, false, 999); + } + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + /// <summary> + /// 鏌ヨ浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList); + frm.UpdateParent += Frm_UpdateParent; + frm.ShowDialog(); + } + /// <summary> + /// 鏌ヨ鍥炶皟 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + { + _filterList = e.FilterList; + getPageList(1); + } + + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + } + + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_defectCode, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + List<dynamic> lst = new List<dynamic>(); + lst.Add(rowGuid); + var _obj = lst; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + getPageList(1); + } + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// 鍒锋柊浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim(), false, 999); + else + { + _filterList.Clear(); + if (gridView1.ActiveFilter.Count > 0) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + } + getPageList(1); + } + } + /// <summary> + /// 淇敼浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_defectCode, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + getModel(rowGuid, true, 1); + } + /// <summary> + /// 鏂板浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 1); + lbGuid.Text = ""; + UtilityHelper.CleanValueByControl(this.panel1.Controls, true); + + } + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + string _txt_pid= txt_pid.GetGuid(); + if (string.IsNullOrEmpty(txt_defectCode.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("缂洪櫡浠g爜涓嶈兘涓虹┖锛�"); + txt_defectCode.Focus(); + return; + } + if (string.IsNullOrEmpty(txt_defectName.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("缂洪櫡鍚嶇О涓嶈兘涓虹┖锛�"); + txt_defectName.Focus(); + return; + } + if (string.IsNullOrEmpty(_txt_pid)) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("缂洪櫡绫诲埆涓嶈兘涓虹┖锛�"); + txt_pid.Focus(); + return; + } + var _obj = new MesDefectCode() + { + Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 + Pid = UtilityHelper.ToGuid(_txt_pid), + Memo=txt_memo.Text.Trim(), + DefectCode=txt_defectCode.Text.Trim(), + DefectName=txt_defectName.Text.Trim(), + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + lbGuid.Text = _rtn.rtnData; + toolBarMenu1.isSetBtn = true; + UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.defect_code", + "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", + _webServiceName + "GetListPage", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + + } + /// <summary> + /// + /// </summary> + /// <param name="strGuid">涓婚敭</param> + /// <param name="isEdit">鏄惁鍙紪杈�</param> + /// <param name="tabIdx">閫夐」鍗″簭鍙�</param> + private void getModel(string strGuid, bool isEdit, int tabIdx) + { + if (string.IsNullOrEmpty(strGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); + var _obj = new + { + guid = strGuid,//涓诲缓 + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + dynamic dy = _rtn.rtnData; + lbGuid.Text = strGuid; + UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit); + + } + else + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs new file mode 100644 index 0000000..b02585b --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs @@ -0,0 +1,346 @@ +/* Create By GS EasyCode */ +namespace Gs.DevApp.DevFrm +{ + partial class Frm_MesDefectType + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.lb_typeMemo = new DevExpress.XtraEditors.LabelControl(); + this.gv_typeMemo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_typeNo = new DevExpress.XtraEditors.LabelControl(); + this.txt_typeNo = new DevExpress.XtraEditors.TextEdit(); + this.gv_typeNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); + this.gcMain = new DevExpress.XtraGrid.GridControl(); + this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.panel1 = new System.Windows.Forms.Panel(); + this.txt_typeMemo = new DevExpress.XtraEditors.MemoEdit(); + this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); + this.lbGuid = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + this.xtraTabPage2.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).BeginInit(); + this.SuspendLayout(); + // + // lb_typeMemo + // + this.lb_typeMemo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_typeMemo.Appearance.Options.UseFont = true; + this.lb_typeMemo.Location = new System.Drawing.Point(40, 95); + this.lb_typeMemo.Name = "lb_typeMemo"; + this.lb_typeMemo.Size = new System.Drawing.Size(107, 21); + this.lb_typeMemo.TabIndex = 222; + this.lb_typeMemo.Text = "缂洪櫡绫诲埆鎻忚堪 "; + // + // gv_typeMemo + // + this.gv_typeMemo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_typeMemo.AppearanceCell.Options.UseFont = true; + this.gv_typeMemo.Caption = "缂洪櫡绫诲埆鎻忚堪"; + this.gv_typeMemo.FieldName = "typeMemo"; + this.gv_typeMemo.MinWidth = 50; + this.gv_typeMemo.Name = "gv_typeMemo"; + this.gv_typeMemo.OptionsColumn.AllowEdit = false; + this.gv_typeMemo.Tag = "query_a.type_memo"; + this.gv_typeMemo.Visible = true; + this.gv_typeMemo.VisibleIndex = 1; + this.gv_typeMemo.Width = 94; + // + // lb_typeNo + // + this.lb_typeNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_typeNo.Appearance.Options.UseFont = true; + this.lb_typeNo.Location = new System.Drawing.Point(40, 48); + this.lb_typeNo.Name = "lb_typeNo"; + this.lb_typeNo.Size = new System.Drawing.Size(107, 21); + this.lb_typeNo.TabIndex = 219; + this.lb_typeNo.Text = "缂洪櫡绫诲埆缂栧彿 "; + // + // txt_typeNo + // + this.txt_typeNo.Location = new System.Drawing.Point(160, 44); + this.txt_typeNo.Name = "txt_typeNo"; + this.txt_typeNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_typeNo.Properties.Appearance.Options.UseFont = true; + this.txt_typeNo.Size = new System.Drawing.Size(210, 28); + this.txt_typeNo.TabIndex = 219; + // + // gv_typeNo + // + this.gv_typeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_typeNo.AppearanceCell.Options.UseFont = true; + this.gv_typeNo.Caption = "缂洪櫡绫诲埆缂栧彿"; + this.gv_typeNo.FieldName = "typeNo"; + this.gv_typeNo.MinWidth = 50; + this.gv_typeNo.Name = "gv_typeNo"; + this.gv_typeNo.OptionsColumn.AllowEdit = false; + this.gv_typeNo.Tag = "query_a.type_no"; + this.gv_typeNo.Visible = true; + this.gv_typeNo.VisibleIndex = 0; + this.gv_typeNo.Width = 94; + // + // gv_lastupdateDate + // + this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿"; + this.gv_lastupdateDate.FieldName = "lastupdateDate"; + this.gv_lastupdateDate.MinWidth = 50; + this.gv_lastupdateDate.Name = "gv_lastupdateDate"; + this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; + this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; + this.gv_lastupdateDate.Visible = true; + this.gv_lastupdateDate.VisibleIndex = 5; + this.gv_lastupdateDate.Width = 94; + // + // gv_lastupdateBy + // + this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; + this.gv_lastupdateBy.Caption = "鏇存柊浜�"; + this.gv_lastupdateBy.FieldName = "lastupdateBy"; + this.gv_lastupdateBy.MinWidth = 50; + this.gv_lastupdateBy.Name = "gv_lastupdateBy"; + this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; + this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; + this.gv_lastupdateBy.Visible = true; + this.gv_lastupdateBy.VisibleIndex = 4; + this.gv_lastupdateBy.Width = 94; + // + // gv_createDate + // + this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createDate.AppearanceCell.Options.UseFont = true; + this.gv_createDate.Caption = "鍒涘缓鏃堕棿"; + this.gv_createDate.FieldName = "createDate"; + this.gv_createDate.MinWidth = 50; + this.gv_createDate.Name = "gv_createDate"; + this.gv_createDate.OptionsColumn.AllowEdit = false; + this.gv_createDate.Tag = "query_a.create_date"; + this.gv_createDate.Visible = true; + this.gv_createDate.VisibleIndex = 3; + this.gv_createDate.Width = 94; + // + // gv_createBy + // + this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createBy.AppearanceCell.Options.UseFont = true; + this.gv_createBy.Caption = "鍒涘缓浜�"; + this.gv_createBy.FieldName = "createBy"; + this.gv_createBy.MinWidth = 50; + this.gv_createBy.Name = "gv_createBy"; + this.gv_createBy.OptionsColumn.AllowEdit = false; + this.gv_createBy.Tag = "query_a.create_by"; + this.gv_createBy.Visible = true; + this.gv_createBy.VisibleIndex = 2; + this.gv_createBy.Width = 94; + // + // toolBarMenu1 + // + this.toolBarMenu1.chkParameter = null; + this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; + this.toolBarMenu1.guidKey = null; + this.toolBarMenu1.isSetBtn = false; + this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Name = "toolBarMenu1"; + this.toolBarMenu1.rptParameter = null; + this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.TabIndex = 0; + this.toolBarMenu1.xlsInService = null; + this.toolBarMenu1.xlsOutParameter = null; + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(1126, 531); + this.gcMain.TabIndex = 1; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_typeNo, + this.gv_typeMemo, + this.gv_createBy, + this.gv_createDate, + this.gv_lastupdateBy, + this.gv_lastupdateDate}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.IndicatorWidth = 50; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; + this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); + this.xtraTabControl1.TabIndex = 3; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gcMain); + this.xtraTabPage1.Controls.Add(this.pageBar1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Text = "鏁版嵁鏌ヨ"; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 1; + this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pageBar1.Location = new System.Drawing.Point(0, 531); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Name = "pageBar1"; + this.pageBar1.RecordCount = 0; + this.pageBar1.Size = new System.Drawing.Size(1126, 39); + this.pageBar1.TabIndex = 3; + this.pageBar1.TotalPages = 0; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.panel1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.PageEnabled = false; + this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Text = "鏁版嵁缂栬緫"; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_typeMemo); + this.panel1.Controls.Add(this.labelControl11); + this.panel1.Controls.Add(this.lbGuid); + this.panel1.Controls.Add(this.lb_typeMemo); + this.panel1.Controls.Add(this.lb_typeNo); + this.panel1.Controls.Add(this.txt_typeNo); + this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); + this.panel1.Location = new System.Drawing.Point(76, 20); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(571, 278); + this.panel1.TabIndex = 1; + // + // txt_typeMemo + // + this.txt_typeMemo.Location = new System.Drawing.Point(160, 95); + this.txt_typeMemo.Name = "txt_typeMemo"; + this.txt_typeMemo.Size = new System.Drawing.Size(210, 96); + this.txt_typeMemo.TabIndex = 223; + // + // labelControl11 + // + this.labelControl11.Location = new System.Drawing.Point(465, 49); + this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl11.Name = "labelControl11"; + this.labelControl11.Size = new System.Drawing.Size(45, 18); + this.labelControl11.TabIndex = 130; + this.labelControl11.Text = "涓婚敭锛�"; + this.labelControl11.Visible = false; + // + // lbGuid + // + this.lbGuid.AutoSize = true; + this.lbGuid.Location = new System.Drawing.Point(516, 49); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(0, 21); + this.lbGuid.TabIndex = 1; + this.lbGuid.Visible = false; + // + // Frm_MesDefectType + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1128, 682); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + this.Name = "Frm_MesDefectType"; + ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + this.xtraTabPage2.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_typeMemo.Properties)).EndInit(); + this.ResumeLayout(false); + + } + #endregion + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private UserControls.Data.UcPageBar pageBar1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.LabelControl labelControl11; + //BQCreateConrolObejct +private DevExpress.XtraEditors.LabelControl lb_typeMemo; + private DevExpress.XtraGrid.Columns.GridColumn gv_typeMemo; + +private DevExpress.XtraEditors.LabelControl lb_typeNo; +private DevExpress.XtraEditors.TextEdit txt_typeNo; + private DevExpress.XtraGrid.Columns.GridColumn gv_typeNo; + private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; + private DevExpress.XtraEditors.MemoEdit txt_typeMemo; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs new file mode 100644 index 0000000..cb61b86 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs @@ -0,0 +1,300 @@ +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using MES.Service.Modes; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Data; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm +{ + public partial class Frm_MesDefectType : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "MesDefectTypeManager/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_MesDefectType() + { + InitializeComponent(); + this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; + this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; + this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; + Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + } + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + await Task.Delay(100); + getPageList(1); + } + /// <summary> + /// 鍙屽嚮浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) + { + string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); + if (!string.IsNullOrEmpty(rowGuid)) + getModel(rowGuid, false, 999); + } + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + /// <summary> + /// 鏌ヨ浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList); + frm.UpdateParent += Frm_UpdateParent; + frm.ShowDialog(); + } + /// <summary> + /// 鏌ヨ鍥炶皟 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + { + _filterList = e.FilterList; + getPageList(1); + } + + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + } + + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_typeNo, gridView1, "typeNo"); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + List<dynamic> lst = new List<dynamic>(); + lst.Add(rowGuid); + var _obj = lst; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + getPageList(1); + } + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// 鍒锋柊浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim(), false, 999); + else + { + _filterList.Clear(); + if (gridView1.ActiveFilter.Count > 0) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + } + getPageList(1); + } + } + /// <summary> + /// 淇敼浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_typeNo, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + getModel(rowGuid, true, 1); + } + /// <summary> + /// 鏂板浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 1); + lbGuid.Text = ""; + UtilityHelper.CleanValueByControl(this.panel1.Controls, true); + + } + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + if (string.IsNullOrEmpty(txt_typeNo.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("缂洪櫡绫诲埆缂栧彿 涓嶈兘涓虹┖锛�"); + txt_typeNo.Focus(); + return; + } + var _obj = new MesDefectType() + { + Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), + TypeNo=txt_typeNo.Text.Trim(), + TypeMemo=txt_typeMemo.Text.Trim(), + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + lbGuid.Text = _rtn.rtnData; + toolBarMenu1.isSetBtn = true; + UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private void getPageList(int curPage) + { + + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.type_no", + "asc", "", _sbSqlWhere.ToString()); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", + _webServiceName + "GetListPage", json); + var dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + + } + /// <summary> + /// + /// </summary> + /// <param name="strGuid">涓婚敭</param> + /// <param name="isEdit">鏄惁鍙紪杈�</param> + /// <param name="tabIdx">閫夐」鍗″簭鍙�</param> + private void getModel(string strGuid, bool isEdit, int tabIdx) + { + if (string.IsNullOrEmpty(strGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); + var _obj = new + { + guid = strGuid,//涓诲缓 + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + dynamic dy = _rtn.rtnData; + lbGuid.Text = strGuid; + UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit); + + } + else + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs index 7dbb987..6a8b555 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs @@ -379,7 +379,7 @@ this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1124, 338); - this.tabMxPage1.Text = "鏄庣粏1"; + this.tabMxPage1.Text = "鏄庣粏"; // // gcMx1 // diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs index 0aee61a..4657453 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs @@ -25,23 +25,9 @@ this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick; this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick; gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; + Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); getPageList(1); pageBar1.PagerEvent += PageBar1_PagerEvent; - Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); - gridView1.CustomDrawRowIndicator += (s, e) => - { - if (e.Info.IsRowIndicator && e.RowHandle >= 0) - { - e.Info.DisplayText = (e.RowHandle + 1).ToString(); - } - }; - gridView1.CustomDrawEmptyForeground += (s, e) => - { - string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!"; - Font f = new Font("寰蒋闆呴粦", 16); - Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); - e.Graphics.DrawString(str, f, Brushes.Gray, r); - }; } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { @@ -91,7 +77,6 @@ /// <param name="e"></param> private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) { - _filterList = e.FilterList; getPageList(1); } @@ -189,7 +174,6 @@ { MsgHelper.Warning("鎻愮ず锛�" + ex.Message); } - } /// <summary> diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index 88ae893..eab9027 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -248,6 +248,18 @@ <Compile Include="DevFrm\QC\Frm_IQCLookups.Designer.cs"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\QC\Frm_MesDefectCode.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\Frm_MesDefectCode.Designer.cs"> + <DependentUpon>Frm_MesDefectCode.cs</DependentUpon> + </Compile> + <Compile Include="DevFrm\QC\Frm_MesDefectType.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DevFrm\QC\Frm_MesDefectType.Designer.cs"> + <DependentUpon>Frm_MesDefectType.cs</DependentUpon> + </Compile> <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.Designer.cs"> <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon> </Compile> @@ -284,6 +296,8 @@ <Compile Include="DevFrm\QC\Frm_MesSysLookups.Designer.cs"> <DependentUpon>Frm_MesSysLookups.cs</DependentUpon> </Compile> + <Compile Include="DevFrm\QC\Models\MesDefectCode.cs" /> + <Compile Include="DevFrm\QC\Models\MesDefectType.cs" /> <Compile Include="DevFrm\QC\Models\MesQaItemsDetect01.cs" /> <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail12.cs" /> <Compile Include="DevFrm\QC\Models\MesQaItemsDetectDetail5.cs" /> @@ -609,6 +623,12 @@ <Compile Include="UserControl\UcLookCustomer.Designer.cs"> <DependentUpon>UcLookCustomer.cs</DependentUpon> </Compile> + <Compile Include="UserControl\UcLookDefectType.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="UserControl\UcLookDefectType.Designer.cs"> + <DependentUpon>UcLookDefectType.cs</DependentUpon> + </Compile> <Compile Include="UserControl\UcLookItems.cs"> <SubType>UserControl</SubType> </Compile> @@ -728,6 +748,12 @@ </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx"> <DependentUpon>Frm_IQCLookups.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectCode.resx"> + <DependentUpon>Frm_MesDefectCode.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="DevFrm\QC\Frm_MesDefectType.resx"> + <DependentUpon>Frm_MesDefectType.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx"> <DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon> @@ -889,6 +915,9 @@ <EmbeddedResource Include="UserControl\UcLookCustomer.resx"> <DependentUpon>UcLookCustomer.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="UserControl\UcLookDefectType.resx"> + <DependentUpon>UcLookDefectType.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="UserControl\UcLookItems.resx"> <DependentUpon>UcLookItems.cs</DependentUpon> </EmbeddedResource> diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user index 7a74901..78c201e 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user @@ -1,4 +1,4 @@ -锘�<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <ProjectView>ShowAllFiles</ProjectView> diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index ae93d9e..dd32cf5 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -626,6 +626,17 @@ txt.Enabled = false; continue; } + //鑷畾缂洪櫡绫诲埆 + if (colType is UcLookDefectType) + { + var txt = colType as UcLookDefectType; + txt.SetIdOrCode(strVal); + if (txt.IsReadly == false) + txt.Enabled = !isEdt; + else + txt.Enabled = false; + continue; + } if (colType is SimpleButton) { var txt = colType as SimpleButton; @@ -830,6 +841,14 @@ txt.Enabled = !isEdt; continue; } + //鑷畾缂洪櫡绫诲埆 + if (ctrl is UcLookDefectType) + { + var txt = ctrl as UcLookDefectType; + txt.SetIdOrCode("-1"); + txt.Enabled = !isEdt; + continue; + } if (ctrl is SimpleButton) { var txt = ctrl as SimpleButton; @@ -1027,6 +1046,16 @@ txt.Enabled = false; continue; } + //鑷畾缂洪櫡绫诲埆 + if (ctrl is UcLookDefectType) + { + var txt = ctrl as UcLookDefectType; + if (txt.IsReadly == false) + txt.Enabled = !isEdt; + else + txt.Enabled = false; + continue; + } } } diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs new file mode 100644 index 0000000..e49844f --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs @@ -0,0 +1,111 @@ +锘縩amespace Gs.DevApp.UserControl +{ + partial class UcLookDefectType + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit(); + this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit(); + this.SuspendLayout(); + // + // lookSearchSupplier + // + this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill; + this.lookSearchSupplier.EditValue = "璇烽�夋嫨"; + this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0); + this.lookSearchSupplier.Name = "lookSearchSupplier"; + this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true; + this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View; + this.lookSearchSupplier.Size = new System.Drawing.Size(226, 28); + this.lookSearchSupplier.TabIndex = 11; + // + // searchLookUpEdit1View + // + this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn2, + this.gridColumn5, + this.gridColumn4}); + this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; + this.searchLookUpEdit1View.Name = "searchLookUpEdit1View"; + this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; + this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false; + // + // gridColumn2 + // + this.gridColumn2.Caption = "缂洪櫡绫诲埆缂栫爜"; + this.gridColumn2.FieldName = "typeNo"; + this.gridColumn2.MinWidth = 80; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.UnboundDataType = typeof(string); + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 80; + // + // gridColumn5 + // + this.gridColumn5.Caption = "缂洪櫡绫诲埆鎻忚堪"; + this.gridColumn5.FieldName = "typeMemo"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 1; + // + // gridColumn4 + // + this.gridColumn4.Caption = "guid"; + this.gridColumn4.FieldName = "guid"; + this.gridColumn4.Name = "gridColumn4"; + // + // UcLookDefectType + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lookSearchSupplier); + this.Name = "UcLookDefectType"; + this.Size = new System.Drawing.Size(226, 28); + ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier; + private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs new file mode 100644 index 0000000..1202843 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs @@ -0,0 +1,101 @@ +锘縰sing Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using System; +using System.Data; + + +namespace Gs.DevApp.UserControl +{ + public partial class UcLookDefectType : DevExpress.XtraEditors.XtraUserControl + { + public UcLookDefectType() + { + InitializeComponent(); + lookSearchSupplier.Properties.NullText = "璇烽�夋嫨"; + lookSearchSupplier.EditValueChanged += + LookSearchSupplier_EditValueChanged; + getSuppler(); + } + + + public bool IsReadly { get; set; } + + /// <summary> + /// 鏀瑰彉浜嬩欢 + /// </summary> + public event EventHandler EditChanged; + + private void LookSearchSupplier_EditValueChanged(object sender, + EventArgs e) + { + if (EditChanged != null) EditChanged(this, e); + } + + private void getSuppler() + { + var pgq = new PageQueryModel(1, 999999, "a.type_no", "asc", "", " and 1=1"); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", "MesDefectTypeManager/GetListPage", json); + var rtn = UtilityHelper.ReturnToTablePage(strReturn); + var dt = rtn.rtnData.list; + lookSearchSupplier.Properties.DataSource = dt; + lookSearchSupplier.Properties.DisplayMember = "typeNo"; + lookSearchSupplier.Properties.ValueMember = "guid"; + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + public string GetCode() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["typeNo"].ToString(); + return id; + } + return ""; + } + public string GetName() + { + var name = lookSearchSupplier.Text.Trim(); + return name; + } + public string GetMemo() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["typeMemo"].ToString(); + return id; + } + return ""; + } + public void SetIdOrCode(string Code) + { + if (Code == "-1" || string.IsNullOrEmpty(Code)) + { + lookSearchSupplier.EditValue = null; + return; + } + //lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim()))); + lookSearchSupplier.EditValue = (((Code.ToString().Trim()))); + } + + + public string GetGuid() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["guid"].ToString(); + return id; + } + return ""; + } + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.resx b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file -- Gitblit v1.9.3