From 2bf1c34ff73d99de936d8880924f66111406dbd6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 02 十一月 2024 16:43:49 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 57 +
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 79 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 11
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 32
DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 89 -
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 27
DevApp/Gs.DevApp/TestForm/XtraForm1.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 79 +
DevApp/Gs.DevApp/Properties/Resources.resx | 72 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 1284 +++++++-------------------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 280 +++---
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/Properties/licenses.licx | 36
DevApp/Gs.DevApp/DevFrm/User/Role.resx | 244 ++---
17 files changed, 908 insertions(+), 1,411 deletions(-)
diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
index d06561f..d09848a 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\\GsMesClient\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.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_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\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.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\\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\\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\\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_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_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":"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":"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\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\ShowLogcs.cs"},{"SourceFile":"UserControl\\ShowLogcs.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLoading.cs"},{"SourceFile":"UserControl\\UcLoading.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowDialogForm.cs"},{"SourceFile":"UserControl\\ShowDialogForm.designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\XtraUserControl1.cs"},{"SourceFile":"UserControl\\XtraUserControl1.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\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\\GsMesClient\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\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\\GsMesClient\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.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\\GsMesClient\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"RootPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.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\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.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\\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\\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_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_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\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.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\\FluentDesignForm1.cs"},{"SourceFile":"TestForm\\FluentDesignForm1.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\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\ShowLogcs.cs"},{"SourceFile":"UserControl\\ShowLogcs.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLoading.cs"},{"SourceFile":"UserControl\\UcLoading.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowDialogForm.cs"},{"SourceFile":"UserControl\\ShowDialogForm.designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\XtraUserControl1.cs"},{"SourceFile":"UserControl\\XtraUserControl1.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\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\\GsMesClient\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\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\\GsMesClient\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.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\\GsMesClient\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 8d1c0e6..cb7e58b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -35,98 +35,63 @@
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ftextType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1freQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fspecRequ = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1checkQyt = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1facQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1freQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fngQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fngRate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fenterQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1company = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1factory = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckItemDesc = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1procNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1workshopCenterCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1funit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1givenModify = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panMsg = new DevExpress.XtraEditors.PanelControl();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.lb_remarks = new DevExpress.XtraEditors.LabelControl();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_qualityAudit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_iqcDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_states = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lifnr = new DevExpress.XtraEditors.LabelControl();
this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_dhb001 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_dhb002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_dha018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lotNo1 = new DevExpress.XtraEditors.LabelControl();
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.gv_lotNo1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1Date1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1By1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1Flag1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_maxCheckQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fsecondResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fmanageNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fngHandle = new DevExpress.XtraEditors.LabelControl();
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fgearStand = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fexemption = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckAccord = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcancel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fthirdRep = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckRepno = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1Date = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_modify1By = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_modify1Flag = 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.gv_fhandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fmove = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkQty = new DevExpress.XtraEditors.LabelControl();
this.txt_checkQty = new DevExpress.XtraEditors.TextEdit();
@@ -134,12 +99,9 @@
this.gv_facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_freview = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fcheckResu = new DevExpress.XtraEditors.LabelControl();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fngDesc = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_freceQty = new DevExpress.XtraEditors.LabelControl();
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
this.gv_freceQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -156,8 +118,6 @@
this.lb_releaseNo = new DevExpress.XtraEditors.LabelControl();
this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_guid = 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();
@@ -202,7 +162,7 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panMsg)).BeginInit();
this.panMsg.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
@@ -277,34 +237,22 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1id,
- this.gvMx1ftextType,
- this.gvMx1fstand,
+ this.gvMx1fcheckItem,
+ this.gvMx1fcheckTool,
+ this.gvMx1fcheckItemDesc,
+ this.gvMx1fspecRequ,
this.gvMx1fupAllow,
+ this.gvMx1fstand,
this.gvMx1fdownAllow,
+ this.gvMx1freQty,
+ this.gvMx1checkQyt,
+ this.gvMx1fenterQty,
+ this.gvMx1fcheckResu,
+ this.gvMx1fngRate,
+ this.gvMx1fngQty,
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
- this.gvMx1facLevel,
- this.gvMx1fcheckItem,
- this.gvMx1fspecRequ,
- this.gvMx1checkQyt,
- this.gvMx1fcheckResu,
- this.gvMx1facQty,
- this.gvMx1freQty,
- this.gvMx1fngQty,
- this.gvMx1fngRate,
- this.gvMx1fenterQty,
- this.gvMx1releaseNo,
- this.gvMx1company,
- this.gvMx1factory,
- this.gvMx1fcheckItemDesc,
- this.gvMx1procNo,
- this.gvMx1workshopCenterCode,
- this.gvMx1funit,
- this.gvMx1givenModify,
- this.gvMx1fcheckTool,
- this.gvMx1lastupdateBy,
- this.gvMx1lastupdateDate,
- this.gvMx1remarks});
+ this.gvMx1facLevel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -316,59 +264,81 @@
//
this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid ";
+ this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
this.gvMx1guid.Width = 94;
//
// gvMx1id
//
this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "id ";
+ this.gvMx1id.Caption = "id涓嶈兘鍒犻櫎";
this.gvMx1id.FieldName = "id";
this.gvMx1id.MinWidth = 50;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 1;
this.gvMx1id.Width = 94;
//
- // gvMx1ftextType
+ // gvMx1fcheckItem
//
- this.gvMx1ftextType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1ftextType.AppearanceCell.Options.UseFont = true;
- this.gvMx1ftextType.Caption = "鏍囧噯鍊肩被鍨� ";
- this.gvMx1ftextType.FieldName = "ftextType";
- this.gvMx1ftextType.MinWidth = 50;
- this.gvMx1ftextType.Name = "gvMx1ftextType";
- this.gvMx1ftextType.Tag = "query_a.ftext_type";
- this.gvMx1ftextType.Visible = true;
- this.gvMx1ftextType.VisibleIndex = 2;
- this.gvMx1ftextType.Width = 94;
+ this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
+ this.gvMx1fcheckItem.FieldName = "fcheckItem";
+ this.gvMx1fcheckItem.MinWidth = 120;
+ this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
+ this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
+ this.gvMx1fcheckItem.Visible = true;
+ this.gvMx1fcheckItem.VisibleIndex = 0;
+ this.gvMx1fcheckItem.Width = 120;
//
- // gvMx1fstand
+ // gvMx1fcheckTool
//
- this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
- this.gvMx1fstand.Caption = "鏍囧噯鍊� ";
- this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 50;
- this.gvMx1fstand.Name = "gvMx1fstand";
- this.gvMx1fstand.Tag = "query_a.fstand";
- this.gvMx1fstand.Visible = true;
- this.gvMx1fstand.VisibleIndex = 3;
- this.gvMx1fstand.Width = 94;
+ this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
+ this.gvMx1fcheckTool.FieldName = "fcheckTool";
+ this.gvMx1fcheckTool.MinWidth = 100;
+ this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
+ this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
+ this.gvMx1fcheckTool.Visible = true;
+ this.gvMx1fcheckTool.VisibleIndex = 1;
+ this.gvMx1fcheckTool.Width = 100;
+ //
+ // gvMx1fcheckItemDesc
+ //
+ this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
+ this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
+ this.gvMx1fcheckItemDesc.MinWidth = 120;
+ this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
+ this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
+ this.gvMx1fcheckItemDesc.Visible = true;
+ this.gvMx1fcheckItemDesc.VisibleIndex = 2;
+ this.gvMx1fcheckItemDesc.Width = 120;
+ //
+ // gvMx1fspecRequ
+ //
+ this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
+ this.gvMx1fspecRequ.FieldName = "fspecRequ";
+ this.gvMx1fspecRequ.MinWidth = 120;
+ this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
+ this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
+ this.gvMx1fspecRequ.Visible = true;
+ this.gvMx1fspecRequ.VisibleIndex = 3;
+ this.gvMx1fspecRequ.Width = 120;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
- this.gvMx1fupAllow.Caption = "涓婂叕宸� ";
+ this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
@@ -377,330 +347,152 @@
this.gvMx1fupAllow.VisibleIndex = 4;
this.gvMx1fupAllow.Width = 94;
//
+ // gvMx1fstand
+ //
+ this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fstand.Caption = "鏍囧噯鍊�";
+ this.gvMx1fstand.FieldName = "fstand";
+ this.gvMx1fstand.MinWidth = 50;
+ this.gvMx1fstand.Name = "gvMx1fstand";
+ this.gvMx1fstand.Tag = "query_a.fstand";
+ this.gvMx1fstand.Visible = true;
+ this.gvMx1fstand.VisibleIndex = 5;
+ this.gvMx1fstand.Width = 94;
+ //
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
- this.gvMx1fdownAllow.Caption = "涓嬪叕宸� ";
+ this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
- this.gvMx1fdownAllow.VisibleIndex = 5;
+ this.gvMx1fdownAllow.VisibleIndex = 6;
this.gvMx1fdownAllow.Width = 94;
- //
- // gvMx1sampleSizeNo
- //
- this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1sampleSizeNo.Caption = "妫�楠屾按鍑� ";
- this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 50;
- this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
- this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
- this.gvMx1sampleSizeNo.Visible = true;
- this.gvMx1sampleSizeNo.VisibleIndex = 6;
- this.gvMx1sampleSizeNo.Width = 94;
- //
- // gvMx1fcheckLevel
- //
- this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞� ";
- this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 50;
- this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
- this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
- this.gvMx1fcheckLevel.Visible = true;
- this.gvMx1fcheckLevel.VisibleIndex = 7;
- this.gvMx1fcheckLevel.Width = 94;
- //
- // gvMx1facLevel
- //
- this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
- this.gvMx1facLevel.Caption = "鎷掓敹姘村钩 ";
- this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 50;
- this.gvMx1facLevel.Name = "gvMx1facLevel";
- this.gvMx1facLevel.Tag = "query_a.fac_level";
- this.gvMx1facLevel.Visible = true;
- this.gvMx1facLevel.VisibleIndex = 8;
- this.gvMx1facLevel.Width = 94;
- //
- // gvMx1fcheckItem
- //
- this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩� ";
- this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 50;
- this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
- this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
- this.gvMx1fcheckItem.Visible = true;
- this.gvMx1fcheckItem.VisibleIndex = 9;
- this.gvMx1fcheckItem.Width = 94;
- //
- // gvMx1fspecRequ
- //
- this.gvMx1fspecRequ.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
- this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰 ";
- this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 50;
- this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
- this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
- this.gvMx1fspecRequ.Visible = true;
- this.gvMx1fspecRequ.VisibleIndex = 10;
- this.gvMx1fspecRequ.Width = 94;
- //
- // gvMx1checkQyt
- //
- this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
- this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺 ";
- this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 50;
- this.gvMx1checkQyt.Name = "gvMx1checkQyt";
- this.gvMx1checkQyt.Tag = "query_a.check_qyt";
- this.gvMx1checkQyt.Visible = true;
- this.gvMx1checkQyt.VisibleIndex = 11;
- this.gvMx1checkQyt.Width = 94;
- //
- // gvMx1fcheckResu
- //
- this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋� ";
- this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 50;
- this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
- this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
- this.gvMx1fcheckResu.Visible = true;
- this.gvMx1fcheckResu.VisibleIndex = 12;
- this.gvMx1fcheckResu.Width = 94;
- //
- // gvMx1facQty
- //
- this.gvMx1facQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1facQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1facQty.Caption = "AC鏁伴噺 ";
- this.gvMx1facQty.FieldName = "facQty";
- this.gvMx1facQty.MinWidth = 50;
- this.gvMx1facQty.Name = "gvMx1facQty";
- this.gvMx1facQty.Tag = "query_a.fac_qty";
- this.gvMx1facQty.Visible = true;
- this.gvMx1facQty.VisibleIndex = 13;
- this.gvMx1facQty.Width = 94;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1freQty.Caption = "RE鏁伴噺 ";
+ this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
this.gvMx1freQty.MinWidth = 50;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
- this.gvMx1freQty.VisibleIndex = 14;
+ this.gvMx1freQty.VisibleIndex = 7;
this.gvMx1freQty.Width = 94;
//
- // gvMx1fngQty
+ // gvMx1checkQyt
//
- this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟 ";
- this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 50;
- this.gvMx1fngQty.Name = "gvMx1fngQty";
- this.gvMx1fngQty.Tag = "query_a.fng_qty";
- this.gvMx1fngQty.Visible = true;
- this.gvMx1fngQty.VisibleIndex = 15;
- this.gvMx1fngQty.Width = 94;
- //
- // gvMx1fngRate
- //
- this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
- this.gvMx1fngRate.Caption = "涓嶈壇鐜� ";
- this.gvMx1fngRate.FieldName = "fngRate";
- this.gvMx1fngRate.MinWidth = 50;
- this.gvMx1fngRate.Name = "gvMx1fngRate";
- this.gvMx1fngRate.Tag = "query_a.fng_rate";
- this.gvMx1fngRate.Visible = true;
- this.gvMx1fngRate.VisibleIndex = 16;
- this.gvMx1fngRate.Width = 94;
+ this.gvMx1checkQyt.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
+ this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
+ this.gvMx1checkQyt.FieldName = "checkQyt";
+ this.gvMx1checkQyt.MinWidth = 50;
+ this.gvMx1checkQyt.Name = "gvMx1checkQyt";
+ this.gvMx1checkQyt.Tag = "query_a.check_qyt";
+ this.gvMx1checkQyt.Visible = true;
+ this.gvMx1checkQyt.VisibleIndex = 8;
+ this.gvMx1checkQyt.Width = 94;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲� ";
+ this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
this.gvMx1fenterQty.MinWidth = 50;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
- this.gvMx1fenterQty.VisibleIndex = 17;
+ this.gvMx1fenterQty.VisibleIndex = 9;
this.gvMx1fenterQty.Width = 94;
//
- // gvMx1releaseNo
+ // gvMx1fcheckResu
//
- this.gvMx1releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1releaseNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1releaseNo.Caption = "release_no ";
- this.gvMx1releaseNo.FieldName = "releaseNo";
- this.gvMx1releaseNo.MinWidth = 50;
- this.gvMx1releaseNo.Name = "gvMx1releaseNo";
- this.gvMx1releaseNo.Tag = "query_a.release_no";
- this.gvMx1releaseNo.Visible = true;
- this.gvMx1releaseNo.VisibleIndex = 18;
- this.gvMx1releaseNo.Width = 94;
+ this.gvMx1fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+ this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1fcheckResu.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
+ this.gvMx1fcheckResu.FieldName = "fcheckResu";
+ this.gvMx1fcheckResu.MinWidth = 50;
+ this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
+ this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
+ this.gvMx1fcheckResu.Visible = true;
+ this.gvMx1fcheckResu.VisibleIndex = 10;
+ this.gvMx1fcheckResu.Width = 94;
//
- // gvMx1company
+ // gvMx1fngRate
//
- this.gvMx1company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1company.AppearanceCell.Options.UseFont = true;
- this.gvMx1company.Caption = "company ";
- this.gvMx1company.FieldName = "company";
- this.gvMx1company.MinWidth = 50;
- this.gvMx1company.Name = "gvMx1company";
- this.gvMx1company.Tag = "query_a.company";
- this.gvMx1company.Visible = true;
- this.gvMx1company.VisibleIndex = 19;
- this.gvMx1company.Width = 94;
+ this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
+ this.gvMx1fngRate.FieldName = "fngRate";
+ this.gvMx1fngRate.MinWidth = 80;
+ this.gvMx1fngRate.Name = "gvMx1fngRate";
+ this.gvMx1fngRate.Tag = "query_a.fng_rate";
+ this.gvMx1fngRate.Visible = true;
+ this.gvMx1fngRate.VisibleIndex = 11;
+ this.gvMx1fngRate.Width = 94;
//
- // gvMx1factory
+ // gvMx1fngQty
//
- this.gvMx1factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1factory.AppearanceCell.Options.UseFont = true;
- this.gvMx1factory.Caption = "factory ";
- this.gvMx1factory.FieldName = "factory";
- this.gvMx1factory.MinWidth = 50;
- this.gvMx1factory.Name = "gvMx1factory";
- this.gvMx1factory.Tag = "query_a.factory";
- this.gvMx1factory.Visible = true;
- this.gvMx1factory.VisibleIndex = 20;
- this.gvMx1factory.Width = 94;
+ this.gvMx1fngQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
+ this.gvMx1fngQty.FieldName = "fngQty";
+ this.gvMx1fngQty.MinWidth = 50;
+ this.gvMx1fngQty.Name = "gvMx1fngQty";
+ this.gvMx1fngQty.Tag = "query_a.fng_qty";
+ this.gvMx1fngQty.Visible = true;
+ this.gvMx1fngQty.VisibleIndex = 12;
+ this.gvMx1fngQty.Width = 94;
//
- // gvMx1fcheckItemDesc
+ // gvMx1sampleSizeNo
//
- this.gvMx1fcheckItemDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩� ";
- this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 50;
- this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
- this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Visible = true;
- this.gvMx1fcheckItemDesc.VisibleIndex = 21;
- this.gvMx1fcheckItemDesc.Width = 94;
+ this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
+ this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
+ this.gvMx1sampleSizeNo.MinWidth = 150;
+ this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
+ this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
+ this.gvMx1sampleSizeNo.Visible = true;
+ this.gvMx1sampleSizeNo.VisibleIndex = 13;
+ this.gvMx1sampleSizeNo.Width = 150;
//
- // gvMx1procNo
+ // gvMx1fcheckLevel
//
- this.gvMx1procNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1procNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1procNo.Caption = "宸ュ簭鍙� ";
- this.gvMx1procNo.FieldName = "procNo";
- this.gvMx1procNo.MinWidth = 50;
- this.gvMx1procNo.Name = "gvMx1procNo";
- this.gvMx1procNo.Tag = "query_a.proc_no";
- this.gvMx1procNo.Visible = true;
- this.gvMx1procNo.VisibleIndex = 22;
- this.gvMx1procNo.Width = 94;
+ this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
+ this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+ this.gvMx1fcheckLevel.MinWidth = 200;
+ this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
+ this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
+ this.gvMx1fcheckLevel.Visible = true;
+ this.gvMx1fcheckLevel.VisibleIndex = 14;
+ this.gvMx1fcheckLevel.Width = 200;
//
- // gvMx1workshopCenterCode
+ // gvMx1facLevel
//
- this.gvMx1workshopCenterCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1workshopCenterCode.AppearanceCell.Options.UseFont = true;
- this.gvMx1workshopCenterCode.Caption = "宸ヤ綔涓績缂栫爜 ";
- this.gvMx1workshopCenterCode.FieldName = "workshopCenterCode";
- this.gvMx1workshopCenterCode.MinWidth = 50;
- this.gvMx1workshopCenterCode.Name = "gvMx1workshopCenterCode";
- this.gvMx1workshopCenterCode.Tag = "query_a.workshop_center_code";
- this.gvMx1workshopCenterCode.Visible = true;
- this.gvMx1workshopCenterCode.VisibleIndex = 23;
- this.gvMx1workshopCenterCode.Width = 94;
- //
- // gvMx1funit
- //
- this.gvMx1funit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1funit.AppearanceCell.Options.UseFont = true;
- this.gvMx1funit.Caption = "鍗曚綅 ";
- this.gvMx1funit.FieldName = "funit";
- this.gvMx1funit.MinWidth = 50;
- this.gvMx1funit.Name = "gvMx1funit";
- this.gvMx1funit.Tag = "query_a.funit";
- this.gvMx1funit.Visible = true;
- this.gvMx1funit.VisibleIndex = 24;
- this.gvMx1funit.Width = 94;
- //
- // gvMx1givenModify
- //
- this.gvMx1givenModify.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1givenModify.AppearanceCell.Options.UseFont = true;
- this.gvMx1givenModify.Caption = "鐗瑰畾淇敼 ";
- this.gvMx1givenModify.FieldName = "givenModify";
- this.gvMx1givenModify.MinWidth = 50;
- this.gvMx1givenModify.Name = "gvMx1givenModify";
- this.gvMx1givenModify.Tag = "query_a.given_modify";
- this.gvMx1givenModify.Visible = true;
- this.gvMx1givenModify.VisibleIndex = 25;
- this.gvMx1givenModify.Width = 94;
- //
- // gvMx1fcheckTool
- //
- this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
- this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏� ";
- this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 50;
- this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
- this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
- this.gvMx1fcheckTool.Visible = true;
- this.gvMx1fcheckTool.VisibleIndex = 26;
- this.gvMx1fcheckTool.Width = 94;
- //
- // gvMx1lastupdateBy
- //
- this.gvMx1lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gvMx1lastupdateBy.Caption = "鏇存柊浜� ";
- this.gvMx1lastupdateBy.FieldName = "lastupdateBy";
- this.gvMx1lastupdateBy.MinWidth = 50;
- this.gvMx1lastupdateBy.Name = "gvMx1lastupdateBy";
- this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gvMx1lastupdateBy.Visible = true;
- this.gvMx1lastupdateBy.VisibleIndex = 27;
- this.gvMx1lastupdateBy.Width = 94;
- //
- // gvMx1lastupdateDate
- //
- this.gvMx1lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1lastupdateDate.Caption = "鏇存柊鏃堕棿 ";
- this.gvMx1lastupdateDate.FieldName = "lastupdateDate";
- this.gvMx1lastupdateDate.MinWidth = 50;
- this.gvMx1lastupdateDate.Name = "gvMx1lastupdateDate";
- this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gvMx1lastupdateDate.Visible = true;
- this.gvMx1lastupdateDate.VisibleIndex = 28;
- this.gvMx1lastupdateDate.Width = 94;
- //
- // gvMx1remarks
- //
- this.gvMx1remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1remarks.AppearanceCell.Options.UseFont = true;
- this.gvMx1remarks.Caption = "涓嶅悎鏍兼弿杩� ";
- this.gvMx1remarks.FieldName = "remarks";
- this.gvMx1remarks.MinWidth = 50;
- this.gvMx1remarks.Name = "gvMx1remarks";
- this.gvMx1remarks.Tag = "query_a.remarks";
- this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 29;
- this.gvMx1remarks.Width = 94;
+ this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
+ this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
+ this.gvMx1facLevel.FieldName = "facLevel";
+ this.gvMx1facLevel.MinWidth = 200;
+ this.gvMx1facLevel.Name = "gvMx1facLevel";
+ this.gvMx1facLevel.Tag = "query_a.fac_level";
+ this.gvMx1facLevel.Visible = true;
+ this.gvMx1facLevel.VisibleIndex = 15;
+ this.gvMx1facLevel.Width = 200;
//
// groupControl1
//
@@ -726,32 +518,45 @@
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn3,
this.gridColumn2,
this.gridColumn1});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "椤圭洰";
+ this.gridColumn3.FieldName = "fcheckItem";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 192;
+ //
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
+ this.gridColumn2.FieldName = "fcheckResu";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 158;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
+ this.gridColumn1.FieldName = "fstand";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 2;
+ this.gridColumn1.Width = 958;
//
// panMsg
//
- this.panMsg.Controls.Add(this.textEdit1);
+ this.panMsg.Controls.Add(this.txtJianYan);
this.panMsg.Controls.Add(this.labelControl3);
this.panMsg.Controls.Add(this.labelControl2);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
@@ -760,14 +565,14 @@
this.panMsg.Size = new System.Drawing.Size(1340, 68);
this.panMsg.TabIndex = 1;
//
- // textEdit1
+ // txtJianYan
//
- this.textEdit1.Location = new System.Drawing.Point(556, 12);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
- this.textEdit1.Properties.Appearance.Options.UseFont = true;
- this.textEdit1.Size = new System.Drawing.Size(197, 34);
- this.textEdit1.TabIndex = 2;
+ this.txtJianYan.Location = new System.Drawing.Point(556, 12);
+ this.txtJianYan.Name = "txtJianYan";
+ this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 13F);
+ this.txtJianYan.Properties.Appearance.Options.UseFont = true;
+ this.txtJianYan.Size = new System.Drawing.Size(197, 34);
+ this.txtJianYan.TabIndex = 2;
//
// labelControl3
//
@@ -812,127 +617,57 @@
//
this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remarks.AppearanceCell.Options.UseFont = true;
- this.gv_remarks.Caption = "涓嶈壇鎻忚堪 ";
+ this.gv_remarks.Caption = "涓嶈壇鎻忚堪";
this.gv_remarks.FieldName = "remarks";
this.gv_remarks.MinWidth = 50;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 63;
+ this.gv_remarks.VisibleIndex = 34;
this.gv_remarks.Width = 94;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "鐗╂枡ID ";
+ this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
this.gv_itemId.MinWidth = 50;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 62;
+ this.gv_itemId.VisibleIndex = 5;
this.gv_itemId.Width = 94;
- //
- // gv_qualityAudit
- //
- this.gv_qualityAudit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_qualityAudit.AppearanceCell.Options.UseFont = true;
- this.gv_qualityAudit.Caption = "璐ㄩ噺瀹℃牳鏍囪瘑 ";
- this.gv_qualityAudit.FieldName = "qualityAudit";
- this.gv_qualityAudit.MinWidth = 50;
- this.gv_qualityAudit.Name = "gv_qualityAudit";
- this.gv_qualityAudit.OptionsColumn.AllowEdit = false;
- this.gv_qualityAudit.Tag = "query_a.quality_audit";
- this.gv_qualityAudit.Visible = true;
- this.gv_qualityAudit.VisibleIndex = 61;
- this.gv_qualityAudit.Width = 94;
- //
- // gv_lineK3id
- //
- this.gv_lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lineK3id.AppearanceCell.Options.UseFont = true;
- this.gv_lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
- this.gv_lineK3id.FieldName = "lineK3id";
- this.gv_lineK3id.MinWidth = 50;
- this.gv_lineK3id.Name = "gv_lineK3id";
- this.gv_lineK3id.OptionsColumn.AllowEdit = false;
- this.gv_lineK3id.Tag = "query_a.line_k3id";
- this.gv_lineK3id.Visible = true;
- this.gv_lineK3id.VisibleIndex = 60;
- this.gv_lineK3id.Width = 94;
- //
- // gv_ebelnK3id
- //
- this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
- this.gv_ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
- this.gv_ebelnK3id.FieldName = "ebelnK3id";
- this.gv_ebelnK3id.MinWidth = 50;
- this.gv_ebelnK3id.Name = "gv_ebelnK3id";
- this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
- this.gv_ebelnK3id.Tag = "query_a.ebeln_k3id";
- this.gv_ebelnK3id.Visible = true;
- this.gv_ebelnK3id.VisibleIndex = 59;
- this.gv_ebelnK3id.Width = 94;
//
// gv_iqcDate
//
this.gv_iqcDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
- this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿 ";
+ this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
this.gv_iqcDate.FieldName = "iqcDate";
this.gv_iqcDate.MinWidth = 50;
this.gv_iqcDate.Name = "gv_iqcDate";
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 58;
+ this.gv_iqcDate.VisibleIndex = 33;
this.gv_iqcDate.Width = 94;
//
// gv_states
//
this.gv_states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_states.AppearanceCell.Options.UseFont = true;
- this.gv_states.Caption = "鐘舵�� ";
+ this.gv_states.Caption = "鐘舵��";
this.gv_states.FieldName = "states";
this.gv_states.MinWidth = 50;
this.gv_states.Name = "gv_states";
this.gv_states.OptionsColumn.AllowEdit = false;
this.gv_states.Tag = "query_a.states";
this.gv_states.Visible = true;
- this.gv_states.VisibleIndex = 57;
+ this.gv_states.VisibleIndex = 32;
this.gv_states.Width = 94;
- //
- // gv_msg
- //
- this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_msg.AppearanceCell.Options.UseFont = true;
- this.gv_msg.Caption = "erp杩斿洖淇℃伅 ";
- this.gv_msg.FieldName = "msg";
- this.gv_msg.MinWidth = 50;
- this.gv_msg.Name = "gv_msg";
- this.gv_msg.OptionsColumn.AllowEdit = false;
- this.gv_msg.Tag = "query_a.msg";
- this.gv_msg.Visible = true;
- this.gv_msg.VisibleIndex = 56;
- this.gv_msg.Width = 94;
- //
- // gv_fmrmode
- //
- this.gv_fmrmode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
- this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
- this.gv_fmrmode.FieldName = "fmrmode";
- this.gv_fmrmode.MinWidth = 50;
- this.gv_fmrmode.Name = "gv_fmrmode";
- this.gv_fmrmode.OptionsColumn.AllowEdit = false;
- this.gv_fmrmode.Tag = "query_a.fmrmode";
- this.gv_fmrmode.Visible = true;
- this.gv_fmrmode.VisibleIndex = 55;
- this.gv_fmrmode.Width = 94;
//
// lb_lifnr
//
@@ -957,98 +692,70 @@
//
this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lifnr.AppearanceCell.Options.UseFont = true;
- this.gv_lifnr.Caption = "渚涘簲鍟� ";
+ this.gv_lifnr.Caption = "渚涘簲鍟�";
this.gv_lifnr.FieldName = "lifnr";
- this.gv_lifnr.MinWidth = 50;
+ this.gv_lifnr.MinWidth = 100;
this.gv_lifnr.Name = "gv_lifnr";
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 54;
- this.gv_lifnr.Width = 94;
+ this.gv_lifnr.VisibleIndex = 4;
+ this.gv_lifnr.Width = 100;
//
// gv_dhb001
//
this.gv_dhb001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_dhb001.AppearanceCell.Options.UseFont = true;
- this.gv_dhb001.Caption = "鍒拌揣鍗曞彿 ";
+ this.gv_dhb001.Caption = "鍒拌揣鍗曞彿";
this.gv_dhb001.FieldName = "dhb001";
this.gv_dhb001.MinWidth = 50;
this.gv_dhb001.Name = "gv_dhb001";
this.gv_dhb001.OptionsColumn.AllowEdit = false;
this.gv_dhb001.Tag = "query_a.dhb001";
this.gv_dhb001.Visible = true;
- this.gv_dhb001.VisibleIndex = 53;
+ this.gv_dhb001.VisibleIndex = 31;
this.gv_dhb001.Width = 94;
- //
- // gv_dhb002
- //
- this.gv_dhb002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_dhb002.AppearanceCell.Options.UseFont = true;
- this.gv_dhb002.Caption = "琛屽彿 ";
- this.gv_dhb002.FieldName = "dhb002";
- this.gv_dhb002.MinWidth = 50;
- this.gv_dhb002.Name = "gv_dhb002";
- this.gv_dhb002.OptionsColumn.AllowEdit = false;
- this.gv_dhb002.Tag = "query_a.dhb002";
- this.gv_dhb002.Visible = true;
- this.gv_dhb002.VisibleIndex = 52;
- this.gv_dhb002.Width = 94;
//
// gv_dha018
//
this.gv_dha018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_dha018.AppearanceCell.Options.UseFont = true;
- this.gv_dha018.Caption = "鍒拌揣鏃堕棿 ";
+ this.gv_dha018.Caption = "鍒拌揣鏃堕棿";
this.gv_dha018.FieldName = "dha018";
this.gv_dha018.MinWidth = 50;
this.gv_dha018.Name = "gv_dha018";
this.gv_dha018.OptionsColumn.AllowEdit = false;
this.gv_dha018.Tag = "query_a.dha018";
this.gv_dha018.Visible = true;
- this.gv_dha018.VisibleIndex = 51;
+ this.gv_dha018.VisibleIndex = 30;
this.gv_dha018.Width = 94;
- //
- // gv_workNo
- //
- this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workNo.AppearanceCell.Options.UseFont = true;
- this.gv_workNo.Caption = "浠诲姟鍗曞彿 ";
- this.gv_workNo.FieldName = "workNo";
- this.gv_workNo.MinWidth = 50;
- this.gv_workNo.Name = "gv_workNo";
- this.gv_workNo.OptionsColumn.AllowEdit = false;
- this.gv_workNo.Tag = "query_a.work_no";
- this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 50;
- this.gv_workNo.Width = 94;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
- this.gv_boardStyle.Caption = "浜у搧鍨嬪彿 ";
+ this.gv_boardStyle.Caption = "浜у搧鍨嬪彿";
this.gv_boardStyle.FieldName = "boardStyle";
- this.gv_boardStyle.MinWidth = 50;
+ this.gv_boardStyle.MinWidth = 100;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 49;
- this.gv_boardStyle.Width = 94;
+ this.gv_boardStyle.VisibleIndex = 28;
+ this.gv_boardStyle.Width = 100;
//
// gv_lotNo2
//
this.gv_lotNo2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lotNo2.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo2.Caption = "閲囪喘鍗曞彿 ";
+ this.gv_lotNo2.Caption = "閲囪喘鍗曞彿";
this.gv_lotNo2.FieldName = "lotNo2";
this.gv_lotNo2.MinWidth = 50;
this.gv_lotNo2.Name = "gv_lotNo2";
this.gv_lotNo2.OptionsColumn.AllowEdit = false;
this.gv_lotNo2.Tag = "query_a.lot_no2";
this.gv_lotNo2.Visible = true;
- this.gv_lotNo2.VisibleIndex = 48;
+ this.gv_lotNo2.VisibleIndex = 29;
this.gv_lotNo2.Width = 94;
//
// lb_lotNo1
@@ -1074,141 +781,43 @@
//
this.gv_lotNo1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lotNo1.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo1.Caption = "灏忔壒娆″彿 ";
+ this.gv_lotNo1.Caption = "灏忔壒娆″彿";
this.gv_lotNo1.FieldName = "lotNo1";
this.gv_lotNo1.MinWidth = 50;
this.gv_lotNo1.Name = "gv_lotNo1";
this.gv_lotNo1.OptionsColumn.AllowEdit = false;
this.gv_lotNo1.Tag = "query_a.lot_no1";
this.gv_lotNo1.Visible = true;
- this.gv_lotNo1.VisibleIndex = 47;
+ this.gv_lotNo1.VisibleIndex = 27;
this.gv_lotNo1.Width = 94;
- //
- // gv_modify1Date1
- //
- this.gv_modify1Date1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1Date1.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Date1.Caption = "鐗瑰畾淇敼瀹℃牳鏃堕棿 ";
- this.gv_modify1Date1.FieldName = "modify1Date1";
- this.gv_modify1Date1.MinWidth = 50;
- this.gv_modify1Date1.Name = "gv_modify1Date1";
- this.gv_modify1Date1.OptionsColumn.AllowEdit = false;
- this.gv_modify1Date1.Tag = "query_a.modify1_date1";
- this.gv_modify1Date1.Visible = true;
- this.gv_modify1Date1.VisibleIndex = 46;
- this.gv_modify1Date1.Width = 94;
- //
- // gv_modify1By1
- //
- this.gv_modify1By1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1By1.AppearanceCell.Options.UseFont = true;
- this.gv_modify1By1.Caption = "鐗瑰畾淇敼瀹℃牳浜� ";
- this.gv_modify1By1.FieldName = "modify1By1";
- this.gv_modify1By1.MinWidth = 50;
- this.gv_modify1By1.Name = "gv_modify1By1";
- this.gv_modify1By1.OptionsColumn.AllowEdit = false;
- this.gv_modify1By1.Tag = "query_a.modify1_by1";
- this.gv_modify1By1.Visible = true;
- this.gv_modify1By1.VisibleIndex = 45;
- this.gv_modify1By1.Width = 94;
- //
- // gv_modify1Flag1
- //
- this.gv_modify1Flag1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1Flag1.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Flag1.Caption = "鐗瑰畾淇敼鏄惁瀹℃牳 ";
- this.gv_modify1Flag1.FieldName = "modify1Flag1";
- this.gv_modify1Flag1.MinWidth = 50;
- this.gv_modify1Flag1.Name = "gv_modify1Flag1";
- this.gv_modify1Flag1.OptionsColumn.AllowEdit = false;
- this.gv_modify1Flag1.Tag = "query_a.modify1_flag1";
- this.gv_modify1Flag1.Visible = true;
- this.gv_modify1Flag1.VisibleIndex = 44;
- this.gv_modify1Flag1.Width = 94;
- //
- // gv_maxCheckQty
- //
- this.gv_maxCheckQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_maxCheckQty.AppearanceCell.Options.UseFont = true;
- this.gv_maxCheckQty.Caption = "鏈�澶ф娊妫�鏁� ";
- this.gv_maxCheckQty.FieldName = "maxCheckQty";
- this.gv_maxCheckQty.MinWidth = 50;
- this.gv_maxCheckQty.Name = "gv_maxCheckQty";
- this.gv_maxCheckQty.OptionsColumn.AllowEdit = false;
- this.gv_maxCheckQty.Tag = "query_a.max_check_qty";
- this.gv_maxCheckQty.Visible = true;
- this.gv_maxCheckQty.VisibleIndex = 43;
- this.gv_maxCheckQty.Width = 94;
- //
- // gv_fsecondResu
- //
- this.gv_fsecondResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fsecondResu.AppearanceCell.Options.UseFont = true;
- this.gv_fsecondResu.Caption = "fsecond_resu ";
- this.gv_fsecondResu.FieldName = "fsecondResu";
- this.gv_fsecondResu.MinWidth = 50;
- this.gv_fsecondResu.Name = "gv_fsecondResu";
- this.gv_fsecondResu.OptionsColumn.AllowEdit = false;
- this.gv_fsecondResu.Tag = "query_a.fsecond_resu";
- this.gv_fsecondResu.Visible = true;
- this.gv_fsecondResu.VisibleIndex = 42;
- this.gv_fsecondResu.Width = 94;
- //
- // gv_company
- //
- this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_company.AppearanceCell.Options.UseFont = true;
- this.gv_company.Caption = "company ";
- this.gv_company.FieldName = "company";
- this.gv_company.MinWidth = 50;
- this.gv_company.Name = "gv_company";
- this.gv_company.OptionsColumn.AllowEdit = false;
- this.gv_company.Tag = "query_a.company";
- this.gv_company.Visible = true;
- this.gv_company.VisibleIndex = 41;
- this.gv_company.Width = 94;
//
// gv_fversion
//
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fversion.AppearanceCell.Options.UseFont = true;
- this.gv_fversion.Caption = "鐗堟湰 ";
+ this.gv_fversion.Caption = "鐗堟湰";
this.gv_fversion.FieldName = "fversion";
this.gv_fversion.MinWidth = 50;
this.gv_fversion.Name = "gv_fversion";
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.fversion";
this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 40;
+ this.gv_fversion.VisibleIndex = 26;
this.gv_fversion.Width = 94;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
- this.gv_fcovertQty.Caption = "杞崲鏁伴噺 ";
+ this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
this.gv_fcovertQty.MinWidth = 50;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 39;
+ this.gv_fcovertQty.VisibleIndex = 25;
this.gv_fcovertQty.Width = 94;
- //
- // gv_fmanageNo
- //
- this.gv_fmanageNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmanageNo.AppearanceCell.Options.UseFont = true;
- this.gv_fmanageNo.Caption = "绠＄悊缂栧彿 ";
- this.gv_fmanageNo.FieldName = "fmanageNo";
- this.gv_fmanageNo.MinWidth = 50;
- this.gv_fmanageNo.Name = "gv_fmanageNo";
- this.gv_fmanageNo.OptionsColumn.AllowEdit = false;
- this.gv_fmanageNo.Tag = "query_a.fmanage_no";
- this.gv_fmanageNo.Visible = true;
- this.gv_fmanageNo.VisibleIndex = 38;
- this.gv_fmanageNo.Width = 94;
//
// lb_fngHandle
//
@@ -1233,309 +842,169 @@
//
this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
- this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶 ";
+ this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
this.gv_fngHandle.FieldName = "fngHandle";
this.gv_fngHandle.MinWidth = 50;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 37;
+ this.gv_fngHandle.VisibleIndex = 24;
this.gv_fngHandle.Width = 94;
- //
- // gv_fgearStand
- //
- this.gv_fgearStand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fgearStand.AppearanceCell.Options.UseFont = true;
- this.gv_fgearStand.Caption = "妗ｄ綅鏍囧噯 ";
- this.gv_fgearStand.FieldName = "fgearStand";
- this.gv_fgearStand.MinWidth = 50;
- this.gv_fgearStand.Name = "gv_fgearStand";
- this.gv_fgearStand.OptionsColumn.AllowEdit = false;
- this.gv_fgearStand.Tag = "query_a.fgear_stand";
- this.gv_fgearStand.Visible = true;
- this.gv_fgearStand.VisibleIndex = 36;
- this.gv_fgearStand.Width = 94;
//
// gv_fexemption
//
this.gv_fexemption.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fexemption.AppearanceCell.Options.UseFont = true;
- this.gv_fexemption.Caption = "鏄惁鍏嶆 ";
+ this.gv_fexemption.Caption = "鏄惁鍏嶆";
this.gv_fexemption.FieldName = "fexemption";
this.gv_fexemption.MinWidth = 50;
this.gv_fexemption.Name = "gv_fexemption";
this.gv_fexemption.OptionsColumn.AllowEdit = false;
this.gv_fexemption.Tag = "query_a.fexemption";
this.gv_fexemption.Visible = true;
- this.gv_fexemption.VisibleIndex = 35;
+ this.gv_fexemption.VisibleIndex = 23;
this.gv_fexemption.Width = 94;
- //
- // gv_outDate
- //
- this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_outDate.AppearanceCell.Options.UseFont = true;
- this.gv_outDate.Caption = "鍑鸿揣鏃ユ湡 ";
- this.gv_outDate.FieldName = "outDate";
- this.gv_outDate.MinWidth = 50;
- this.gv_outDate.Name = "gv_outDate";
- this.gv_outDate.OptionsColumn.AllowEdit = false;
- this.gv_outDate.Tag = "query_a.out_date";
- this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 34;
- this.gv_outDate.Width = 94;
//
// gv_itemUnit
//
this.gv_itemUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
- this.gv_itemUnit.Caption = "鍗曚綅 ";
+ this.gv_itemUnit.Caption = "鍗曚綅";
this.gv_itemUnit.FieldName = "itemUnit";
this.gv_itemUnit.MinWidth = 50;
this.gv_itemUnit.Name = "gv_itemUnit";
this.gv_itemUnit.OptionsColumn.AllowEdit = false;
this.gv_itemUnit.Tag = "query_a.item_unit";
this.gv_itemUnit.Visible = true;
- this.gv_itemUnit.VisibleIndex = 33;
+ this.gv_itemUnit.VisibleIndex = 22;
this.gv_itemUnit.Width = 94;
//
// gv_ftype
//
this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftype.AppearanceCell.Options.UseFont = true;
- this.gv_ftype.Caption = "绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱) ";
+ this.gv_ftype.Caption = "绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)";
this.gv_ftype.FieldName = "ftype";
this.gv_ftype.MinWidth = 50;
this.gv_ftype.Name = "gv_ftype";
this.gv_ftype.OptionsColumn.AllowEdit = false;
this.gv_ftype.Tag = "query_a.ftype";
this.gv_ftype.Visible = true;
- this.gv_ftype.VisibleIndex = 32;
+ this.gv_ftype.VisibleIndex = 21;
this.gv_ftype.Width = 94;
- //
- // gv_fcheckAccord
- //
- this.gv_fcheckAccord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckAccord.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckAccord.Caption = "妫�楠屼緷鎹� ";
- this.gv_fcheckAccord.FieldName = "fcheckAccord";
- this.gv_fcheckAccord.MinWidth = 50;
- this.gv_fcheckAccord.Name = "gv_fcheckAccord";
- this.gv_fcheckAccord.OptionsColumn.AllowEdit = false;
- this.gv_fcheckAccord.Tag = "query_a.fcheck_accord";
- this.gv_fcheckAccord.Visible = true;
- this.gv_fcheckAccord.VisibleIndex = 31;
- this.gv_fcheckAccord.Width = 94;
//
// gv_fsubmit
//
this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
- this.gv_fsubmit.Caption = "鎻愪氦鏍囪瘑 ";
+ this.gv_fsubmit.Caption = "鎻愪氦鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmit";
this.gv_fsubmit.MinWidth = 50;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.Visible = true;
- this.gv_fsubmit.VisibleIndex = 30;
+ this.gv_fsubmit.VisibleIndex = 1;
this.gv_fsubmit.Width = 94;
//
// gv_fcancel
//
this.gv_fcancel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcancel.AppearanceCell.Options.UseFont = true;
- this.gv_fcancel.Caption = "鏄惁浣滃簾 ";
+ this.gv_fcancel.Caption = "鏄惁浣滃簾";
this.gv_fcancel.FieldName = "fcancel";
this.gv_fcancel.MinWidth = 50;
this.gv_fcancel.Name = "gv_fcancel";
this.gv_fcancel.OptionsColumn.AllowEdit = false;
this.gv_fcancel.Tag = "query_a.fcancel";
this.gv_fcancel.Visible = true;
- this.gv_fcancel.VisibleIndex = 29;
+ this.gv_fcancel.VisibleIndex = 20;
this.gv_fcancel.Width = 94;
- //
- // gv_fthirdRep
- //
- this.gv_fthirdRep.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fthirdRep.AppearanceCell.Options.UseFont = true;
- this.gv_fthirdRep.Caption = "绗笁鏂规姤鍛� ";
- this.gv_fthirdRep.FieldName = "fthirdRep";
- this.gv_fthirdRep.MinWidth = 50;
- this.gv_fthirdRep.Name = "gv_fthirdRep";
- this.gv_fthirdRep.OptionsColumn.AllowEdit = false;
- this.gv_fthirdRep.Tag = "query_a.fthird_rep";
- this.gv_fthirdRep.Visible = true;
- this.gv_fthirdRep.VisibleIndex = 28;
- this.gv_fthirdRep.Width = 94;
- //
- // gv_fcheckRepno
- //
- this.gv_fcheckRepno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcheckRepno.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckRepno.Caption = "XRF娴嬭瘯鎶ュ憡缂栧彿 ";
- this.gv_fcheckRepno.FieldName = "fcheckRepno";
- this.gv_fcheckRepno.MinWidth = 50;
- this.gv_fcheckRepno.Name = "gv_fcheckRepno";
- this.gv_fcheckRepno.OptionsColumn.AllowEdit = false;
- this.gv_fcheckRepno.Tag = "query_a.fcheck_repno";
- this.gv_fcheckRepno.Visible = true;
- this.gv_fcheckRepno.VisibleIndex = 27;
- this.gv_fcheckRepno.Width = 94;
- //
- // gv_factory
- //
- this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_factory.AppearanceCell.Options.UseFont = true;
- this.gv_factory.Caption = "factory ";
- this.gv_factory.FieldName = "factory";
- this.gv_factory.MinWidth = 50;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.Tag = "query_a.factory";
- this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 26;
- this.gv_factory.Width = 94;
- //
- // gv_modify1Date
- //
- this.gv_modify1Date.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1Date.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Date.Caption = "modify1_date ";
- this.gv_modify1Date.FieldName = "modify1Date";
- this.gv_modify1Date.MinWidth = 50;
- this.gv_modify1Date.Name = "gv_modify1Date";
- this.gv_modify1Date.OptionsColumn.AllowEdit = false;
- this.gv_modify1Date.Tag = "query_a.modify1_date";
- this.gv_modify1Date.Visible = true;
- this.gv_modify1Date.VisibleIndex = 25;
- this.gv_modify1Date.Width = 94;
- //
- // gv_modify1By
- //
- this.gv_modify1By.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_modify1By.AppearanceCell.Options.UseFont = true;
- this.gv_modify1By.Caption = "modify1_by ";
- this.gv_modify1By.FieldName = "modify1By";
- this.gv_modify1By.MinWidth = 50;
- this.gv_modify1By.Name = "gv_modify1By";
- this.gv_modify1By.OptionsColumn.AllowEdit = false;
- this.gv_modify1By.Tag = "query_a.modify1_by";
- this.gv_modify1By.Visible = true;
- this.gv_modify1By.VisibleIndex = 24;
- this.gv_modify1By.Width = 94;
//
// gv_modify1Flag
//
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_modify1Flag.AppearanceCell.Options.UseFont = true;
- this.gv_modify1Flag.Caption = "鏄惁瀹℃牳 ";
+ this.gv_modify1Flag.Caption = "鏄惁瀹℃牳";
this.gv_modify1Flag.FieldName = "modify1Flag";
- this.gv_modify1Flag.MinWidth = 50;
+ this.gv_modify1Flag.MinWidth = 100;
this.gv_modify1Flag.Name = "gv_modify1Flag";
this.gv_modify1Flag.OptionsColumn.AllowEdit = false;
this.gv_modify1Flag.Tag = "query_a.modify1_flag";
this.gv_modify1Flag.Visible = true;
- this.gv_modify1Flag.VisibleIndex = 23;
- this.gv_modify1Flag.Width = 94;
+ this.gv_modify1Flag.VisibleIndex = 2;
+ this.gv_modify1Flag.Width = 100;
//
// 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.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 = 22;
+ this.gv_lastupdateDate.VisibleIndex = 19;
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.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 = 21;
+ this.gv_lastupdateBy.VisibleIndex = 18;
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.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 = 20;
+ this.gv_createDate.VisibleIndex = 17;
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.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 = 19;
+ this.gv_createBy.VisibleIndex = 16;
this.gv_createBy.Width = 94;
- //
- // gv_fhandle
- //
- this.gv_fhandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fhandle.AppearanceCell.Options.UseFont = true;
- this.gv_fhandle.Caption = "鏄惁澶勭悊 ";
- this.gv_fhandle.FieldName = "fhandle";
- this.gv_fhandle.MinWidth = 50;
- this.gv_fhandle.Name = "gv_fhandle";
- this.gv_fhandle.OptionsColumn.AllowEdit = false;
- this.gv_fhandle.Tag = "query_a.fhandle";
- this.gv_fhandle.Visible = true;
- this.gv_fhandle.VisibleIndex = 18;
- this.gv_fhandle.Width = 94;
- //
- // gv_fmove
- //
- this.gv_fmove.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmove.AppearanceCell.Options.UseFont = true;
- this.gv_fmove.Caption = "鏄惁鎺ㄩ�� ";
- this.gv_fmove.FieldName = "fmove";
- this.gv_fmove.MinWidth = 50;
- this.gv_fmove.Name = "gv_fmove";
- this.gv_fmove.OptionsColumn.AllowEdit = false;
- this.gv_fmove.Tag = "query_a.fmove";
- this.gv_fmove.Visible = true;
- this.gv_fmove.VisibleIndex = 17;
- this.gv_fmove.Width = 94;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo.Caption = "鎵规鍙� --鍒拌揣鍗曞彿 ";
+ this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 50;
+ this.gv_lotNo.MinWidth = 120;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 16;
- this.gv_lotNo.Width = 94;
+ this.gv_lotNo.VisibleIndex = 3;
+ this.gv_lotNo.Width = 120;
//
// lb_checkQty
//
@@ -1560,7 +1029,7 @@
//
this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_checkQty.AppearanceCell.Options.UseFont = true;
- this.gv_checkQty.Caption = "鎶芥鏁伴噺 ";
+ this.gv_checkQty.Caption = "鎶芥鏁伴噺";
this.gv_checkQty.FieldName = "checkQty";
this.gv_checkQty.MinWidth = 50;
this.gv_checkQty.Name = "gv_checkQty";
@@ -1574,57 +1043,43 @@
//
this.gv_facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_facLevel.AppearanceCell.Options.UseFont = true;
- this.gv_facLevel.Caption = "鎷掓敹姘村钩 ";
+ this.gv_facLevel.Caption = "鎷掓敹姘村钩";
this.gv_facLevel.FieldName = "facLevel";
- this.gv_facLevel.MinWidth = 50;
+ this.gv_facLevel.MinWidth = 100;
this.gv_facLevel.Name = "gv_facLevel";
this.gv_facLevel.OptionsColumn.AllowEdit = false;
this.gv_facLevel.Tag = "query_a.fac_level";
this.gv_facLevel.Visible = true;
this.gv_facLevel.VisibleIndex = 14;
- this.gv_facLevel.Width = 94;
+ this.gv_facLevel.Width = 100;
//
// gv_fcheckLevel
//
this.gv_fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcheckLevel.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckLevel.Caption = "妫�楠屾按骞� ";
+ this.gv_fcheckLevel.Caption = "妫�楠屾按骞�";
this.gv_fcheckLevel.FieldName = "fcheckLevel";
- this.gv_fcheckLevel.MinWidth = 50;
+ this.gv_fcheckLevel.MinWidth = 100;
this.gv_fcheckLevel.Name = "gv_fcheckLevel";
this.gv_fcheckLevel.OptionsColumn.AllowEdit = false;
this.gv_fcheckLevel.Tag = "query_a.fcheck_level";
this.gv_fcheckLevel.Visible = true;
this.gv_fcheckLevel.VisibleIndex = 13;
- this.gv_fcheckLevel.Width = 94;
+ this.gv_fcheckLevel.Width = 100;
//
// gv_sampleSizeNo
//
this.gv_sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_sampleSizeNo.AppearanceCell.Options.UseFont = true;
- this.gv_sampleSizeNo.Caption = "妫�楠屾按鍑� ";
+ this.gv_sampleSizeNo.Caption = "妫�楠屾按鍑�";
this.gv_sampleSizeNo.FieldName = "sampleSizeNo";
- this.gv_sampleSizeNo.MinWidth = 50;
+ this.gv_sampleSizeNo.MinWidth = 100;
this.gv_sampleSizeNo.Name = "gv_sampleSizeNo";
this.gv_sampleSizeNo.OptionsColumn.AllowEdit = false;
this.gv_sampleSizeNo.Tag = "query_a.sample_size_no";
this.gv_sampleSizeNo.Visible = true;
this.gv_sampleSizeNo.VisibleIndex = 12;
- this.gv_sampleSizeNo.Width = 94;
- //
- // gv_freview
- //
- this.gv_freview.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_freview.AppearanceCell.Options.UseFont = true;
- this.gv_freview.Caption = "freview ";
- this.gv_freview.FieldName = "freview";
- this.gv_freview.MinWidth = 50;
- this.gv_freview.Name = "gv_freview";
- this.gv_freview.OptionsColumn.AllowEdit = false;
- this.gv_freview.Tag = "query_a.freview";
- this.gv_freview.Visible = true;
- this.gv_freview.VisibleIndex = 11;
- this.gv_freview.Width = 94;
+ this.gv_sampleSizeNo.Width = 100;
//
// lb_fcheckResu
//
@@ -1649,43 +1104,15 @@
//
this.gv_fcheckResu.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋� ";
+ this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 50;
+ this.gv_fcheckResu.MinWidth = 100;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 10;
- this.gv_fcheckResu.Width = 94;
- //
- // gv_fngDesc
- //
- this.gv_fngDesc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fngDesc.AppearanceCell.Options.UseFont = true;
- this.gv_fngDesc.Caption = "fng_desc ";
- this.gv_fngDesc.FieldName = "fngDesc";
- this.gv_fngDesc.MinWidth = 50;
- this.gv_fngDesc.Name = "gv_fngDesc";
- this.gv_fngDesc.OptionsColumn.AllowEdit = false;
- this.gv_fngDesc.Tag = "query_a.fng_desc";
- this.gv_fngDesc.Visible = true;
- this.gv_fngDesc.VisibleIndex = 9;
- this.gv_fngDesc.Width = 94;
- //
- // gv_suppNo
- //
- this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_suppNo.AppearanceCell.Options.UseFont = true;
- this.gv_suppNo.Caption = "supp_no ";
- this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
- this.gv_suppNo.Name = "gv_suppNo";
- this.gv_suppNo.OptionsColumn.AllowEdit = false;
- this.gv_suppNo.Tag = "query_a.supp_no";
- this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 8;
- this.gv_suppNo.Width = 94;
+ this.gv_fcheckResu.VisibleIndex = 11;
+ this.gv_fcheckResu.Width = 100;
//
// lb_freceQty
//
@@ -1710,14 +1137,14 @@
//
this.gv_freceQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_freceQty.AppearanceCell.Options.UseFont = true;
- this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉 ";
+ this.gv_freceQty.Caption = "鍒ゅ畾缁撴灉";
this.gv_freceQty.FieldName = "freceQty";
this.gv_freceQty.MinWidth = 50;
this.gv_freceQty.Name = "gv_freceQty";
this.gv_freceQty.OptionsColumn.AllowEdit = false;
this.gv_freceQty.Tag = "query_a.frece_qty";
this.gv_freceQty.Visible = true;
- this.gv_freceQty.VisibleIndex = 7;
+ this.gv_freceQty.VisibleIndex = 10;
this.gv_freceQty.Width = 94;
//
// lb_fbatchQty
@@ -1743,29 +1170,29 @@
//
this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "鏉ユ枡鏁伴噺 ";
+ this.gv_fbatchQty.Caption = "鏉ユ枡鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 50;
+ this.gv_fbatchQty.MinWidth = 100;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 6;
- this.gv_fbatchQty.Width = 94;
+ this.gv_fbatchQty.VisibleIndex = 9;
+ this.gv_fbatchQty.Width = 100;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemNo.Caption = "鐗╂枡缂栫爜 ";
+ this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.MinWidth = 100;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 5;
- this.gv_itemNo.Width = 94;
+ this.gv_itemNo.VisibleIndex = 6;
+ this.gv_itemNo.Width = 100;
//
// lb_fcheckBy
//
@@ -1790,15 +1217,15 @@
//
this.gv_fcheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckBy.Caption = "妫�楠屼汉鍛� ";
+ this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckBy";
- this.gv_fcheckBy.MinWidth = 50;
+ this.gv_fcheckBy.MinWidth = 100;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 4;
- this.gv_fcheckBy.Width = 94;
+ this.gv_fcheckBy.VisibleIndex = 8;
+ this.gv_fcheckBy.Width = 100;
//
// lb_fcheckDate
//
@@ -1823,15 +1250,15 @@
//
this.gv_fcheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckDate.Caption = "妫�楠屾棩鏈� ";
+ this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 50;
+ this.gv_fcheckDate.MinWidth = 100;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 3;
- this.gv_fcheckDate.Width = 94;
+ this.gv_fcheckDate.VisibleIndex = 7;
+ this.gv_fcheckDate.Width = 100;
//
// lb_releaseNo
//
@@ -1856,43 +1283,15 @@
//
this.gv_releaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
- this.gv_releaseNo.Caption = "妫�楠屽崟鍙� ";
+ this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 50;
+ this.gv_releaseNo.MinWidth = 120;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 2;
- this.gv_releaseNo.Width = 94;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "id ";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 94;
- //
- // gv_guid
- //
- this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_guid.AppearanceCell.Options.UseFont = true;
- this.gv_guid.Caption = "guid ";
- this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
- this.gv_guid.Name = "gv_guid";
- this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Visible = true;
- this.gv_guid.VisibleIndex = 0;
- this.gv_guid.Width = 94;
+ this.gv_releaseNo.VisibleIndex = 0;
+ this.gv_releaseNo.Width = 120;
//
// toolBarMenu1
//
@@ -1925,69 +1324,40 @@
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_guid,
- this.gv_id,
this.gv_releaseNo,
+ this.gv_fsubmit,
+ this.gv_modify1Flag,
+ this.gv_lotNo,
+ this.gv_lifnr,
+ this.gv_itemId,
+ this.gv_itemNo,
+ this.gv_boardStyle,
+ this.gv_fcheckResu,
this.gv_fcheckDate,
this.gv_fcheckBy,
- this.gv_itemNo,
this.gv_fbatchQty,
+ this.gv_ftype,
this.gv_freceQty,
- this.gv_suppNo,
- this.gv_fngDesc,
- this.gv_fcheckResu,
- this.gv_freview,
this.gv_sampleSizeNo,
this.gv_fcheckLevel,
this.gv_facLevel,
this.gv_checkQty,
- this.gv_lotNo,
- this.gv_fmove,
- this.gv_fhandle,
this.gv_createBy,
this.gv_createDate,
this.gv_lastupdateBy,
this.gv_lastupdateDate,
- this.gv_modify1Flag,
- this.gv_modify1By,
- this.gv_modify1Date,
- this.gv_factory,
- this.gv_fcheckRepno,
- this.gv_fthirdRep,
this.gv_fcancel,
- this.gv_fsubmit,
- this.gv_fcheckAccord,
- this.gv_ftype,
this.gv_itemUnit,
- this.gv_outDate,
this.gv_fexemption,
- this.gv_fgearStand,
this.gv_fngHandle,
- this.gv_fmanageNo,
this.gv_fcovertQty,
this.gv_fversion,
- this.gv_company,
- this.gv_fsecondResu,
- this.gv_maxCheckQty,
- this.gv_modify1Flag1,
- this.gv_modify1By1,
- this.gv_modify1Date1,
this.gv_lotNo1,
this.gv_lotNo2,
- this.gv_boardStyle,
- this.gv_workNo,
this.gv_dha018,
- this.gv_dhb002,
this.gv_dhb001,
- this.gv_lifnr,
- this.gv_fmrmode,
- this.gv_msg,
this.gv_states,
this.gv_iqcDate,
- this.gv_ebelnK3id,
- this.gv_lineK3id,
- this.gv_qualityAudit,
- this.gv_itemId,
this.gv_remarks});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
@@ -2215,6 +1585,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
@@ -2223,6 +1594,7 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// lb_fsubmit
//
@@ -2305,7 +1677,7 @@
((System.ComponentModel.ISupportInitialize)(this.panMsg)).EndInit();
this.panMsg.ResumeLayout(false);
this.panMsg.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
@@ -2356,60 +1728,36 @@
private DevExpress.XtraEditors.TextEdit txt_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qualityAudit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lineK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
private DevExpress.XtraGrid.Columns.GridColumn gv_iqcDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_states;
- private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
private DevExpress.XtraEditors.LabelControl lb_lifnr;
private DevExpress.XtraEditors.TextEdit txt_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_dhb001;
- private DevExpress.XtraGrid.Columns.GridColumn gv_dhb002;
private DevExpress.XtraGrid.Columns.GridColumn gv_dha018;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo2;
private DevExpress.XtraEditors.LabelControl lb_lotNo1;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Date1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1By1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Flag1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_maxCheckQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fsecondResu;
- private DevExpress.XtraGrid.Columns.GridColumn gv_company;
private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmanageNo;
private DevExpress.XtraEditors.LabelControl lb_fngHandle;
private DevExpress.XtraEditors.TextEdit txt_fngHandle;
private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fgearStand;
private DevExpress.XtraGrid.Columns.GridColumn gv_fexemption;
- private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemUnit;
private DevExpress.XtraGrid.Columns.GridColumn gv_ftype;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckAccord;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcancel;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fthirdRep;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckRepno;
- private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Date;
- private DevExpress.XtraGrid.Columns.GridColumn gv_modify1By;
private DevExpress.XtraGrid.Columns.GridColumn gv_modify1Flag;
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_fhandle;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmove;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
private DevExpress.XtraEditors.LabelControl lb_checkQty;
@@ -2418,13 +1766,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_facLevel;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckLevel;
private DevExpress.XtraGrid.Columns.GridColumn gv_sampleSizeNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_freview;
private DevExpress.XtraEditors.LabelControl lb_fcheckResu;
private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fngDesc;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraEditors.LabelControl lb_freceQty;
private DevExpress.XtraEditors.TextEdit txt_freceQty;
@@ -2446,8 +1791,6 @@
private DevExpress.XtraEditors.LabelControl lb_releaseNo;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnUp;
@@ -2463,7 +1806,7 @@
private DevExpress.XtraEditors.PanelControl panMsg;
private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.TextEdit txtJianYan;
private DevExpress.XtraEditors.LabelControl lb_fsubmit;
private DevExpress.XtraEditors.TextEdit txt_fsubmit;
private DevExpress.XtraEditors.LabelControl lb_modify1Flag;
@@ -2475,7 +1818,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ftextType;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
@@ -2486,27 +1828,17 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fspecRequ;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkQyt;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckResu;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1facQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1freQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fngRate;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fenterQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1releaseNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1company;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1factory;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItemDesc;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1procNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workshopCenterCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1funit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1givenModify;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remarks;
private DevExpress.XtraEditors.GroupControl groupControl1;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index ebd329d..c37f659 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,3 +1,4 @@
+using DevExpress.DataAccess.Wizard.Model;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
@@ -13,6 +14,7 @@
using System.IO;
using System.Net.Http;
using System.Threading.Tasks;
+using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -57,9 +59,56 @@
gvMx2.OptionsFind.ShowSearchNavButtons = false;
gvMx2.OptionsView.ShowGroupPanel = false;
_setIno();
+ txtJianYan.KeyDown += TxtJianYan_KeyDown;
}
-
+ private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ string _strCmd = txtJianYan.Text.Trim().ToUpper();
+ string _strOK = "OK";
+ string _strNG = "NG";
+ if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ if (!_strCmd.Contains("-"))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氱己灏� 涓敾绾�!");
+ return;
+ }
+ string[] _ary = _strCmd.Split('-');
+ if (_ary.Length != 2)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氾細璇锋纭娇鐢∣K 鎴� NG 鍛戒护!");
+ return;
+ }
+ string _str1 = _ary[0];
+ if (!(_str1 == _strOK || _str1 == _strNG))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ string _str2 = _ary[1];
+ int n;
+ if (int.TryParse(_str2, out n))
+ {
+
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ for (int i = 0; i < gvMx2.DataRowCount; i++)
+ {
+ gvMx2.SetRowCellValue(i, "fcheckResu", _str1);
+ gvMx2.SetRowCellValue(i, "fstand", _str1);
+ }
+ }
+ }
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -128,7 +177,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -174,7 +223,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -298,14 +347,14 @@
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
- JObject _job = JObject.Parse(strJson);
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
+ UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list5"])
{
array.Add(a);
}
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
if (dt.Rows.Count > 0)
{
gcMx1.BindingContext = new BindingContext();
@@ -409,14 +458,20 @@
/// <param name="e"></param>
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- var rowGuid = "";
var myDataRow = gvMx1.GetDataRow(e.FocusedRowHandle);
if (myDataRow == null) return;
- rowGuid = myDataRow["id"].ToString();
- var json = JsonConvert.SerializeObject(rowGuid);
+ var _obj = new
+ {
+ parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ guid = UtilityHelper.ToGuid(myDataRow["guid"].ToString()), //涓诲缓
+ //id = myDataRow["id"].ToString(),
+ id = -1,
+ checkQyt = myDataRow["checkQyt"].ToString(),
+ chkItem = myDataRow["fcheckItem"].ToString()
+ };
try
{
- var strReturn = UtilityHelper.HttpPost("", _webServiceName+ "GetCheckResultList", json);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetCheckResultList12", JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
gcMx2.BindingContext = new BindingContext();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 2523824..af80c4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -1063,7 +1063,6 @@
this.txt_createName.Properties.Appearance.Options.UseFont = true;
this.txt_createName.Size = new System.Drawing.Size(150, 28);
this.txt_createName.TabIndex = 213;
-
//
// gv_createName
//
@@ -1093,7 +1092,7 @@
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1";
+ this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 40818c0..da4fd25 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -79,14 +79,13 @@
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_guid = 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.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -436,8 +435,8 @@
//
this.gv_isenabled.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_isenabled.AppearanceCell.Options.UseFont = true;
- this.gv_isenabled.Caption = "鏄惁鍙敤 ";
- this.gv_isenabled.FieldName = "isEnabled";
+ this.gv_isenabled.Caption = "鏄惁鍙敤";
+ this.gv_isenabled.FieldName = "isenabled";
this.gv_isenabled.MinWidth = 50;
this.gv_isenabled.Name = "gv_isenabled";
this.gv_isenabled.OptionsColumn.AllowEdit = false;
@@ -469,14 +468,14 @@
//
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fversion.AppearanceCell.Options.UseFont = true;
- this.gv_fversion.Caption = "鐗堟湰 ";
+ this.gv_fversion.Caption = "鐗堟湰";
this.gv_fversion.FieldName = "fVersion";
this.gv_fversion.MinWidth = 50;
this.gv_fversion.Name = "gv_fversion";
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.FVERSION";
this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 11;
+ this.gv_fversion.VisibleIndex = 8;
this.gv_fversion.Width = 94;
//
// lb_ftwoCheckdate
@@ -523,14 +522,14 @@
//
this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
- this.gv_ftwoCheckor.Caption = "鎵瑰噯浜� ";
+ this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
this.gv_ftwoCheckor.FieldName = "fTwoCheckor";
this.gv_ftwoCheckor.MinWidth = 50;
this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
this.gv_ftwoCheckor.Visible = true;
- this.gv_ftwoCheckor.VisibleIndex = 10;
+ this.gv_ftwoCheckor.VisibleIndex = 11;
this.gv_ftwoCheckor.Width = 94;
//
// lb_ftwoChecked
@@ -547,8 +546,8 @@
//
this.gv_ftwoChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
- this.gv_ftwoChecked.Caption = "鎵瑰噯鏍囪 ";
- this.gv_ftwoChecked.FieldName = "fTwoChecked";
+ this.gv_ftwoChecked.Caption = "鎵瑰噯鏍囪";
+ this.gv_ftwoChecked.FieldName = "ftwoChecked";
this.gv_ftwoChecked.MinWidth = 50;
this.gv_ftwoChecked.Name = "gv_ftwoChecked";
this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
@@ -581,14 +580,14 @@
//
this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
- this.gv_foneCheckdate.Caption = "瀹℃壒鏃ユ湡 ";
+ this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
this.gv_foneCheckdate.FieldName = "fOneCheckDate";
this.gv_foneCheckdate.MinWidth = 50;
this.gv_foneCheckdate.Name = "gv_foneCheckdate";
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 9;
+ this.gv_foneCheckdate.VisibleIndex = 10;
this.gv_foneCheckdate.Width = 94;
//
// lb_foneCheckor
@@ -615,14 +614,14 @@
//
this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
- this.gv_foneCheckor.Caption = "瀹℃壒浜� ";
+ this.gv_foneCheckor.Caption = "瀹℃牳浜�";
this.gv_foneCheckor.FieldName = "fOneCheckor";
this.gv_foneCheckor.MinWidth = 50;
this.gv_foneCheckor.Name = "gv_foneCheckor";
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 8;
+ this.gv_foneCheckor.VisibleIndex = 9;
this.gv_foneCheckor.Width = 94;
//
// lb_foneChecked
@@ -639,8 +638,8 @@
//
this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
- this.gv_foneChecked.Caption = "瀹℃壒鏍囪 ";
- this.gv_foneChecked.FieldName = "fOneChecked";
+ this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
+ this.gv_foneChecked.FieldName = "foneChecked";
this.gv_foneChecked.MinWidth = 50;
this.gv_foneChecked.Name = "gv_foneChecked";
this.gv_foneChecked.OptionsColumn.AllowEdit = false;
@@ -660,7 +659,7 @@
this.gv_name1.OptionsColumn.AllowEdit = false;
this.gv_name1.Tag = "query_a.NAME1";
this.gv_name1.Visible = true;
- this.gv_name1.VisibleIndex = 13;
+ this.gv_name1.VisibleIndex = 6;
this.gv_name1.Width = 94;
//
// lb_itemNo
@@ -677,7 +676,7 @@
//
this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemNo.Caption = "鐗╂枡浜у搧缂栫爜 ";
+ this.gv_itemNo.Caption = "鐗╂枡浜у搧缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
this.gv_itemNo.MinWidth = 150;
this.gv_itemNo.Name = "gv_itemNo";
@@ -710,31 +709,19 @@
//
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.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 = 12;
+ this.gv_memo.VisibleIndex = 13;
this.gv_memo.Width = 94;
- //
- // gv_guid
- //
- this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_guid.AppearanceCell.Options.UseFont = true;
- this.gv_guid.Caption = "guid ";
- this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
- this.gv_guid.Name = "gv_guid";
- this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
//
// toolBarMenu1
//
- this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -763,21 +750,20 @@
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_guid,
this.gv_isenabled,
this.gv_foneChecked,
this.gv_ftwoChecked,
this.gv_itemNo,
this.gridColumn3,
this.gridColumn2,
- this.gridColumn4,
- this.gridColumn1,
+ this.gv_name1,
+ this.gv_fversion,
this.gv_foneCheckor,
this.gv_foneCheckdate,
this.gv_ftwoCheckor,
- this.gv_fversion,
- this.gv_memo,
- this.gv_name1});
+ this.gridColumn1,
+ this.gridColumn4,
+ this.gv_memo});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -807,17 +793,6 @@
this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 94;
//
- // gridColumn4
- //
- this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
- this.gridColumn4.FieldName = "createDate";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.AllowEdit = false;
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 94;
- //
// gridColumn1
//
this.gridColumn1.Caption = "鍒朵綔浜�";
@@ -826,8 +801,19 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 12;
this.gridColumn1.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
+ this.gridColumn4.FieldName = "createDate";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.Width = 94;
//
// xtraTabControl1
//
@@ -1142,7 +1128,6 @@
private DevExpress.XtraEditors.LabelControl lb_memo;
private DevExpress.XtraEditors.TextEdit txt_memo;
private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 77c006b..8745dca 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -31,6 +31,9 @@
toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -100,8 +103,62 @@
_filterList = e.FilterList;
getPageList(1, pageBar1.RowsCount);
}
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemNo, gridView1);
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "Approval", JsonConvert.SerializeObject(rowGuid));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ getPageList(1, UtilityHelper.GetPageSize());
+ }
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+ /// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
/// <param name="sender"></param>
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 4794cd4..da4edb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -29,6 +29,11 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -39,6 +44,8 @@
this.status = new DevExpress.XtraGrid.Columns.GridColumn();
this.roleCreateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
@@ -52,18 +59,16 @@
this.lbGuid = new System.Windows.Forms.Label();
this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.trv = new System.Windows.Forms.TreeView();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).BeginInit();
- this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// toolBarMenu1
@@ -74,19 +79,19 @@
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(1237, 80);
this.toolBarMenu1.TabIndex = 5;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = null;
//
// xtraTabControl1
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Left;
+ 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(935, 661);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1237, 661);
this.xtraTabControl1.TabIndex = 7;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -97,7 +102,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(933, 629);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1235, 629);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// gcMain
@@ -107,7 +112,9 @@
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(933, 589);
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(1235, 589);
this.gcMain.TabIndex = 5;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -121,7 +128,8 @@
this.rolRemark,
this.status,
this.roleCreateBy,
- this.createDate});
+ this.createDate,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsView.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
@@ -186,6 +194,27 @@
this.createDate.VisibleIndex = 4;
this.createDate.Width = 94;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "閰嶇疆鏉冮檺";
+ this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.bouser_16x162;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閰嶇疆鏉冮檺", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 0;
@@ -195,7 +224,7 @@
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.RowsCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(933, 40);
+ this.pageBar1.Size = new System.Drawing.Size(1235, 40);
this.pageBar1.TabIndex = 6;
this.pageBar1.TotalPages = 0;
//
@@ -330,33 +359,11 @@
this.labelControl5.TabIndex = 101;
this.labelControl5.Text = "鍚敤鐘舵�侊細";
//
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.trv);
- this.groupBox1.Dock = System.Windows.Forms.DockStyle.Left;
- this.groupBox1.Location = new System.Drawing.Point(935, 80);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(291, 661);
- this.groupBox1.TabIndex = 8;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "璇烽�夋嫨璇ヨ鑹茬殑鏉冮檺";
- //
- // trv
- //
- this.trv.CheckBoxes = true;
- this.trv.Dock = System.Windows.Forms.DockStyle.Fill;
- this.trv.Font = new System.Drawing.Font("Tahoma", 10F);
- this.trv.Location = new System.Drawing.Point(3, 22);
- this.trv.Name = "trv";
- this.trv.Size = new System.Drawing.Size(285, 636);
- this.trv.TabIndex = 2;
- //
// Role
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1237, 741);
- this.Controls.Add(this.groupBox1);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Role";
@@ -366,12 +373,12 @@
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_roleName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_roleRemark.Properties)).EndInit();
- this.groupBox1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -386,8 +393,6 @@
private DevExpress.XtraGrid.Columns.GridColumn roleName;
private DevExpress.XtraGrid.Columns.GridColumn rolRemark;
private DevExpress.XtraGrid.Columns.GridColumn status;
- private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.TreeView trv;
private UserControls.Data.UcPageBar pageBar1;
private System.Windows.Forms.Panel panel1;
private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -402,5 +407,7 @@
private DevExpress.XtraGrid.Columns.GridColumn createDate;
private DevExpress.XtraGrid.Columns.GridColumn roleCreateBy;
private System.Windows.Forms.CheckBox txt_isStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 8c8338d..023ad57 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -27,13 +27,11 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- toolBarMenu1.btnRoleClick += ToolBarMenu1_btnRoleClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
+ //gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
- trv.AfterCheck += Trv_AfterCheck;
gridView1.IndicatorWidth = 50;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
@@ -48,22 +46,6 @@
e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
- }
-
- /// <summary>
- /// 鎹㈠垏鎹簨浠�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GridView1_FocusedRowChanged(object sender,
- FocusedRowChangedEventArgs e)
- {
- var rowGuid = "";
- var myDataRow = gridView1.GetDataRow(e.FocusedRowHandle);
- if (myDataRow == null) return;
- rowGuid = myDataRow["guid"].ToString();
- getTree(rowGuid);
- groupBox1.Text = "璇峰嬀閫夈��" + myDataRow["roleName"] + "銆戠殑鏉冮檺";
}
/// <summary>
@@ -258,39 +240,39 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnRoleClick(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_roleName, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
+ //private void ToolBarMenu1_btnRoleClick(object sender, EventArgs e)
+ //{
+ // string rowGuid, rowName;
+ // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ // lbGuid, txt_roleName, gridView1);
+ // if (string.IsNullOrEmpty(rowGuid))
+ // {
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ // }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾璁剧疆鏉冮檺鍚楋紵"))
- return;
- _actionLst = new StringBuilder();
- TraverseTreeViewNodes(trv.Nodes);
- var _obj = new
- {
- roleGuid = rowGuid,
- actionLst = _actionLst.ToString()
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "Role/SetRoleMenuAction",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+ // if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾璁剧疆鏉冮檺鍚楋紵"))
+ // return;
+ // _actionLst = new StringBuilder();
+ // TraverseTreeViewNodes(trv.Nodes);
+ // var _obj = new
+ // {
+ // roleGuid = rowGuid,
+ // actionLst = _actionLst.ToString()
+ // };
+ // try
+ // {
+ // var strJson = UtilityHelper.HttpPost("",
+ // "Role/SetRoleMenuAction",
+ // JsonConvert.SerializeObject(_obj));
+ // var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ // MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ // }
+ // catch (Exception ex)
+ // {
+ // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ // }
+ //}
/// <summary>
/// </summary>
@@ -363,102 +345,102 @@
}
}
- private void getTree(string roleGuid)
- {
- trv.Nodes.Clear();
- var imageList = new ImageList();
- imageList.Images.Add("icon0", Resources.publicfix_32x32);
- imageList.Images.Add("icon1", Resources.addfooter_32x32);
- imageList.Images.Add("icon2", Resources.listmultilevel_16x16);
- imageList.Images.Add("icon3", Resources.addcalculatedfield_16x16);
- trv.ImageList = imageList;
- var _obj = new
- {
- roleGuid //涓诲缓
- };
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole",
- JsonConvert.SerializeObject(_obj));
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- var drGrp = dt.Select("upGuid='' or upGuid is null");
- foreach (var _dy in drGrp)
- {
- var _orgGuid = _dy["guid"] + "&";
- var node = new TreeNode(); //瀹氫箟缁撶偣
- node.Text = _dy["name"].ToString(); //涓虹粨鐐硅祴鍊�
- node.Name = _dy["guid"].ToString();
- node.ImageIndex = 0;
- node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
- var drItem = dt.Select("upGuid='" + _dy["guid"] +
- "' and orgGuid='" + _dy["guid"] +
- "'");
- foreach (var _dy2 in drItem)
- {
- var node22 = new TreeNode(); //瀹氫箟缁撶偣
- node22.Text = _dy2["name"].ToString(); //涓虹粨鐐硅祴鍊�
- node22.Name = _orgGuid + _dy2["guid"];
- node22.ImageIndex = 1;
- node22.Checked = _dy2["isCk"].ToString() == "1"
- ? true
- : false;
- var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +
- "' and orgGuid='" +
- _dy["guid"] + "'");
- foreach (var _dy3 in drItem33)
- {
- var node33 = new TreeNode(); //瀹氫箟缁撶偣
- node33.Text = _dy3["name"].ToString(); //涓虹粨鐐硅祴鍊�
- node33.Name = _orgGuid + _dy3["guid"];
- node33.ImageIndex = 2;
- node33.Checked = _dy3["isCk"].ToString() == "1"
- ? true
- : false;
- var drItem44 = dt.Select("upGuid='" + _dy3["guid"] +
- "' and orgGuid='" + _dy["guid"] + "'");
- foreach (var _dy4 in drItem44)
- {
- var node44 = new TreeNode(); //瀹氫箟缁撶偣
- node44.Text = _dy4["name"].ToString(); //涓虹粨鐐硅祴鍊�
- node44.Name = _orgGuid + _dy4["guid"];
- node44.ImageIndex = 3;
- node44.Checked = _dy4["isCk"].ToString() == "1"
- ? true
- : false;
- node33.Nodes.Add(node44);
- }
+ //private void getTree(string roleGuid)
+ //{
+ // trv.Nodes.Clear();
+ // var imageList = new ImageList();
+ // imageList.Images.Add("icon0", Resources.publicfix_32x32);
+ // imageList.Images.Add("icon1", Resources.addfooter_32x32);
+ // imageList.Images.Add("icon2", Resources.listmultilevel_16x16);
+ // imageList.Images.Add("icon3", Resources.addcalculatedfield_16x16);
+ // trv.ImageList = imageList;
+ // var _obj = new
+ // {
+ // roleGuid //涓诲缓
+ // };
+ // try
+ // {
+ // var strReturn = UtilityHelper.HttpPost("", "Role/GetListByRole",
+ // JsonConvert.SerializeObject(_obj));
+ // var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ // var dt = dd.rtnData.list;
+ // var drGrp = dt.Select("upGuid='' or upGuid is null");
+ // foreach (var _dy in drGrp)
+ // {
+ // var _orgGuid = _dy["guid"] + "&";
+ // var node = new TreeNode(); //瀹氫箟缁撶偣
+ // node.Text = _dy["name"].ToString(); //涓虹粨鐐硅祴鍊�
+ // node.Name = _dy["guid"].ToString();
+ // node.ImageIndex = 0;
+ // node.Checked = _dy["isCk"].ToString() == "1" ? true : false;
+ // var drItem = dt.Select("upGuid='" + _dy["guid"] +
+ // "' and orgGuid='" + _dy["guid"] +
+ // "'");
+ // foreach (var _dy2 in drItem)
+ // {
+ // var node22 = new TreeNode(); //瀹氫箟缁撶偣
+ // node22.Text = _dy2["name"].ToString(); //涓虹粨鐐硅祴鍊�
+ // node22.Name = _orgGuid + _dy2["guid"];
+ // node22.ImageIndex = 1;
+ // node22.Checked = _dy2["isCk"].ToString() == "1"
+ // ? true
+ // : false;
+ // var drItem33 = dt.Select("upGuid='" + _dy2["guid"] +
+ // "' and orgGuid='" +
+ // _dy["guid"] + "'");
+ // foreach (var _dy3 in drItem33)
+ // {
+ // var node33 = new TreeNode(); //瀹氫箟缁撶偣
+ // node33.Text = _dy3["name"].ToString(); //涓虹粨鐐硅祴鍊�
+ // node33.Name = _orgGuid + _dy3["guid"];
+ // node33.ImageIndex = 2;
+ // node33.Checked = _dy3["isCk"].ToString() == "1"
+ // ? true
+ // : false;
+ // var drItem44 = dt.Select("upGuid='" + _dy3["guid"] +
+ // "' and orgGuid='" + _dy["guid"] + "'");
+ // foreach (var _dy4 in drItem44)
+ // {
+ // var node44 = new TreeNode(); //瀹氫箟缁撶偣
+ // node44.Text = _dy4["name"].ToString(); //涓虹粨鐐硅祴鍊�
+ // node44.Name = _orgGuid + _dy4["guid"];
+ // node44.ImageIndex = 3;
+ // node44.Checked = _dy4["isCk"].ToString() == "1"
+ // ? true
+ // : false;
+ // node33.Nodes.Add(node44);
+ // }
- node22.Nodes.Add(node33);
- }
+ // node22.Nodes.Add(node33);
+ // }
- node22.Expand();
- node.Nodes.Add(node22);
- }
+ // node22.Expand();
+ // node.Nodes.Add(node22);
+ // }
- node.Expand();
- trv.Nodes.Add(node);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+ // node.Expand();
+ // trv.Nodes.Add(node);
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ // }
+ //}
- private void Trv_AfterCheck(object sender, TreeViewEventArgs e)
- {
- try
- {
- trv.AfterCheck -= Trv_AfterCheck;
- UtilityHelper.TreeViewCheck(e);
- trv.AfterCheck += Trv_AfterCheck;
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
- }
+ //private void Trv_AfterCheck(object sender, TreeViewEventArgs e)
+ //{
+ // try
+ // {
+ // trv.AfterCheck -= Trv_AfterCheck;
+ // UtilityHelper.TreeViewCheck(e);
+ // trv.AfterCheck += Trv_AfterCheck;
+ // }
+ // catch (Exception ex)
+ // {
+ // MsgHelper.ShowError(ex.Message);
+ // }
+ //}
// 閬嶅巻TreeView涓殑鎵�鏈夎妭鐐�
private void TraverseTreeViewNodes(TreeNodeCollection nodes)
@@ -471,5 +453,17 @@
if (node.Nodes.Count > 0) TraverseTreeViewNodes(node.Nodes);
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ if (e.Button.Index == 0)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var userGuid = dr["guid"].ToString();
+ var frm = new RoleSelectAction(userGuid);
+ frm.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.resx b/DevApp/Gs.DevApp/DevFrm/User/Role.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.resx
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.resx
@@ -1,134 +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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ 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: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: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: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>
+ </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/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 11ecd6e..76e11b3 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -337,6 +337,12 @@
<Compile Include="DevFrm\Sys\SysMenu.Designer.cs">
<DependentUpon>SysMenu.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\User\RoleSelectAction.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\User\RoleSelectAction.Designer.cs">
+ <DependentUpon>RoleSelectAction.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\User\User.cs">
<SubType>Form</SubType>
</Compile>
@@ -573,6 +579,9 @@
<EmbeddedResource Include="DevFrm\Sys\SysMenu.resx">
<DependentUpon>SysMenu.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\User\RoleSelectAction.resx">
+ <DependentUpon>RoleSelectAction.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\User\User.resx">
<DependentUpon>User.cs</DependentUpon>
</EmbeddedResource>
@@ -777,6 +786,8 @@
<None Include="Resources\sendxls_16x16.png" />
<None Include="Resources\fill_32x32.png" />
<None Include="Resources\fill_16x16.png" />
+ <None Include="Resources\bouser_16x162.png" />
+ <None Include="Resources\refresh_32x32.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 1a46a50..23bb13f 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -36,7 +36,7 @@
/// </summary>
private static void _startLogin()
{
- //Application.Run(new TestForm.XtraForm1());
+ //Application.Run(new TestForm.FluentDesignForm1());
//return;
var fmLogin = new FrmLogin();
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 58fcde4..28d7fea 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -243,6 +243,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap bouser_16x162 {
+ get {
+ object obj = ResourceManager.GetObject("bouser_16x162", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap chartsshowlegend_32x32 {
get {
object obj = ResourceManager.GetObject("chartsshowlegend_32x32", resourceCulture);
@@ -993,6 +1003,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap refresh_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("refresh_32x32", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap removegroupfooter_16x16 {
get {
object obj = ResourceManager.GetObject("removegroupfooter_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index e2525db..2e9dd89 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -208,16 +208,8 @@
<data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="forcetesting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -306,11 +298,6 @@
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -378,8 +365,10 @@
<value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -394,6 +383,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="cleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cleartablestyle_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -404,8 +396,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+ <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -414,8 +406,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="exportfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\exportfile_16x16.png;System.Drawing.Bitmap,
+ <data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -449,6 +441,9 @@
<value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
@@ -485,6 +480,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -492,6 +492,9 @@
</data>
<data name="forcetesting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="wraptext2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\wraptext2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_16x16.png;System.Drawing.Bitmap,
@@ -516,10 +519,13 @@
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+ <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
@@ -637,24 +643,24 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap,
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="forcetesting_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\forcetesting_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ <data name="lookup&reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\lookup&reference_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
+ <data name="first_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\first_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -671,16 +677,16 @@
<data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortbyorderdate_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortbyorderdate_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="insertdatafield_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\insertdatafield_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="legendnone2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\legendnone2_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="filledradarwithoutmarkers_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\filledradarwithoutmarkers_32x32.png;System.Drawing.Bitmap,
+ <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -715,7 +721,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Properties/licenses.licx b/DevApp/Gs.DevApp/Properties/licenses.licx
index 9dab4da..2ca62f1 100644
--- a/DevApp/Gs.DevApp/Properties/licenses.licx
+++ b/DevApp/Gs.DevApp/Properties/licenses.licx
@@ -1,22 +1,24 @@
-DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TreeListLookUpEdit, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 765d0ff..4ecba44 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -28,22 +28,44 @@
/// </summary>
private void InitializeComponent()
{
- this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
+ this.txt_ItemId = new Gs.DevApp.UserControl.UcLookCk();
+ this.ucLookItems1 = new Gs.DevApp.UserControl.UcLookItems();
+ this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
this.SuspendLayout();
//
// txt_ItemId
//
this.txt_ItemId.KeyFile = "";
- this.txt_ItemId.Location = new System.Drawing.Point(253, 102);
+ this.txt_ItemId.Location = new System.Drawing.Point(187, 54);
+ this.txt_ItemId.Margin = new System.Windows.Forms.Padding(0);
this.txt_ItemId.Name = "txt_ItemId";
- this.txt_ItemId.Size = new System.Drawing.Size(266, 33);
+ this.txt_ItemId.Size = new System.Drawing.Size(219, 30);
this.txt_ItemId.TabIndex = 0;
+ //
+ // ucLookItems1
+ //
+ this.ucLookItems1.KeyFile = "";
+ this.ucLookItems1.Location = new System.Drawing.Point(187, 119);
+ this.ucLookItems1.Name = "ucLookItems1";
+ this.ucLookItems1.Size = new System.Drawing.Size(266, 33);
+ this.ucLookItems1.TabIndex = 1;
+ //
+ // ucLookSupplier1
+ //
+ this.ucLookSupplier1.KeyFile = "";
+ this.ucLookSupplier1.Location = new System.Drawing.Point(201, 231);
+ this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucLookSupplier1.Name = "ucLookSupplier1";
+ this.ucLookSupplier1.Size = new System.Drawing.Size(228, 30);
+ this.ucLookSupplier1.TabIndex = 2;
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1009, 612);
+ this.Controls.Add(this.ucLookSupplier1);
+ this.Controls.Add(this.ucLookItems1);
this.Controls.Add(this.txt_ItemId);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
@@ -53,6 +75,8 @@
#endregion
- private UserControl.UcLookItems txt_ItemId;
+ private UserControl.UcLookCk txt_ItemId;
+ private UserControl.UcLookItems ucLookItems1;
+ private UserControl.UcLookSupplier ucLookSupplier1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
index 86d2922..3ec4fb8 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
@@ -26,7 +26,7 @@
{
InitializeComponent();
txt_ItemId.KeyFile = "id";
- txt_ItemId.SetIdOrCode("287976");
+
}
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 712ce51..3a46885 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -369,7 +369,15 @@
txt.ReadOnly = isEdt;
continue;
}
-
+ if (colType is MemoEdit)
+ {
+ var txt = colType as MemoEdit;
+ if (txt != null)
+ txt.Text = strVal;
+ txt.ReadOnly = isEdt;
+ continue;
+ }
+
//鏁板瓧鍗�
if (colType is NumericUpDown)
{
@@ -540,7 +548,14 @@
txt.ReadOnly = isEdt;
continue;
}
-
+ if (ctrl is MemoEdit)
+ {
+ var txt = ctrl as MemoEdit;
+ if (txt != null)
+ txt.Text = "";
+ txt.ReadOnly = isEdt;
+ continue;
+ }
//鏃堕棿
if (ctrl is DateTimePicker)
{
@@ -618,7 +633,12 @@
txt.ReadOnly = isEdt;
continue;
}
-
+ if (ctrl is MemoEdit)
+ {
+ var txt = ctrl as MemoEdit;
+ txt.ReadOnly = isEdt;
+ continue;
+ }
//鏁板瓧鍗�
if (ctrl is NumericUpDown)
{
@@ -626,7 +646,6 @@
txt.ReadOnly = isEdt;
continue;
}
-
//涓嬫媺
if (ctrl is UcComBox)
{
--
Gitblit v1.9.3