From 849ca958c2d6e5346d2b381be2c6c3429935947a Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期二, 26 十一月 2024 08:11:11 +0800 Subject: [PATCH] 1 --- DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 40 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs | 1735 ++++++++++++++++++++++++++++++++ DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs | 108 ++ DevApp/Gs.DevApp/Resources/drilldownonarguments_chart_32x32.png | 0 DevApp/Gs.DevApp/Gs.DevApp.csproj | 4 DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs | 110 ++ DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs | 336 ++++++ DevApp/Gs.DevApp/UserControl/UcLookWorkline.resx | 120 ++ DevApp/Gs.DevApp/Resources/sortasc_32x32.png | 0 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 102 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 33 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 10 DevApp/Gs.DevApp/Resources/sortasc_16x161.png | 0 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 1 DevApp/Gs.DevApp/Resources/sortasc_32x321.png | 0 DevApp/Gs.DevApp/UserControl/UcLookWorkshop.resx | 120 ++ DevApp/Gs.DevApp/Properties/Resources.resx | 46 DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs | 122 ++ DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx | 120 ++ DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 62 DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs | 135 ++ 22 files changed, 3,110 insertions(+), 96 deletions(-) diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json index ecf934d..2faaa61 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":[],"References":[],"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\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql2.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql3.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitem.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookupTypes.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\FileSelector.cs"},{"SourceFile":"DevFrm\\FrmLogin.cs"},{"SourceFile":"DevFrm\\FrmLogin.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.cs"},{"SourceFile":"DevFrm\\Sys\\Frm_MesSysPageview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_ArrivalBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemIns.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemIns.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemOuts.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemInCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutCDetails.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOutItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemOuts.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\VArrivalBarcodeItem3.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_MesWomdaahb.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womcaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Womdaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompaa.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompaa.Designer.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.cs"},{"SourceFile":"DevFrm\\WOM\\Frm_Wompba.Designer.cs"},{"SourceFile":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"TestForm\\XtraForm1.cs"},{"SourceFile":"TestForm\\XtraForm1.Designer.cs"},{"SourceFile":"TestForm\\XtraForm2.cs"},{"SourceFile":"TestForm\\XtraForm2.Designer.cs"},{"SourceFile":"ToolBox\\LogHelper.cs"},{"SourceFile":"ToolBox\\MsgHelper.cs"},{"SourceFile":"ToolBox\\UpdateParentEventArgs.cs"},{"SourceFile":"ToolBox\\UtilityHelper.cs"},{"SourceFile":"UserControl\\SelectCgMx.cs"},{"SourceFile":"UserControl\\SelectCgMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.cs"},{"SourceFile":"UserControl\\SelectCgOutMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\ShowFile.cs"},{"SourceFile":"UserControl\\ShowFile.Designer.cs"},{"SourceFile":"UserControl\\ShowLogcs.cs"},{"SourceFile":"UserControl\\ShowLogcs.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\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\\UcLookWorkline.cs"},{"SourceFile":"UserControl\\UcLookWorkline.Designer.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.cs"},{"SourceFile":"UserControl\\UcLookWorkshop.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\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\\UCUpFile.cs"},{"SourceFile":"UserControl\\UCUpFile.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\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:\\QiXiSource\\GsMesClient\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\CefSharp.Common.129.0.110\\lib\\net462\\CefSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\CefSharp.WinForms.129.0.110\\lib\\net462\\CefSharp.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\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/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs index 2322b19..a0051f6 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs @@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.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.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -86,6 +86,8 @@ this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.picCheckBox = new System.Windows.Forms.PictureBox(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -259,10 +261,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -288,7 +290,7 @@ this.gv_checkStatus.OptionsColumn.AllowEdit = false; this.gv_checkStatus.Tag = "query_a.check_status"; this.gv_checkStatus.Visible = true; - this.gv_checkStatus.VisibleIndex = 6; + this.gv_checkStatus.VisibleIndex = 8; this.gv_checkStatus.Width = 94; // // lb_checkBy @@ -322,7 +324,7 @@ this.gv_checkBy.OptionsColumn.AllowEdit = false; this.gv_checkBy.Tag = "query_a.check_by"; this.gv_checkBy.Visible = true; - this.gv_checkBy.VisibleIndex = 8; + this.gv_checkBy.VisibleIndex = 10; this.gv_checkBy.Width = 94; // // lb_checkDate @@ -356,7 +358,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.check_date"; this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 7; + this.gv_checkDate.VisibleIndex = 9; this.gv_checkDate.Width = 94; // // lb_isStatus @@ -381,7 +383,7 @@ this.gv_isStatus.Tag = "query_a.is_status"; this.gv_isStatus.UnboundDataType = typeof(bool); this.gv_isStatus.Visible = true; - this.gv_isStatus.VisibleIndex = 5; + this.gv_isStatus.VisibleIndex = 7; this.gv_isStatus.Width = 94; // // lb_createDate @@ -415,7 +417,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.create_date"; this.gv_createDate.Visible = true; - this.gv_createDate.VisibleIndex = 4; + this.gv_createDate.VisibleIndex = 6; this.gv_createDate.Width = 94; // // lb_createBy @@ -449,7 +451,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; - this.gv_createBy.VisibleIndex = 3; + this.gv_createBy.VisibleIndex = 5; this.gv_createBy.Width = 94; // // lb_remark @@ -482,7 +484,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; - this.gv_remark.VisibleIndex = 2; + this.gv_remark.VisibleIndex = 4; this.gv_remark.Width = 94; // // lb_name @@ -515,7 +517,7 @@ this.gv_name.OptionsColumn.AllowEdit = false; this.gv_name.Tag = "query_a.name"; this.gv_name.Visible = true; - this.gv_name.VisibleIndex = 1; + this.gv_name.VisibleIndex = 3; this.gv_name.Width = 94; // // lb_workshopNo @@ -548,7 +550,7 @@ this.gv_workshopNo.OptionsColumn.AllowEdit = false; this.gv_workshopNo.Tag = "query_a.workshop_no"; this.gv_workshopNo.Visible = true; - this.gv_workshopNo.VisibleIndex = 0; + this.gv_workshopNo.VisibleIndex = 2; this.gv_workshopNo.Width = 94; // // toolBarMenu1 @@ -582,6 +584,8 @@ 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.gridColumn1, + this.gridColumn2, this.gv_workshopNo, this.gv_name, this.gv_remark, @@ -729,6 +733,28 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // + // gridColumn1 + // + this.gridColumn1.Caption = "浣跨敤缁勭粐"; + this.gridColumn1.FieldName = "fSubsidiary"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Tag = "org.fnamber"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 1; + this.gridColumn1.Width = 94; + // + // gridColumn2 + // + this.gridColumn2.Caption = "杞﹂棿ID"; + this.gridColumn2.FieldName = "workid"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Tag = "query_a.workid"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 0; + this.gridColumn2.Width = 94; + // // Frm_MesWorkshop // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -826,5 +852,7 @@ private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1; private DevExpress.XtraEditors.CheckEdit txt_checkStatus; private System.Windows.Forms.PictureBox picCheckBox; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs new file mode 100644 index 0000000..019ec51 --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs @@ -0,0 +1,1735 @@ +/* Create By GS EasyCode */ +namespace Gs.DevApp.DevFrm +{ + partial class Frm_MesWomdaahb + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2depotNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2xh = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa021 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa014 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa024 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa015 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa009 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa008 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa007 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa006 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa005 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa004 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa003 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2daa002 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2pworkNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2pbomNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2womdaahbNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2mid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2id = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx2 = new DevExpress.XtraGrid.GridControl(); + this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gvMx1mtono = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1lot = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1positionNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1depotNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb026 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb025 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1womdaahbNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb024 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb023 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb022 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb021 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb020 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb019 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb018 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb017 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb016 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb015 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb014 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb013 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb012 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb011 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb010 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb009 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb008 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb007 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb006 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb005 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb004 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb003 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb002 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1dabhb001 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn(); + this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.gcMx1 = new DevExpress.XtraGrid.GridControl(); + this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gv_depotNo = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_freezeFlag = new DevExpress.XtraEditors.LabelControl(); + this.gv_freezeFlag = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_daahb013name = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_daahb022 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_createBy = new DevExpress.XtraEditors.LabelControl(); + this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); + this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gv_daahb020 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_checkUser = new DevExpress.XtraEditors.LabelControl(); + this.txt_checkUser = new DevExpress.XtraEditors.TextEdit(); + this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_checkDate = new DevExpress.XtraEditors.LabelControl(); + this.txt_checkDate = new DevExpress.XtraEditors.TextEdit(); + this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_fstatus = new DevExpress.XtraEditors.LabelControl(); + this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_daahb015 = new DevExpress.XtraEditors.LabelControl(); + this.gv_daahb015 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_daahb013 = new DevExpress.XtraEditors.LabelControl(); + this.gv_daahb013 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_daahb009 = new DevExpress.XtraEditors.LabelControl(); + this.txt_daahb009 = new DevExpress.XtraEditors.TextEdit(); + this.gv_daahb009 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_createDate = new DevExpress.XtraEditors.LabelControl(); + this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); + this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); + this.lb_womdaahbNo = new DevExpress.XtraEditors.LabelControl(); + this.txt_womdaahbNo = new DevExpress.XtraEditors.TextEdit(); + this.gv_womdaahbNo = 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(); + this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); + this.pageBar1 = new UserControls.Data.UcPageBar(); + this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); + this.tabMx = new DevExpress.XtraTab.XtraTabControl(); + this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); + this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage(); + this.panel1 = new System.Windows.Forms.Panel(); + this.txt_daahb015 = new Gs.DevApp.UserControl.UcLookWorkline(); + this.txt_daahb013 = new Gs.DevApp.UserControl.UcLookWorkshop(); + this.txt_freezeFlag = new DevExpress.XtraEditors.CheckEdit(); + this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit(); + this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); + this.lbGuid = new System.Windows.Forms.Label(); + this.tabMxPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); + this.tabMxPage1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_daahb009.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_womdaahbNo.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); + this.xtraTabControl1.SuspendLayout(); + this.xtraTabPage1.SuspendLayout(); + this.xtraTabPage2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); + this.tabMx.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_freezeFlag.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit(); + this.SuspendLayout(); + // + // gvMx2itemId + // + this.gvMx2itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2itemId.AppearanceCell.Options.UseFont = true; + this.gvMx2itemId.Caption = "鐗╂枡id "; + this.gvMx2itemId.FieldName = "itemId"; + this.gvMx2itemId.MinWidth = 50; + this.gvMx2itemId.Name = "gvMx2itemId"; + this.gvMx2itemId.Tag = "query_a.item_id"; + this.gvMx2itemId.Visible = true; + this.gvMx2itemId.VisibleIndex = 20; + this.gvMx2itemId.Width = 94; + // + // gvMx2depotNo + // + this.gvMx2depotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2depotNo.AppearanceCell.Options.UseFont = true; + this.gvMx2depotNo.Caption = "浠撳簱缂栫爜 "; + this.gvMx2depotNo.FieldName = "depotNo"; + this.gvMx2depotNo.MinWidth = 50; + this.gvMx2depotNo.Name = "gvMx2depotNo"; + this.gvMx2depotNo.Tag = "query_a.depot_no"; + this.gvMx2depotNo.Visible = true; + this.gvMx2depotNo.VisibleIndex = 19; + this.gvMx2depotNo.Width = 94; + // + // gvMx2xh + // + this.gvMx2xh.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2xh.AppearanceCell.Options.UseFont = true; + this.gvMx2xh.Caption = "搴忓彿 "; + this.gvMx2xh.FieldName = "xh"; + this.gvMx2xh.MinWidth = 50; + this.gvMx2xh.Name = "gvMx2xh"; + this.gvMx2xh.Tag = "query_a.xh"; + this.gvMx2xh.Visible = true; + this.gvMx2xh.VisibleIndex = 18; + this.gvMx2xh.Width = 94; + // + // gvMx2daa021 + // + this.gvMx2daa021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa021.AppearanceCell.Options.UseFont = true; + this.gvMx2daa021.Caption = "浠诲姟鍗曞崟鍙� "; + this.gvMx2daa021.FieldName = "daa021"; + this.gvMx2daa021.MinWidth = 50; + this.gvMx2daa021.Name = "gvMx2daa021"; + this.gvMx2daa021.Tag = "query_a.daa021"; + this.gvMx2daa021.Visible = true; + this.gvMx2daa021.VisibleIndex = 17; + this.gvMx2daa021.Width = 94; + // + // gvMx2daa014 + // + this.gvMx2daa014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa014.AppearanceCell.Options.UseFont = true; + this.gvMx2daa014.Caption = "鎶曟枡鍗曞崟鍙� "; + this.gvMx2daa014.FieldName = "daa014"; + this.gvMx2daa014.MinWidth = 50; + this.gvMx2daa014.Name = "gvMx2daa014"; + this.gvMx2daa014.Tag = "query_a.daa014"; + this.gvMx2daa014.Visible = true; + this.gvMx2daa014.VisibleIndex = 16; + this.gvMx2daa014.Width = 94; + // + // gvMx2daa024 + // + this.gvMx2daa024.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa024.AppearanceCell.Options.UseFont = true; + this.gvMx2daa024.Caption = "鎺掍骇鏃ユ湡 "; + this.gvMx2daa024.FieldName = "daa024"; + this.gvMx2daa024.MinWidth = 50; + this.gvMx2daa024.Name = "gvMx2daa024"; + this.gvMx2daa024.Tag = "query_a.daa024"; + this.gvMx2daa024.Visible = true; + this.gvMx2daa024.VisibleIndex = 15; + this.gvMx2daa024.Width = 94; + // + // gvMx2daa015 + // + this.gvMx2daa015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa015.AppearanceCell.Options.UseFont = true; + this.gvMx2daa015.Caption = "鐢熶骇绾垮埆 "; + this.gvMx2daa015.FieldName = "daa015"; + this.gvMx2daa015.MinWidth = 50; + this.gvMx2daa015.Name = "gvMx2daa015"; + this.gvMx2daa015.Tag = "query_a.daa015"; + this.gvMx2daa015.Visible = true; + this.gvMx2daa015.VisibleIndex = 14; + this.gvMx2daa015.Width = 94; + // + // gvMx2daa009 + // + this.gvMx2daa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa009.AppearanceCell.Options.UseFont = true; + this.gvMx2daa009.Caption = "澶囨敞 "; + this.gvMx2daa009.FieldName = "daa009"; + this.gvMx2daa009.MinWidth = 50; + this.gvMx2daa009.Name = "gvMx2daa009"; + this.gvMx2daa009.Tag = "query_a.daa009"; + this.gvMx2daa009.Visible = true; + this.gvMx2daa009.VisibleIndex = 13; + this.gvMx2daa009.Width = 94; + // + // gvMx2daa008 + // + this.gvMx2daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa008.AppearanceCell.Options.UseFont = true; + this.gvMx2daa008.Caption = "宸ュ崟鏁伴噺 "; + this.gvMx2daa008.FieldName = "daa008"; + this.gvMx2daa008.MinWidth = 50; + this.gvMx2daa008.Name = "gvMx2daa008"; + this.gvMx2daa008.Tag = "query_a.daa008"; + this.gvMx2daa008.Visible = true; + this.gvMx2daa008.VisibleIndex = 12; + this.gvMx2daa008.Width = 94; + // + // gvMx2daa007 + // + this.gvMx2daa007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa007.AppearanceCell.Options.UseFont = true; + this.gvMx2daa007.Caption = "棰勮瀹屽伐鏃堕棿 "; + this.gvMx2daa007.FieldName = "daa007"; + this.gvMx2daa007.MinWidth = 50; + this.gvMx2daa007.Name = "gvMx2daa007"; + this.gvMx2daa007.Tag = "query_a.daa007"; + this.gvMx2daa007.Visible = true; + this.gvMx2daa007.VisibleIndex = 11; + this.gvMx2daa007.Width = 94; + // + // gvMx2daa006 + // + this.gvMx2daa006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa006.AppearanceCell.Options.UseFont = true; + this.gvMx2daa006.Caption = "棰勮寮�宸ユ椂闂� "; + this.gvMx2daa006.FieldName = "daa006"; + this.gvMx2daa006.MinWidth = 50; + this.gvMx2daa006.Name = "gvMx2daa006"; + this.gvMx2daa006.Tag = "query_a.daa006"; + this.gvMx2daa006.Visible = true; + this.gvMx2daa006.VisibleIndex = 10; + this.gvMx2daa006.Width = 94; + // + // gvMx2daa005 + // + this.gvMx2daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa005.AppearanceCell.Options.UseFont = true; + this.gvMx2daa005.Caption = "鍗曚綅(鍐呯爜) "; + this.gvMx2daa005.FieldName = "daa005"; + this.gvMx2daa005.MinWidth = 50; + this.gvMx2daa005.Name = "gvMx2daa005"; + this.gvMx2daa005.Tag = "query_a.daa005"; + this.gvMx2daa005.Visible = true; + this.gvMx2daa005.VisibleIndex = 9; + this.gvMx2daa005.Width = 94; + // + // gvMx2daa004 + // + this.gvMx2daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa004.AppearanceCell.Options.UseFont = true; + this.gvMx2daa004.Caption = "浜у搧瑙勬牸 "; + this.gvMx2daa004.FieldName = "daa004"; + this.gvMx2daa004.MinWidth = 50; + this.gvMx2daa004.Name = "gvMx2daa004"; + this.gvMx2daa004.Tag = "query_a.daa004"; + this.gvMx2daa004.Visible = true; + this.gvMx2daa004.VisibleIndex = 8; + this.gvMx2daa004.Width = 94; + // + // gvMx2daa003 + // + this.gvMx2daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa003.AppearanceCell.Options.UseFont = true; + this.gvMx2daa003.Caption = "浜у搧鍚嶇О "; + this.gvMx2daa003.FieldName = "daa003"; + this.gvMx2daa003.MinWidth = 50; + this.gvMx2daa003.Name = "gvMx2daa003"; + this.gvMx2daa003.Tag = "query_a.daa003"; + this.gvMx2daa003.Visible = true; + this.gvMx2daa003.VisibleIndex = 7; + this.gvMx2daa003.Width = 94; + // + // gvMx2daa002 + // + this.gvMx2daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2daa002.AppearanceCell.Options.UseFont = true; + this.gvMx2daa002.Caption = "浜у搧缂栫爜 "; + this.gvMx2daa002.FieldName = "daa002"; + this.gvMx2daa002.MinWidth = 50; + this.gvMx2daa002.Name = "gvMx2daa002"; + this.gvMx2daa002.Tag = "query_a.daa002"; + this.gvMx2daa002.Visible = true; + this.gvMx2daa002.VisibleIndex = 6; + this.gvMx2daa002.Width = 94; + // + // gvMx2pworkNo + // + this.gvMx2pworkNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2pworkNo.AppearanceCell.Options.UseFont = true; + this.gvMx2pworkNo.Caption = "浠诲姟鍗曞彿 "; + this.gvMx2pworkNo.FieldName = "pworkNo"; + this.gvMx2pworkNo.MinWidth = 50; + this.gvMx2pworkNo.Name = "gvMx2pworkNo"; + this.gvMx2pworkNo.Tag = "query_a.pwork_no"; + this.gvMx2pworkNo.Visible = true; + this.gvMx2pworkNo.VisibleIndex = 5; + this.gvMx2pworkNo.Width = 94; + // + // gvMx2pbomNo + // + this.gvMx2pbomNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2pbomNo.AppearanceCell.Options.UseFont = true; + this.gvMx2pbomNo.Caption = "宸ュ崟鍗曞彿 "; + this.gvMx2pbomNo.FieldName = "pbomNo"; + this.gvMx2pbomNo.MinWidth = 50; + this.gvMx2pbomNo.Name = "gvMx2pbomNo"; + this.gvMx2pbomNo.Tag = "query_a.pbom_no"; + this.gvMx2pbomNo.Visible = true; + this.gvMx2pbomNo.VisibleIndex = 4; + this.gvMx2pbomNo.Width = 94; + // + // gvMx2womdaahbNo + // + this.gvMx2womdaahbNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2womdaahbNo.AppearanceCell.Options.UseFont = true; + this.gvMx2womdaahbNo.Caption = "鍚堝苟宸ュ崟 "; + this.gvMx2womdaahbNo.FieldName = "womdaahbNo"; + this.gvMx2womdaahbNo.MinWidth = 50; + this.gvMx2womdaahbNo.Name = "gvMx2womdaahbNo"; + this.gvMx2womdaahbNo.Tag = "query_a.womdaahb_no"; + this.gvMx2womdaahbNo.Visible = true; + this.gvMx2womdaahbNo.VisibleIndex = 3; + this.gvMx2womdaahbNo.Width = 94; + // + // gvMx2mid + // + this.gvMx2mid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2mid.AppearanceCell.Options.UseFont = true; + this.gvMx2mid.Caption = "涓昏〃id "; + this.gvMx2mid.FieldName = "mid"; + this.gvMx2mid.MinWidth = 50; + this.gvMx2mid.Name = "gvMx2mid"; + this.gvMx2mid.Tag = "query_a.mid"; + this.gvMx2mid.Visible = true; + this.gvMx2mid.VisibleIndex = 2; + this.gvMx2mid.Width = 94; + // + // gvMx2id + // + this.gvMx2id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2id.AppearanceCell.Options.UseFont = true; + this.gvMx2id.Caption = "id "; + this.gvMx2id.FieldName = "id"; + this.gvMx2id.MinWidth = 50; + this.gvMx2id.Name = "gvMx2id"; + this.gvMx2id.Tag = "query_a.id"; + this.gvMx2id.Visible = true; + this.gvMx2id.VisibleIndex = 1; + this.gvMx2id.Width = 94; + // + // gvMx2guid + // + this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx2guid.AppearanceCell.Options.UseFont = true; + this.gvMx2guid.Caption = "guid "; + this.gvMx2guid.FieldName = "guid"; + this.gvMx2guid.MinWidth = 50; + this.gvMx2guid.Name = "gvMx2guid"; + this.gvMx2guid.Tag = "query_a.guid"; + this.gvMx2guid.Visible = true; + this.gvMx2guid.VisibleIndex = 0; + this.gvMx2guid.Width = 94; + // + // tabMxPage2 + // + this.tabMxPage2.Controls.Add(this.gcMx2); + this.tabMxPage2.Name = "tabMxPage2"; + this.tabMxPage2.Size = new System.Drawing.Size(1124, 415); + this.tabMxPage2.Text = "鏄庣粏2"; + // + // gcMx2 + // + this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx2.Location = new System.Drawing.Point(0, 0); + this.gcMx2.MainView = this.gvMx2; + this.gcMx2.Name = "gcMx2"; + this.gcMx2.Size = new System.Drawing.Size(1124, 415); + this.gcMx2.TabIndex = 0; + this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx2}); + // + // gvMx2 + // + this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gvMx2guid, + this.gvMx2id, + this.gvMx2mid, + this.gvMx2womdaahbNo, + this.gvMx2pbomNo, + this.gvMx2pworkNo, + this.gvMx2daa002, + this.gvMx2daa003, + this.gvMx2daa004, + this.gvMx2daa005, + this.gvMx2daa006, + this.gvMx2daa007, + this.gvMx2daa008, + this.gvMx2daa009, + this.gvMx2daa015, + this.gvMx2daa024, + this.gvMx2daa014, + this.gvMx2daa021, + this.gvMx2xh, + this.gvMx2depotNo, + this.gvMx2itemId}); + this.gvMx2.GridControl = this.gcMx2; + this.gvMx2.Name = "gvMx2"; + this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx2.OptionsFind.ShowSearchNavButtons = false; + this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; + this.gvMx2.OptionsView.ShowGroupPanel = false; + // + // gvMx1mtono + // + this.gvMx1mtono.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1mtono.AppearanceCell.Options.UseFont = true; + this.gvMx1mtono.Caption = "璁″垝璺熻釜鍙� "; + this.gvMx1mtono.FieldName = "mtono"; + this.gvMx1mtono.MinWidth = 50; + this.gvMx1mtono.Name = "gvMx1mtono"; + this.gvMx1mtono.Tag = "query_a.mtono"; + this.gvMx1mtono.Visible = true; + this.gvMx1mtono.VisibleIndex = 33; + this.gvMx1mtono.Width = 94; + // + // gvMx1lot + // + this.gvMx1lot.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1lot.AppearanceCell.Options.UseFont = true; + this.gvMx1lot.Caption = "鎵瑰彿 "; + this.gvMx1lot.FieldName = "lot"; + this.gvMx1lot.MinWidth = 50; + this.gvMx1lot.Name = "gvMx1lot"; + this.gvMx1lot.Tag = "query_a.lot"; + this.gvMx1lot.Visible = true; + this.gvMx1lot.VisibleIndex = 32; + this.gvMx1lot.Width = 94; + // + // gvMx1positionNo + // + this.gvMx1positionNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1positionNo.AppearanceCell.Options.UseFont = true; + this.gvMx1positionNo.Caption = "浣嶇疆鍙� "; + this.gvMx1positionNo.FieldName = "positionNo"; + this.gvMx1positionNo.MinWidth = 50; + this.gvMx1positionNo.Name = "gvMx1positionNo"; + this.gvMx1positionNo.Tag = "query_a.position_no"; + this.gvMx1positionNo.Visible = true; + this.gvMx1positionNo.VisibleIndex = 31; + this.gvMx1positionNo.Width = 94; + // + // gvMx1depotNo + // + this.gvMx1depotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1depotNo.AppearanceCell.Options.UseFont = true; + this.gvMx1depotNo.Caption = "浠撳簱缂栫爜 "; + this.gvMx1depotNo.FieldName = "depotNo"; + this.gvMx1depotNo.MinWidth = 50; + this.gvMx1depotNo.Name = "gvMx1depotNo"; + this.gvMx1depotNo.Tag = "query_a.depot_no"; + this.gvMx1depotNo.Visible = true; + this.gvMx1depotNo.VisibleIndex = 30; + this.gvMx1depotNo.Width = 94; + // + // gvMx1dabhb026 + // + this.gvMx1dabhb026.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb026.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb026.Caption = "璁″垝璺熻釜鍙� "; + this.gvMx1dabhb026.FieldName = "dabhb026"; + this.gvMx1dabhb026.MinWidth = 50; + this.gvMx1dabhb026.Name = "gvMx1dabhb026"; + this.gvMx1dabhb026.Tag = "query_a.dabhb026"; + this.gvMx1dabhb026.Visible = true; + this.gvMx1dabhb026.VisibleIndex = 29; + this.gvMx1dabhb026.Width = 94; + // + // gvMx1dabhb025 + // + this.gvMx1dabhb025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb025.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb025.Caption = "鑴氬瀷 "; + this.gvMx1dabhb025.FieldName = "dabhb025"; + this.gvMx1dabhb025.MinWidth = 50; + this.gvMx1dabhb025.Name = "gvMx1dabhb025"; + this.gvMx1dabhb025.Tag = "query_a.dabhb025"; + this.gvMx1dabhb025.Visible = true; + this.gvMx1dabhb025.VisibleIndex = 28; + this.gvMx1dabhb025.Width = 94; + // + // gvMx1womdaahbNo + // + this.gvMx1womdaahbNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1womdaahbNo.AppearanceCell.Options.UseFont = true; + this.gvMx1womdaahbNo.Caption = "鍚堝苟鍗曞彿 "; + this.gvMx1womdaahbNo.FieldName = "womdaahbNo"; + this.gvMx1womdaahbNo.MinWidth = 50; + this.gvMx1womdaahbNo.Name = "gvMx1womdaahbNo"; + this.gvMx1womdaahbNo.Tag = "query_a.womdaahb_no"; + this.gvMx1womdaahbNo.Visible = true; + this.gvMx1womdaahbNo.VisibleIndex = 27; + this.gvMx1womdaahbNo.Width = 94; + // + // gvMx1dabhb024 + // + this.gvMx1dabhb024.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb024.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb024.Caption = "澶囨枡鏁伴噺 "; + this.gvMx1dabhb024.FieldName = "dabhb024"; + this.gvMx1dabhb024.MinWidth = 50; + this.gvMx1dabhb024.Name = "gvMx1dabhb024"; + this.gvMx1dabhb024.Tag = "query_a.dabhb024"; + this.gvMx1dabhb024.Visible = true; + this.gvMx1dabhb024.VisibleIndex = 26; + this.gvMx1dabhb024.Width = 94; + // + // gvMx1dabhb023 + // + this.gvMx1dabhb023.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb023.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb023.Caption = "鍙戞枡鏂瑰紡 "; + this.gvMx1dabhb023.FieldName = "dabhb023"; + this.gvMx1dabhb023.MinWidth = 50; + this.gvMx1dabhb023.Name = "gvMx1dabhb023"; + this.gvMx1dabhb023.Tag = "query_a.dabhb023"; + this.gvMx1dabhb023.Visible = true; + this.gvMx1dabhb023.VisibleIndex = 25; + this.gvMx1dabhb023.Width = 94; + // + // gvMx1dabhb022 + // + this.gvMx1dabhb022.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb022.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb022.Caption = "鍙戞枡浠撳簱 "; + this.gvMx1dabhb022.FieldName = "dabhb022"; + this.gvMx1dabhb022.MinWidth = 50; + this.gvMx1dabhb022.Name = "gvMx1dabhb022"; + this.gvMx1dabhb022.Tag = "query_a.dabhb022"; + this.gvMx1dabhb022.Visible = true; + this.gvMx1dabhb022.VisibleIndex = 24; + this.gvMx1dabhb022.Width = 94; + // + // gvMx1dabhb021 + // + this.gvMx1dabhb021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb021.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb021.Caption = "浜ゆ帴纭鏍囪瘑 "; + this.gvMx1dabhb021.FieldName = "dabhb021"; + this.gvMx1dabhb021.MinWidth = 50; + this.gvMx1dabhb021.Name = "gvMx1dabhb021"; + this.gvMx1dabhb021.Tag = "query_a.dabhb021"; + this.gvMx1dabhb021.Visible = true; + this.gvMx1dabhb021.VisibleIndex = 23; + this.gvMx1dabhb021.Width = 94; + // + // gvMx1dabhb020 + // + this.gvMx1dabhb020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb020.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb020.Caption = "浜ゆ帴纭鏃堕棿 "; + this.gvMx1dabhb020.FieldName = "dabhb020"; + this.gvMx1dabhb020.MinWidth = 50; + this.gvMx1dabhb020.Name = "gvMx1dabhb020"; + this.gvMx1dabhb020.Tag = "query_a.dabhb020"; + this.gvMx1dabhb020.Visible = true; + this.gvMx1dabhb020.VisibleIndex = 22; + this.gvMx1dabhb020.Width = 94; + // + // gvMx1dabhb019 + // + this.gvMx1dabhb019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb019.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb019.Caption = "浜ゆ帴纭浜� "; + this.gvMx1dabhb019.FieldName = "dabhb019"; + this.gvMx1dabhb019.MinWidth = 50; + this.gvMx1dabhb019.Name = "gvMx1dabhb019"; + this.gvMx1dabhb019.Tag = "query_a.dabhb019"; + this.gvMx1dabhb019.Visible = true; + this.gvMx1dabhb019.VisibleIndex = 21; + this.gvMx1dabhb019.Width = 94; + // + // gvMx1dabhb018 + // + this.gvMx1dabhb018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb018.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb018.Caption = "浠撳簱|鍚嶇О "; + this.gvMx1dabhb018.FieldName = "dabhb018"; + this.gvMx1dabhb018.MinWidth = 50; + this.gvMx1dabhb018.Name = "gvMx1dabhb018"; + this.gvMx1dabhb018.Tag = "query_a.dabhb018"; + this.gvMx1dabhb018.Visible = true; + this.gvMx1dabhb018.VisibleIndex = 20; + this.gvMx1dabhb018.Width = 94; + // + // gvMx1dabhb017 + // + this.gvMx1dabhb017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb017.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb017.Caption = "浠撳簱缂栫爜 "; + this.gvMx1dabhb017.FieldName = "dabhb017"; + this.gvMx1dabhb017.MinWidth = 50; + this.gvMx1dabhb017.Name = "gvMx1dabhb017"; + this.gvMx1dabhb017.Tag = "query_a.dabhb017"; + this.gvMx1dabhb017.Visible = true; + this.gvMx1dabhb017.VisibleIndex = 19; + this.gvMx1dabhb017.Width = 94; + // + // gvMx1dabhb016 + // + this.gvMx1dabhb016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb016.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb016.Caption = "鎶曟枡鍗曞彿 "; + this.gvMx1dabhb016.FieldName = "dabhb016"; + this.gvMx1dabhb016.MinWidth = 50; + this.gvMx1dabhb016.Name = "gvMx1dabhb016"; + this.gvMx1dabhb016.Tag = "query_a.dabhb016"; + this.gvMx1dabhb016.Visible = true; + this.gvMx1dabhb016.VisibleIndex = 18; + this.gvMx1dabhb016.Width = 94; + // + // gvMx1dabhb015 + // + this.gvMx1dabhb015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb015.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb015.Caption = "鐐逛綅 "; + this.gvMx1dabhb015.FieldName = "dabhb015"; + this.gvMx1dabhb015.MinWidth = 50; + this.gvMx1dabhb015.Name = "gvMx1dabhb015"; + this.gvMx1dabhb015.Tag = "query_a.dabhb015"; + this.gvMx1dabhb015.Visible = true; + this.gvMx1dabhb015.VisibleIndex = 17; + this.gvMx1dabhb015.Width = 94; + // + // gvMx1dabhb014 + // + this.gvMx1dabhb014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb014.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb014.Caption = "鏄惁鏇挎枡 "; + this.gvMx1dabhb014.FieldName = "dabhb014"; + this.gvMx1dabhb014.MinWidth = 50; + this.gvMx1dabhb014.Name = "gvMx1dabhb014"; + this.gvMx1dabhb014.Tag = "query_a.dabhb014"; + this.gvMx1dabhb014.Visible = true; + this.gvMx1dabhb014.VisibleIndex = 16; + this.gvMx1dabhb014.Width = 94; + // + // gvMx1dabhb013 + // + this.gvMx1dabhb013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb013.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb013.Caption = "搴曟暟 "; + this.gvMx1dabhb013.FieldName = "dabhb013"; + this.gvMx1dabhb013.MinWidth = 50; + this.gvMx1dabhb013.Name = "gvMx1dabhb013"; + this.gvMx1dabhb013.Tag = "query_a.dabhb013"; + this.gvMx1dabhb013.Visible = true; + this.gvMx1dabhb013.VisibleIndex = 15; + this.gvMx1dabhb013.Width = 94; + // + // gvMx1dabhb012 + // + this.gvMx1dabhb012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb012.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb012.Caption = "缁勬垚鐢ㄩ噺 "; + this.gvMx1dabhb012.FieldName = "dabhb012"; + this.gvMx1dabhb012.MinWidth = 50; + this.gvMx1dabhb012.Name = "gvMx1dabhb012"; + this.gvMx1dabhb012.Tag = "query_a.dabhb012"; + this.gvMx1dabhb012.Visible = true; + this.gvMx1dabhb012.VisibleIndex = 14; + this.gvMx1dabhb012.Width = 94; + // + // gvMx1dabhb011 + // + this.gvMx1dabhb011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb011.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb011.Caption = "涓绘枡 "; + this.gvMx1dabhb011.FieldName = "dabhb011"; + this.gvMx1dabhb011.MinWidth = 50; + this.gvMx1dabhb011.Name = "gvMx1dabhb011"; + this.gvMx1dabhb011.Tag = "query_a.dabhb011"; + this.gvMx1dabhb011.Visible = true; + this.gvMx1dabhb011.VisibleIndex = 13; + this.gvMx1dabhb011.Width = 94; + // + // gvMx1dabhb010 + // + this.gvMx1dabhb010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb010.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb010.Caption = "鏉愭枡绫诲瀷 "; + this.gvMx1dabhb010.FieldName = "dabhb010"; + this.gvMx1dabhb010.MinWidth = 50; + this.gvMx1dabhb010.Name = "gvMx1dabhb010"; + this.gvMx1dabhb010.Tag = "query_a.dabhb010"; + this.gvMx1dabhb010.Visible = true; + this.gvMx1dabhb010.VisibleIndex = 12; + this.gvMx1dabhb010.Width = 94; + // + // gvMx1dabhb009 + // + this.gvMx1dabhb009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb009.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb009.Caption = "鍗曚綅(鍐呯爜) "; + this.gvMx1dabhb009.FieldName = "dabhb009"; + this.gvMx1dabhb009.MinWidth = 50; + this.gvMx1dabhb009.Name = "gvMx1dabhb009"; + this.gvMx1dabhb009.Tag = "query_a.dabhb009"; + this.gvMx1dabhb009.Visible = true; + this.gvMx1dabhb009.VisibleIndex = 11; + this.gvMx1dabhb009.Width = 94; + // + // gvMx1dabhb008 + // + this.gvMx1dabhb008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb008.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb008.Caption = "宸ヨ壓 "; + this.gvMx1dabhb008.FieldName = "dabhb008"; + this.gvMx1dabhb008.MinWidth = 50; + this.gvMx1dabhb008.Name = "gvMx1dabhb008"; + this.gvMx1dabhb008.Tag = "query_a.dabhb008"; + this.gvMx1dabhb008.Visible = true; + this.gvMx1dabhb008.VisibleIndex = 10; + this.gvMx1dabhb008.Width = 94; + // + // gvMx1dabhb007 + // + this.gvMx1dabhb007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb007.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb007.Caption = "宸查鐢ㄩ噺 "; + this.gvMx1dabhb007.FieldName = "dabhb007"; + this.gvMx1dabhb007.MinWidth = 50; + this.gvMx1dabhb007.Name = "gvMx1dabhb007"; + this.gvMx1dabhb007.Tag = "query_a.dabhb007"; + this.gvMx1dabhb007.Visible = true; + this.gvMx1dabhb007.VisibleIndex = 9; + this.gvMx1dabhb007.Width = 94; + // + // gvMx1dabhb006 + // + this.gvMx1dabhb006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb006.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb006.Caption = "闇�棰嗙敤閲� "; + this.gvMx1dabhb006.FieldName = "dabhb006"; + this.gvMx1dabhb006.MinWidth = 50; + this.gvMx1dabhb006.Name = "gvMx1dabhb006"; + this.gvMx1dabhb006.Tag = "query_a.dabhb006"; + this.gvMx1dabhb006.Visible = true; + this.gvMx1dabhb006.VisibleIndex = 8; + this.gvMx1dabhb006.Width = 94; + // + // gvMx1dabhb005 + // + this.gvMx1dabhb005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb005.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb005.Caption = "鐗╂枡|瑙勬牸 "; + this.gvMx1dabhb005.FieldName = "dabhb005"; + this.gvMx1dabhb005.MinWidth = 50; + this.gvMx1dabhb005.Name = "gvMx1dabhb005"; + this.gvMx1dabhb005.Tag = "query_a.dabhb005"; + this.gvMx1dabhb005.Visible = true; + this.gvMx1dabhb005.VisibleIndex = 7; + this.gvMx1dabhb005.Width = 94; + // + // gvMx1dabhb004 + // + this.gvMx1dabhb004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb004.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb004.Caption = "鏉愭枡鍚嶇О "; + this.gvMx1dabhb004.FieldName = "dabhb004"; + this.gvMx1dabhb004.MinWidth = 50; + this.gvMx1dabhb004.Name = "gvMx1dabhb004"; + this.gvMx1dabhb004.Tag = "query_a.dabhb004"; + this.gvMx1dabhb004.Visible = true; + this.gvMx1dabhb004.VisibleIndex = 6; + this.gvMx1dabhb004.Width = 94; + // + // gvMx1dabhb003 + // + this.gvMx1dabhb003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb003.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb003.Caption = "鏉愭枡缂栫爜 "; + this.gvMx1dabhb003.FieldName = "dabhb003"; + this.gvMx1dabhb003.MinWidth = 50; + this.gvMx1dabhb003.Name = "gvMx1dabhb003"; + this.gvMx1dabhb003.Tag = "query_a.dabhb003"; + this.gvMx1dabhb003.Visible = true; + this.gvMx1dabhb003.VisibleIndex = 5; + this.gvMx1dabhb003.Width = 94; + // + // gvMx1dabhb002 + // + this.gvMx1dabhb002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb002.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb002.Caption = "搴忓彿 "; + this.gvMx1dabhb002.FieldName = "dabhb002"; + this.gvMx1dabhb002.MinWidth = 50; + this.gvMx1dabhb002.Name = "gvMx1dabhb002"; + this.gvMx1dabhb002.Tag = "query_a.dabhb002"; + this.gvMx1dabhb002.Visible = true; + this.gvMx1dabhb002.VisibleIndex = 4; + this.gvMx1dabhb002.Width = 94; + // + // gvMx1dabhb001 + // + this.gvMx1dabhb001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1dabhb001.AppearanceCell.Options.UseFont = true; + this.gvMx1dabhb001.Caption = "宸ュ崟鍗曞彿 "; + this.gvMx1dabhb001.FieldName = "dabhb001"; + this.gvMx1dabhb001.MinWidth = 50; + this.gvMx1dabhb001.Name = "gvMx1dabhb001"; + this.gvMx1dabhb001.Tag = "query_a.dabhb001"; + this.gvMx1dabhb001.Visible = true; + this.gvMx1dabhb001.VisibleIndex = 3; + this.gvMx1dabhb001.Width = 94; + // + // gvMx1pid + // + this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1pid.AppearanceCell.Options.UseFont = true; + this.gvMx1pid.Caption = "pid "; + this.gvMx1pid.FieldName = "pid"; + this.gvMx1pid.MinWidth = 50; + this.gvMx1pid.Name = "gvMx1pid"; + this.gvMx1pid.Tag = "query_a.pid"; + this.gvMx1pid.Visible = true; + this.gvMx1pid.VisibleIndex = 2; + this.gvMx1pid.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.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; + // + // gvMx1guid + // + this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gvMx1guid.AppearanceCell.Options.UseFont = true; + 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; + // + // tabMxPage1 + // + this.tabMxPage1.Controls.Add(this.gcMx1); + this.tabMxPage1.Name = "tabMxPage1"; + this.tabMxPage1.Size = new System.Drawing.Size(1124, 415); + this.tabMxPage1.Text = "鏄庣粏1"; + // + // gcMx1 + // + this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMx1.Location = new System.Drawing.Point(0, 0); + this.gcMx1.MainView = this.gvMx1; + this.gcMx1.Name = "gcMx1"; + this.gcMx1.Size = new System.Drawing.Size(1124, 415); + this.gcMx1.TabIndex = 0; + this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gvMx1}); + // + // gvMx1 + // + this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gvMx1guid, + this.gvMx1id, + this.gvMx1pid, + this.gvMx1dabhb001, + this.gvMx1dabhb002, + this.gvMx1dabhb003, + this.gvMx1dabhb004, + this.gvMx1dabhb005, + this.gvMx1dabhb006, + this.gvMx1dabhb007, + this.gvMx1dabhb008, + this.gvMx1dabhb009, + this.gvMx1dabhb010, + this.gvMx1dabhb011, + this.gvMx1dabhb012, + this.gvMx1dabhb013, + this.gvMx1dabhb014, + this.gvMx1dabhb015, + this.gvMx1dabhb016, + this.gvMx1dabhb017, + this.gvMx1dabhb018, + this.gvMx1dabhb019, + this.gvMx1dabhb020, + this.gvMx1dabhb021, + this.gvMx1dabhb022, + this.gvMx1dabhb023, + this.gvMx1dabhb024, + this.gvMx1womdaahbNo, + this.gvMx1dabhb025, + this.gvMx1dabhb026, + this.gvMx1depotNo, + this.gvMx1positionNo, + this.gvMx1lot, + this.gvMx1mtono}); + this.gvMx1.GridControl = this.gcMx1; + this.gvMx1.Name = "gvMx1"; + this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; + this.gvMx1.OptionsFind.ShowSearchNavButtons = false; + this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; + this.gvMx1.OptionsView.ShowGroupPanel = false; + // + // gv_depotNo + // + this.gv_depotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_depotNo.AppearanceCell.Options.UseFont = true; + this.gv_depotNo.Caption = "浠撳簱缂栫爜"; + this.gv_depotNo.FieldName = "depotNo"; + this.gv_depotNo.MinWidth = 50; + this.gv_depotNo.Name = "gv_depotNo"; + this.gv_depotNo.OptionsColumn.AllowEdit = false; + this.gv_depotNo.Tag = "query_a.depot_no"; + this.gv_depotNo.Visible = true; + this.gv_depotNo.VisibleIndex = 9; + this.gv_depotNo.Width = 94; + // + // lb_freezeFlag + // + this.lb_freezeFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_freezeFlag.Appearance.Options.UseFont = true; + this.lb_freezeFlag.Location = new System.Drawing.Point(450, 89); + this.lb_freezeFlag.Name = "lb_freezeFlag"; + this.lb_freezeFlag.Size = new System.Drawing.Size(68, 21); + this.lb_freezeFlag.TabIndex = 298; + this.lb_freezeFlag.Text = "鍚堝苟鍐荤粨"; + // + // gv_freezeFlag + // + this.gv_freezeFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_freezeFlag.AppearanceCell.Options.UseFont = true; + this.gv_freezeFlag.Caption = "鍚堝苟鍐荤粨鏍囪瘑"; + this.gv_freezeFlag.FieldName = "freezeFlag"; + this.gv_freezeFlag.MinWidth = 50; + this.gv_freezeFlag.Name = "gv_freezeFlag"; + this.gv_freezeFlag.OptionsColumn.AllowEdit = false; + this.gv_freezeFlag.Tag = "query_a.freeze_flag"; + this.gv_freezeFlag.Visible = true; + this.gv_freezeFlag.VisibleIndex = 3; + this.gv_freezeFlag.Width = 94; + // + // gv_daahb013name + // + this.gv_daahb013name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_daahb013name.AppearanceCell.Options.UseFont = true; + this.gv_daahb013name.Caption = "宸ヤ綔杞﹂棿"; + this.gv_daahb013name.FieldName = "daahb013name"; + this.gv_daahb013name.MinWidth = 50; + this.gv_daahb013name.Name = "gv_daahb013name"; + this.gv_daahb013name.OptionsColumn.AllowEdit = false; + this.gv_daahb013name.Tag = "query_a.daahb013name"; + this.gv_daahb013name.Visible = true; + this.gv_daahb013name.VisibleIndex = 7; + this.gv_daahb013name.Width = 94; + // + // gv_daahb022 + // + this.gv_daahb022.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_daahb022.AppearanceCell.Options.UseFont = true; + this.gv_daahb022.Caption = "鍙戞枡瀹屾垚"; + this.gv_daahb022.FieldName = "daahb022"; + this.gv_daahb022.MinWidth = 50; + this.gv_daahb022.Name = "gv_daahb022"; + this.gv_daahb022.OptionsColumn.AllowEdit = false; + this.gv_daahb022.Tag = "query_a.daahb022"; + this.gv_daahb022.Visible = true; + this.gv_daahb022.VisibleIndex = 4; + this.gv_daahb022.Width = 94; + // + // lb_createBy + // + this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_createBy.Appearance.Options.UseFont = true; + this.lb_createBy.Location = new System.Drawing.Point(620, 16); + this.lb_createBy.Name = "lb_createBy"; + this.lb_createBy.Size = new System.Drawing.Size(51, 21); + this.lb_createBy.TabIndex = 280; + this.lb_createBy.Text = "鍒涘缓浜�"; + // + // txt_createBy + // + this.txt_createBy.Location = new System.Drawing.Point(680, 12); + this.txt_createBy.Name = "txt_createBy"; + this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_createBy.Properties.Appearance.Options.UseFont = true; + this.txt_createBy.Size = new System.Drawing.Size(170, 28); + this.txt_createBy.TabIndex = 280; + // + // gv_createBy + // + this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createBy.AppearanceCell.Options.UseFont = true; + this.gv_createBy.Caption = "鍒涘缓浜�"; + this.gv_createBy.FieldName = "createBy"; + this.gv_createBy.MinWidth = 50; + this.gv_createBy.Name = "gv_createBy"; + this.gv_createBy.OptionsColumn.AllowEdit = false; + this.gv_createBy.Tag = "query_a.create_by"; + this.gv_createBy.Visible = true; + this.gv_createBy.VisibleIndex = 10; + this.gv_createBy.Width = 94; + // + // gv_daahb020 + // + this.gv_daahb020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_daahb020.AppearanceCell.Options.UseFont = true; + this.gv_daahb020.Caption = "绾垮埆缂栫爜"; + this.gv_daahb020.FieldName = "daahb020"; + this.gv_daahb020.MinWidth = 50; + this.gv_daahb020.Name = "gv_daahb020"; + this.gv_daahb020.OptionsColumn.AllowEdit = false; + this.gv_daahb020.Tag = "query_a.daahb020"; + this.gv_daahb020.Visible = true; + this.gv_daahb020.VisibleIndex = 15; + this.gv_daahb020.Width = 94; + // + // lb_checkUser + // + this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_checkUser.Appearance.Options.UseFont = true; + this.lb_checkUser.Location = new System.Drawing.Point(342, 16); + this.lb_checkUser.Name = "lb_checkUser"; + this.lb_checkUser.Size = new System.Drawing.Size(56, 21); + this.lb_checkUser.TabIndex = 262; + this.lb_checkUser.Text = "瀹℃牳浜� "; + // + // txt_checkUser + // + this.txt_checkUser.Location = new System.Drawing.Point(404, 12); + this.txt_checkUser.Name = "txt_checkUser"; + this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_checkUser.Properties.Appearance.Options.UseFont = true; + this.txt_checkUser.Size = new System.Drawing.Size(162, 28); + this.txt_checkUser.TabIndex = 262; + // + // gv_checkUser + // + this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_checkUser.AppearanceCell.Options.UseFont = true; + this.gv_checkUser.Caption = "瀹℃牳浜�"; + this.gv_checkUser.FieldName = "checkUser"; + this.gv_checkUser.MinWidth = 50; + this.gv_checkUser.Name = "gv_checkUser"; + this.gv_checkUser.OptionsColumn.AllowEdit = false; + this.gv_checkUser.Tag = "query_a.check_user"; + this.gv_checkUser.Visible = true; + this.gv_checkUser.VisibleIndex = 14; + this.gv_checkUser.Width = 94; + // + // lb_checkDate + // + this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_checkDate.Appearance.Options.UseFont = true; + this.lb_checkDate.Location = new System.Drawing.Point(325, 54); + this.lb_checkDate.Name = "lb_checkDate"; + this.lb_checkDate.Size = new System.Drawing.Size(73, 21); + this.lb_checkDate.TabIndex = 258; + this.lb_checkDate.Text = "瀹℃牳鏃ユ湡 "; + // + // txt_checkDate + // + this.txt_checkDate.Location = new System.Drawing.Point(404, 50); + this.txt_checkDate.Name = "txt_checkDate"; + this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_checkDate.Properties.Appearance.Options.UseFont = true; + this.txt_checkDate.Size = new System.Drawing.Size(162, 28); + this.txt_checkDate.TabIndex = 258; + // + // gv_checkDate + // + this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_checkDate.AppearanceCell.Options.UseFont = true; + this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡"; + this.gv_checkDate.FieldName = "checkDate"; + this.gv_checkDate.MinWidth = 50; + this.gv_checkDate.Name = "gv_checkDate"; + this.gv_checkDate.OptionsColumn.AllowEdit = false; + this.gv_checkDate.Tag = "query_a.check_date"; + this.gv_checkDate.Visible = true; + this.gv_checkDate.VisibleIndex = 13; + this.gv_checkDate.Width = 94; + // + // lb_fstatus + // + this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_fstatus.Appearance.Options.UseFont = true; + this.lb_fstatus.Location = new System.Drawing.Point(342, 89); + this.lb_fstatus.Name = "lb_fstatus"; + this.lb_fstatus.Size = new System.Drawing.Size(56, 21); + this.lb_fstatus.TabIndex = 252; + this.lb_fstatus.Text = "瀹℃牳鐮� "; + // + // gv_fstatus + // + this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_fstatus.AppearanceCell.Options.UseFont = true; + this.gv_fstatus.Caption = "瀹℃牳鐮�"; + this.gv_fstatus.FieldName = "fstatus"; + this.gv_fstatus.MinWidth = 50; + this.gv_fstatus.Name = "gv_fstatus"; + this.gv_fstatus.OptionsColumn.AllowEdit = false; + this.gv_fstatus.Tag = "query_a.fstatus"; + this.gv_fstatus.Visible = true; + this.gv_fstatus.VisibleIndex = 2; + this.gv_fstatus.Width = 94; + // + // lb_daahb015 + // + this.lb_daahb015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_daahb015.Appearance.Options.UseFont = true; + this.lb_daahb015.Location = new System.Drawing.Point(12, 93); + this.lb_daahb015.Name = "lb_daahb015"; + this.lb_daahb015.Size = new System.Drawing.Size(68, 21); + this.lb_daahb015.TabIndex = 247; + this.lb_daahb015.Text = "閫夋嫨浜х嚎"; + // + // gv_daahb015 + // + this.gv_daahb015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_daahb015.AppearanceCell.Options.UseFont = true; + this.gv_daahb015.Caption = "鐢熶骇绾垮埆"; + this.gv_daahb015.FieldName = "daahb015"; + this.gv_daahb015.MinWidth = 50; + this.gv_daahb015.Name = "gv_daahb015"; + this.gv_daahb015.OptionsColumn.AllowEdit = false; + this.gv_daahb015.Tag = "query_a.daahb015"; + this.gv_daahb015.Visible = true; + this.gv_daahb015.VisibleIndex = 8; + this.gv_daahb015.Width = 94; + // + // lb_daahb013 + // + this.lb_daahb013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_daahb013.Appearance.Options.UseFont = true; + this.lb_daahb013.Location = new System.Drawing.Point(12, 58); + this.lb_daahb013.Name = "lb_daahb013"; + this.lb_daahb013.Size = new System.Drawing.Size(68, 21); + this.lb_daahb013.TabIndex = 243; + this.lb_daahb013.Text = "閫夋嫨杞﹂棿"; + // + // gv_daahb013 + // + this.gv_daahb013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_daahb013.AppearanceCell.Options.UseFont = true; + this.gv_daahb013.Caption = "宸ヤ綔杞﹂棿缂栫爜"; + this.gv_daahb013.FieldName = "daahb013"; + this.gv_daahb013.MinWidth = 50; + this.gv_daahb013.Name = "gv_daahb013"; + this.gv_daahb013.OptionsColumn.AllowEdit = false; + this.gv_daahb013.Tag = "query_a.daahb013"; + this.gv_daahb013.Visible = true; + this.gv_daahb013.VisibleIndex = 6; + this.gv_daahb013.Width = 94; + // + // lb_daahb009 + // + this.lb_daahb009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_daahb009.Appearance.Options.UseFont = true; + this.lb_daahb009.Location = new System.Drawing.Point(632, 93); + this.lb_daahb009.Name = "lb_daahb009"; + this.lb_daahb009.Size = new System.Drawing.Size(39, 21); + this.lb_daahb009.TabIndex = 240; + this.lb_daahb009.Text = "澶囨敞 "; + // + // txt_daahb009 + // + this.txt_daahb009.Location = new System.Drawing.Point(680, 89); + this.txt_daahb009.Name = "txt_daahb009"; + this.txt_daahb009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_daahb009.Properties.Appearance.Options.UseFont = true; + this.txt_daahb009.Size = new System.Drawing.Size(172, 28); + this.txt_daahb009.TabIndex = 240; + // + // gv_daahb009 + // + this.gv_daahb009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_daahb009.AppearanceCell.Options.UseFont = true; + this.gv_daahb009.Caption = "澶囨敞"; + this.gv_daahb009.FieldName = "daahb009"; + this.gv_daahb009.MinWidth = 50; + this.gv_daahb009.Name = "gv_daahb009"; + this.gv_daahb009.OptionsColumn.AllowEdit = false; + this.gv_daahb009.Tag = "query_a.daahb009"; + this.gv_daahb009.Visible = true; + this.gv_daahb009.VisibleIndex = 12; + this.gv_daahb009.Width = 94; + // + // lb_createDate + // + this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_createDate.Appearance.Options.UseFont = true; + this.lb_createDate.Location = new System.Drawing.Point(603, 54); + this.lb_createDate.Name = "lb_createDate"; + this.lb_createDate.Size = new System.Drawing.Size(68, 21); + this.lb_createDate.TabIndex = 228; + this.lb_createDate.Text = "鍒涘缓鏃堕棿"; + // + // txt_createDate + // + this.txt_createDate.Location = new System.Drawing.Point(680, 50); + this.txt_createDate.Name = "txt_createDate"; + this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_createDate.Properties.Appearance.Options.UseFont = true; + this.txt_createDate.Size = new System.Drawing.Size(170, 28); + this.txt_createDate.TabIndex = 228; + // + // gv_createDate + // + this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_createDate.AppearanceCell.Options.UseFont = true; + this.gv_createDate.Caption = "鍒涘缓鏃堕棿"; + this.gv_createDate.FieldName = "createDate"; + this.gv_createDate.MinWidth = 50; + this.gv_createDate.Name = "gv_createDate"; + this.gv_createDate.OptionsColumn.AllowEdit = false; + this.gv_createDate.Tag = "query_a.create_date"; + this.gv_createDate.Visible = true; + this.gv_createDate.VisibleIndex = 11; + this.gv_createDate.Width = 94; + // + // lb_womdaahbNo + // + this.lb_womdaahbNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lb_womdaahbNo.Appearance.Options.UseFont = true; + this.lb_womdaahbNo.Location = new System.Drawing.Point(41, 20); + this.lb_womdaahbNo.Name = "lb_womdaahbNo"; + this.lb_womdaahbNo.Size = new System.Drawing.Size(39, 21); + this.lb_womdaahbNo.TabIndex = 213; + this.lb_womdaahbNo.Text = "鍗曞彿 "; + // + // txt_womdaahbNo + // + this.txt_womdaahbNo.Location = new System.Drawing.Point(89, 16); + this.txt_womdaahbNo.Name = "txt_womdaahbNo"; + this.txt_womdaahbNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.txt_womdaahbNo.Properties.Appearance.Options.UseFont = true; + this.txt_womdaahbNo.Size = new System.Drawing.Size(188, 28); + this.txt_womdaahbNo.TabIndex = 213; + // + // gv_womdaahbNo + // + this.gv_womdaahbNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); + this.gv_womdaahbNo.AppearanceCell.Options.UseFont = true; + this.gv_womdaahbNo.Caption = "鍗曞彿"; + this.gv_womdaahbNo.FieldName = "womdaahbNo"; + this.gv_womdaahbNo.MinWidth = 50; + this.gv_womdaahbNo.Name = "gv_womdaahbNo"; + this.gv_womdaahbNo.OptionsColumn.AllowEdit = false; + this.gv_womdaahbNo.Tag = "query_a.womdaahb_no"; + this.gv_womdaahbNo.Visible = true; + this.gv_womdaahbNo.VisibleIndex = 5; + this.gv_womdaahbNo.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; + // + // toolBarMenu1 + // + this.toolBarMenu1.chkParameter = null; + this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top; + this.toolBarMenu1.guidKey = null; + this.toolBarMenu1.isSetBtn = false; + this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); + this.toolBarMenu1.Name = "toolBarMenu1"; + this.toolBarMenu1.rptParameter = null; + this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80); + this.toolBarMenu1.TabIndex = 0; + this.toolBarMenu1.xlsInService = null; + this.toolBarMenu1.xlsOutParameter = null; + // + // gcMain + // + this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F); + this.gcMain.Location = new System.Drawing.Point(0, 0); + this.gcMain.MainView = this.gridView1; + this.gcMain.Name = "gcMain"; + this.gcMain.Size = new System.Drawing.Size(1126, 532); + this.gcMain.TabIndex = 1; + this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { + this.gridView1}); + // + // gridView1 + // + this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); + this.gridView1.Appearance.Row.Options.UseFont = true; + this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gv_guid, + this.gv_id, + this.gv_fstatus, + this.gv_freezeFlag, + this.gv_daahb022, + this.gv_womdaahbNo, + this.gv_daahb013, + this.gv_daahb013name, + this.gv_daahb015, + this.gv_depotNo, + this.gv_createBy, + this.gv_createDate, + this.gv_daahb009, + this.gv_checkDate, + this.gv_checkUser, + this.gv_daahb020}); + this.gridView1.GridControl = this.gcMain; + this.gridView1.IndicatorWidth = 50; + this.gridView1.Name = "gridView1"; + this.gridView1.OptionsFind.ShowSearchNavButtons = false; + this.gridView1.OptionsView.ShowAutoFilterRow = true; + this.gridView1.OptionsView.ShowGroupPanel = false; + // + // xtraTabControl1 + // + this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.xtraTabControl1.Location = new System.Drawing.Point(0, 80); + this.xtraTabControl1.Name = "xtraTabControl1"; + this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1; + this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602); + this.xtraTabControl1.TabIndex = 3; + this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.xtraTabPage1, + this.xtraTabPage2}); + // + // xtraTabPage1 + // + this.xtraTabPage1.Controls.Add(this.gcMain); + this.xtraTabPage1.Controls.Add(this.pageBar1); + this.xtraTabPage1.Name = "xtraTabPage1"; + this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage1.Text = "鏁版嵁鏌ヨ"; + // + // pageBar1 + // + this.pageBar1.CurrentPage = 1; + this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pageBar1.Location = new System.Drawing.Point(0, 532); + this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); + this.pageBar1.Name = "pageBar1"; + this.pageBar1.RecordCount = 0; + this.pageBar1.RowsCount = 50; + this.pageBar1.Size = new System.Drawing.Size(1126, 38); + this.pageBar1.TabIndex = 3; + this.pageBar1.TotalPages = 0; + // + // xtraTabPage2 + // + this.xtraTabPage2.Controls.Add(this.tabMx); + this.xtraTabPage2.Controls.Add(this.panel1); + this.xtraTabPage2.Name = "xtraTabPage2"; + this.xtraTabPage2.PageEnabled = false; + this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570); + this.xtraTabPage2.Text = "鏁版嵁缂栬緫"; + // + // tabMx + // + this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabMx.Location = new System.Drawing.Point(0, 123); + this.tabMx.Name = "tabMx"; + this.tabMx.SelectedTabPage = this.tabMxPage1; + this.tabMx.Size = new System.Drawing.Size(1126, 447); + this.tabMx.TabIndex = 2; + this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { + this.tabMxPage1, + this.tabMxPage2, + this.xtraTabPage3, + this.xtraTabPage4}); + // + // xtraTabPage3 + // + this.xtraTabPage3.Name = "xtraTabPage3"; + this.xtraTabPage3.Size = new System.Drawing.Size(1124, 415); + this.xtraTabPage3.Text = "宸ュ崟棰嗘枡鏄庣粏"; + // + // xtraTabPage4 + // + this.xtraTabPage4.Name = "xtraTabPage4"; + this.xtraTabPage4.Size = new System.Drawing.Size(1124, 415); + this.xtraTabPage4.Text = "鍚堝苟鏄庣粏"; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_daahb015); + this.panel1.Controls.Add(this.txt_daahb013); + this.panel1.Controls.Add(this.txt_freezeFlag); + this.panel1.Controls.Add(this.txt_fstatus); + this.panel1.Controls.Add(this.labelControl11); + this.panel1.Controls.Add(this.lbGuid); + this.panel1.Controls.Add(this.lb_freezeFlag); + this.panel1.Controls.Add(this.lb_createBy); + this.panel1.Controls.Add(this.txt_createBy); + this.panel1.Controls.Add(this.lb_checkUser); + this.panel1.Controls.Add(this.txt_checkUser); + this.panel1.Controls.Add(this.lb_checkDate); + this.panel1.Controls.Add(this.txt_checkDate); + this.panel1.Controls.Add(this.lb_fstatus); + this.panel1.Controls.Add(this.lb_daahb015); + this.panel1.Controls.Add(this.lb_daahb013); + this.panel1.Controls.Add(this.lb_daahb009); + this.panel1.Controls.Add(this.txt_daahb009); + this.panel1.Controls.Add(this.lb_createDate); + this.panel1.Controls.Add(this.txt_createDate); + this.panel1.Controls.Add(this.lb_womdaahbNo); + this.panel1.Controls.Add(this.txt_womdaahbNo); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(1126, 123); + this.panel1.TabIndex = 1; + // + // txt_daahb015 + // + this.txt_daahb015.IsReadly = false; + this.txt_daahb015.KeyFile = ""; + this.txt_daahb015.Location = new System.Drawing.Point(89, 89); + this.txt_daahb015.Name = "txt_daahb015"; + this.txt_daahb015.Size = new System.Drawing.Size(188, 28); + this.txt_daahb015.TabIndex = 302; + // + // txt_daahb013 + // + this.txt_daahb013.IsReadly = false; + this.txt_daahb013.KeyFile = ""; + this.txt_daahb013.Location = new System.Drawing.Point(89, 54); + this.txt_daahb013.Name = "txt_daahb013"; + this.txt_daahb013.Size = new System.Drawing.Size(188, 28); + this.txt_daahb013.TabIndex = 301; + // + // txt_freezeFlag + // + this.txt_freezeFlag.Location = new System.Drawing.Point(522, 87); + this.txt_freezeFlag.Name = "txt_freezeFlag"; + this.txt_freezeFlag.Properties.Caption = ""; + this.txt_freezeFlag.Size = new System.Drawing.Size(44, 24); + this.txt_freezeFlag.TabIndex = 300; + // + // txt_fstatus + // + this.txt_fstatus.Location = new System.Drawing.Point(404, 87); + this.txt_fstatus.Name = "txt_fstatus"; + this.txt_fstatus.Properties.Caption = ""; + this.txt_fstatus.Size = new System.Drawing.Size(40, 24); + this.txt_fstatus.TabIndex = 299; + // + // labelControl11 + // + this.labelControl11.Location = new System.Drawing.Point(896, 89); + this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.labelControl11.Name = "labelControl11"; + this.labelControl11.Size = new System.Drawing.Size(45, 18); + this.labelControl11.TabIndex = 130; + this.labelControl11.Text = "涓婚敭锛�"; + // + // lbGuid + // + this.lbGuid.AutoSize = true; + this.lbGuid.Location = new System.Drawing.Point(947, 89); + this.lbGuid.Name = "lbGuid"; + this.lbGuid.Size = new System.Drawing.Size(0, 21); + this.lbGuid.TabIndex = 1; + // + // Frm_MesWomdaahb + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1128, 682); + this.Controls.Add(this.xtraTabControl1); + this.Controls.Add(this.toolBarMenu1); + this.Name = "Frm_MesWomdaahb"; + this.tabMxPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); + this.tabMxPage1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_daahb009.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_womdaahbNo.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); + this.xtraTabControl1.ResumeLayout(false); + this.xtraTabPage1.ResumeLayout(false); + this.xtraTabPage2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); + this.tabMx.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.txt_freezeFlag.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit(); + this.ResumeLayout(false); + + } + #endregion + private UserControl.UcToolBarMenu toolBarMenu1; + private DevExpress.XtraGrid.GridControl gcMain; + private DevExpress.XtraGrid.Views.Grid.GridView gridView1; + private DevExpress.XtraTab.XtraTabControl xtraTabControl1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage1; + private DevExpress.XtraTab.XtraTabPage xtraTabPage2; + private UserControls.Data.UcPageBar pageBar1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lbGuid; + private DevExpress.XtraEditors.LabelControl labelControl11; + private DevExpress.XtraTab.XtraTabControl tabMx; + + //BQCreateConrolObejct + private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemId; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2xh; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa021; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa014; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa024; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa015; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa009; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa008; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa007; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa006; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa005; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa004; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa003; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2daa002; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2pworkNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbomNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2womdaahbNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2mid; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2id; + private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid; + private DevExpress.XtraTab.XtraTabPage tabMxPage2; + private DevExpress.XtraGrid.GridControl gcMx2; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx2; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtono; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1positionNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb026; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb025; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1womdaahbNo; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb024; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb023; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb022; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb021; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb020; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb019; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb018; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb017; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb016; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb015; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb014; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb013; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb012; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb011; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb010; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb009; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb008; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb007; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb006; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb005; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb004; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb003; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb002; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1dabhb001; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1id; + private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid; + private DevExpress.XtraTab.XtraTabPage tabMxPage1; + private DevExpress.XtraGrid.GridControl gcMx1; + private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; + private DevExpress.XtraGrid.Columns.GridColumn gv_depotNo; + +private DevExpress.XtraEditors.LabelControl lb_freezeFlag; + private DevExpress.XtraGrid.Columns.GridColumn gv_freezeFlag; + private DevExpress.XtraGrid.Columns.GridColumn gv_daahb013name; + private DevExpress.XtraGrid.Columns.GridColumn gv_daahb022; + +private DevExpress.XtraEditors.LabelControl lb_createBy; +private DevExpress.XtraEditors.TextEdit txt_createBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; + private DevExpress.XtraGrid.Columns.GridColumn gv_daahb020; + +private DevExpress.XtraEditors.LabelControl lb_checkUser; +private DevExpress.XtraEditors.TextEdit txt_checkUser; + private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser; + +private DevExpress.XtraEditors.LabelControl lb_checkDate; +private DevExpress.XtraEditors.TextEdit txt_checkDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; + +private DevExpress.XtraEditors.LabelControl lb_fstatus; + private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus; + +private DevExpress.XtraEditors.LabelControl lb_daahb015; + private DevExpress.XtraGrid.Columns.GridColumn gv_daahb015; + +private DevExpress.XtraEditors.LabelControl lb_daahb013; + private DevExpress.XtraGrid.Columns.GridColumn gv_daahb013; + +private DevExpress.XtraEditors.LabelControl lb_daahb009; +private DevExpress.XtraEditors.TextEdit txt_daahb009; + private DevExpress.XtraGrid.Columns.GridColumn gv_daahb009; + +private DevExpress.XtraEditors.LabelControl lb_createDate; +private DevExpress.XtraEditors.TextEdit txt_createDate; + private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; + +private DevExpress.XtraEditors.LabelControl lb_womdaahbNo; +private DevExpress.XtraEditors.TextEdit txt_womdaahbNo; + private DevExpress.XtraGrid.Columns.GridColumn gv_womdaahbNo; + private DevExpress.XtraGrid.Columns.GridColumn gv_id; + private DevExpress.XtraGrid.Columns.GridColumn gv_guid; + private DevExpress.XtraEditors.CheckEdit txt_freezeFlag; + private DevExpress.XtraEditors.CheckEdit txt_fstatus; + private DevExpress.XtraTab.XtraTabPage xtraTabPage3; + private DevExpress.XtraTab.XtraTabPage xtraTabPage4; + private UserControl.UcLookWorkshop txt_daahb013; + private UserControl.UcLookWorkline txt_daahb015; + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs new file mode 100644 index 0000000..044ca8f --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs @@ -0,0 +1,336 @@ +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Gs.DevApp.UserControl; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.Data; +using System.Drawing; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.DevFrm +{ + public partial class Frm_MesWomdaahb : DevExpress.XtraEditors.XtraForm + { + string _webServiceName = "MesWomdaahbManager/"; + List<FilterEntity> _filterList = new List<FilterEntity>(); + public Frm_MesWomdaahb() + { + InitializeComponent(); + this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; + this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; + this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; + this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; + this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; + this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; + this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; + gcMain.MouseDoubleClick += GcMain_MouseDoubleClick; + getPageList(1); + pageBar1.PagerEvent += PageBar1_PagerEvent; + Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1); + gridView1.CustomDrawRowIndicator += (s, e) => + { + if (e.Info.IsRowIndicator && e.RowHandle >= 0) + { + e.Info.DisplayText = (e.RowHandle + 1).ToString(); + } + }; + gridView1.CustomDrawEmptyForeground += (s, e) => + { + string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!"; + Font f = new Font("寰蒋闆呴粦", 16); + Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); + e.Graphics.DrawString(str, f, Brushes.Gray, r); + }; + + txt_daahb013.KeyFile = "guid"; + txt_daahb013.EditChanged += Txt_daahb013_EditChanged; + txt_daahb015.KeyFile = "guid"; + + } + + private void Txt_daahb013_EditChanged(object sender, EventArgs e) + { + txt_daahb015.getSuppler(txt_daahb013.GetId()); + } + + private async void GridView1_ColumnFilterChanged(object sender, EventArgs e) + { + _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns); + await Task.Delay(100); + getPageList(1); + } + /// <summary> + /// 鍙屽嚮浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e) + { + string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid"); + if (!string.IsNullOrEmpty(rowGuid)) + getModel(rowGuid, false, 999); + } + /// <summary> + /// 鍒嗛〉浜嬩欢 + /// </summary> + /// <param name="curPage"></param> + /// <param name="pageSize"></param> + private void PageBar1_PagerEvent(int curPage, int pageSize) + { + getPageList(curPage); + } + /// <summary> + /// 鏌ヨ浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + var frm = new ShowFilter(gridView1.Columns, _filterList); + frm.UpdateParent += Frm_UpdateParent; + frm.ShowDialog(); + } + /// <summary> + /// 鏌ヨ鍥炶皟 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void Frm_UpdateParent(object sender, UpdateParentEventArgs e) + { + _filterList = e.FilterList; + getPageList(1); + } + + /// <summary> + /// 鍙栨秷浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEscClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + } + + /// <summary> + /// 鍒犻櫎浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) + return; + List<dynamic> lst = new List<dynamic>(); + lst.Add(rowGuid); + var _obj = lst; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + UtilityHelper.JumpToTab(xtraTabControl1, 0); + getPageList(1); + } + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// 鍒锋柊浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + getModel(lbGuid.Text.Trim(), false, 999); + else + { + _filterList.Clear(); + if (gridView1.ActiveFilter.Count > 0) + { + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + gridView1.ActiveFilter.Clear(); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + } + getPageList(1); + } + } + /// <summary> + /// 淇敼浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) + { + string rowGuid = "", rowName = ""; + // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); + if (string.IsNullOrEmpty(rowGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + getModel(rowGuid, true, 1); + } + /// <summary> + /// 鏂板浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnAddClick(object sender, EventArgs e) + { + UtilityHelper.JumpToTab(xtraTabControl1, 1); + lbGuid.Text = ""; + List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); + gridViews.Add(gvMx1); + UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews); + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + /// <summary> + /// 淇濆瓨浜嬩欢 + /// </summary> + /// <param name="sender"></param> + /// <param name="e"></param> + private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) + { + toolBarMenu1.isSetBtn = false; + //if (string.IsNullOrEmpty(txt_account.Text.Trim())) + { + Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�"); + // txt_account.Focus(); + return; + } + var _obj = new + { + guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓 + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + if (_rtn.rtnCode > 0) + { + lbGuid.Text = _rtn.rtnData; + toolBarMenu1.isSetBtn = true; + UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + /// <summary> + /// + /// </summary> + /// <param name="curPage">绗嚑椤�</param> + /// <param name="pageSize">姣忛〉鍑犳潯</param> + private async void getPageList(int curPage) + { + UcLoading _loading = new UcLoading(); + var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); + string json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetListPage", json); + ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn); + if (dd.rtnCode > 0) + { + DataTable dt = dd.rtnData.list; + gcMain.BindingContext = new BindingContext(); + gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged; + if (dt.Rows.Count > 0) + { + gcMain.DataSource = dt; + gcMain.ForceInitialize(); + } + else + UtilityHelper.SetDefaultTable(gcMain, gridView1); + gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged; + pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 + pageBar1.CurrentPage = curPage;//褰撳墠椤� + pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 + } + else + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg); + } + } + catch (Exception ex) + { + ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); + } + _loading.Stop(); + } + private void getModel(string strGuid, bool isEdit, int tabIdx) + { + if (string.IsNullOrEmpty(strGuid)) + { + ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + UtilityHelper.JumpToTab(xtraTabControl1, tabIdx); + var _obj = new + { + guid = strGuid,//涓诲缓 + }; + try + { + string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj)); + ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); + if (_rtn.rtnCode > 0) + { + dynamic dy = _rtn.rtnData; + lbGuid.Text = strGuid; + 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"]) + { + array.Add(a); + } + DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString()); + if (dt.Rows.Count > 0) + { + gcMx1.BindingContext = new BindingContext(); + gcMx1.DataSource = dt; + gcMx1.ForceInitialize(); + } + else + { + Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + } + else + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg); + } + catch (Exception ex) + { + ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx new file mode 100644 index 0000000..d58980a --- /dev/null +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.resx @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs index 51bcd9e..36f679a 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs @@ -49,6 +49,10 @@ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_closeType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_forceCloserid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_saleOrderEntryseq = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -72,7 +76,6 @@ this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_caa021 = new DevExpress.XtraEditors.LabelControl(); - this.txt_caa021 = new DevExpress.XtraEditors.TextEdit(); this.gv_caa021 = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_caa020 = new DevExpress.XtraEditors.LabelControl(); this.txt_caa020 = new DevExpress.XtraEditors.TextEdit(); @@ -130,10 +133,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); - this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -141,7 +141,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_caa021.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).BeginInit(); @@ -431,6 +430,42 @@ this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom; this.gvMx1.OptionsView.ShowGroupPanel = false; // + // gridColumn14 + // + this.gridColumn14.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn14.MinWidth = 25; + this.gridColumn14.Name = "gridColumn14"; + this.gridColumn14.Visible = true; + this.gridColumn14.VisibleIndex = 2; + this.gridColumn14.Width = 94; + // + // gridColumn15 + // + this.gridColumn15.Caption = "浠撳簱鍚嶇О"; + this.gridColumn15.MinWidth = 25; + this.gridColumn15.Name = "gridColumn15"; + this.gridColumn15.Visible = true; + this.gridColumn15.VisibleIndex = 4; + this.gridColumn15.Width = 94; + // + // gridColumn16 + // + this.gridColumn16.Caption = "渚涘簲绫诲瀷"; + this.gridColumn16.MinWidth = 25; + this.gridColumn16.Name = "gridColumn16"; + this.gridColumn16.Visible = true; + this.gridColumn16.VisibleIndex = 11; + this.gridColumn16.Width = 94; + // + // gridColumn17 + // + this.gridColumn17.Caption = "BOM鍗曞彿"; + this.gridColumn17.MinWidth = 25; + this.gridColumn17.Name = "gridColumn17"; + this.gridColumn17.Visible = true; + this.gridColumn17.VisibleIndex = 19; + this.gridColumn17.Width = 94; + // // gv_closeType // this.gv_closeType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); @@ -712,15 +747,6 @@ this.lb_caa021.Size = new System.Drawing.Size(73, 21); this.lb_caa021.TabIndex = 267; this.lb_caa021.Text = "鐢熶骇杞﹂棿 "; - // - // txt_caa021 - // - this.txt_caa021.Location = new System.Drawing.Point(95, 85); - this.txt_caa021.Name = "txt_caa021"; - this.txt_caa021.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); - this.txt_caa021.Properties.Appearance.Options.UseFont = true; - this.txt_caa021.Size = new System.Drawing.Size(150, 28); - this.txt_caa021.TabIndex = 267; // // gv_caa021 // @@ -1365,6 +1391,7 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.txt_caa021); this.panel1.Controls.Add(this.labelControl11); this.panel1.Controls.Add(this.lbGuid); this.panel1.Controls.Add(this.lb_saleOrderNo); @@ -1376,7 +1403,6 @@ this.panel1.Controls.Add(this.lb_depotCode); this.panel1.Controls.Add(this.txt_depotCode); this.panel1.Controls.Add(this.lb_caa021); - this.panel1.Controls.Add(this.txt_caa021); this.panel1.Controls.Add(this.lb_caa020); this.panel1.Controls.Add(this.txt_caa020); this.panel1.Controls.Add(this.lb_caa016); @@ -1421,41 +1447,14 @@ this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; // - // gridColumn14 + // txt_caa021 // - this.gridColumn14.Caption = "鐗╂枡鍚嶇О"; - this.gridColumn14.MinWidth = 25; - this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 2; - this.gridColumn14.Width = 94; - // - // gridColumn15 - // - this.gridColumn15.Caption = "浠撳簱鍚嶇О"; - this.gridColumn15.MinWidth = 25; - this.gridColumn15.Name = "gridColumn15"; - this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 4; - this.gridColumn15.Width = 94; - // - // gridColumn16 - // - this.gridColumn16.Caption = "渚涘簲绫诲瀷"; - this.gridColumn16.MinWidth = 25; - this.gridColumn16.Name = "gridColumn16"; - this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 11; - this.gridColumn16.Width = 94; - // - // gridColumn17 - // - this.gridColumn17.Caption = "BOM鍗曞彿"; - this.gridColumn17.MinWidth = 25; - this.gridColumn17.Name = "gridColumn17"; - this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 19; - this.gridColumn17.Width = 94; + this.txt_caa021.IsReadly = false; + this.txt_caa021.KeyFile = ""; + this.txt_caa021.Location = new System.Drawing.Point(85, 81); + this.txt_caa021.Name = "txt_caa021"; + this.txt_caa021.Size = new System.Drawing.Size(160, 29); + this.txt_caa021.TabIndex = 451; // // Frm_Womcaa // @@ -1472,7 +1471,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimitl.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_stockInlimith.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.txt_caa021.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).EndInit(); @@ -1556,7 +1554,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus; private DevExpress.XtraEditors.LabelControl lb_caa021; - private DevExpress.XtraEditors.TextEdit txt_caa021; private DevExpress.XtraGrid.Columns.GridColumn gv_caa021; private DevExpress.XtraEditors.LabelControl lb_caa020; @@ -1617,5 +1614,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; + private UserControl.UcLookWorkshop txt_caa021; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs index 5367a9a..b6249d4 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs @@ -40,6 +40,7 @@ Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; + txt_caa021.KeyFile = "workid"; } diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj index f5c8156..5f0797b 100644 --- a/DevApp/Gs.DevApp/Gs.DevApp.csproj +++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj @@ -949,6 +949,10 @@ <None Include="Resources\changedatasourcepivottable_32x32.png" /> <None Include="Resources\showworktimeonly_32x32.png" /> <None Include="Resources\open2.svg" /> + <None Include="Resources\drilldownonarguments_chart_32x32.png" /> + <None Include="Resources\sortasc_32x32.png" /> + <None Include="Resources\sortasc_32x321.png" /> + <None Include="Resources\sortasc_16x161.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs index a6f72e2..08caab5 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs +++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs @@ -573,6 +573,16 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap drilldownonarguments_chart_32x32 { + get { + object obj = ResourceManager.GetObject("drilldownonarguments_chart_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap dropandhighlowlines_16x16 { get { object obj = ResourceManager.GetObject("dropandhighlowlines_16x16", resourceCulture); @@ -1303,6 +1313,36 @@ /// <summary> /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� /// </summary> + internal static System.Drawing.Bitmap sortasc_16x161 { + get { + object obj = ResourceManager.GetObject("sortasc_16x161", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap sortasc_32x32 { + get { + object obj = ResourceManager.GetObject("sortasc_32x32", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> + internal static System.Drawing.Bitmap sortasc_32x321 { + get { + object obj = ResourceManager.GetObject("sortasc_32x321", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆� + /// </summary> internal static System.Drawing.Bitmap sortbyinvoice_16x16 { get { object obj = ResourceManager.GetObject("sortbyinvoice_16x16", resourceCulture); diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx index 02da1ee..8edbfdb 100644 --- a/DevApp/Gs.DevApp/Properties/Resources.resx +++ b/DevApp/Gs.DevApp/Properties/Resources.resx @@ -291,6 +291,9 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, @@ -301,6 +304,11 @@ </data> <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -551,10 +559,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="employee_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\employee_32x32.png;System.Drawing.Bitmap, @@ -608,8 +614,11 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, + <data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortasc_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -654,6 +663,11 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="saveall_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\saveall_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="editname_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\editname_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, @@ -671,11 +685,6 @@ </data> <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> - </data> - <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -704,6 +713,11 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="3dcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\3dcolumn_32x32.png;System.Drawing.Bitmap, + System.Drawing, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -712,10 +726,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, - System.Drawing, Version=4.0.0.0, Culture=neutral, - PublicKeyToken=b03f5f7f11d50a3a</value> + <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="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> @@ -775,7 +787,7 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> + <data name="sortasc_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\sortasc_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/Resources/drilldownonarguments_chart_32x32.png b/DevApp/Gs.DevApp/Resources/drilldownonarguments_chart_32x32.png new file mode 100644 index 0000000..2cc0925 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/drilldownonarguments_chart_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/sortasc_16x161.png b/DevApp/Gs.DevApp/Resources/sortasc_16x161.png new file mode 100644 index 0000000..c880af8 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/sortasc_16x161.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/sortasc_32x32.png b/DevApp/Gs.DevApp/Resources/sortasc_32x32.png new file mode 100644 index 0000000..bb24aa0 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/sortasc_32x32.png Binary files differ diff --git a/DevApp/Gs.DevApp/Resources/sortasc_32x321.png b/DevApp/Gs.DevApp/Resources/sortasc_32x321.png new file mode 100644 index 0000000..bb24aa0 --- /dev/null +++ b/DevApp/Gs.DevApp/Resources/sortasc_32x321.png Binary files differ diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs new file mode 100644 index 0000000..281a94e --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs @@ -0,0 +1,122 @@ +锘縩amespace Gs.DevApp.UserControl +{ + partial class UcLookWorkline + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit(); + this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit(); + this.SuspendLayout(); + // + // lookSearchSupplier + // + this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill; + this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0); + this.lookSearchSupplier.Name = "lookSearchSupplier"; + this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true; + this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View; + this.lookSearchSupplier.Size = new System.Drawing.Size(278, 28); + this.lookSearchSupplier.TabIndex = 8; + // + // searchLookUpEdit1View + // + this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn5, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4}); + this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; + this.searchLookUpEdit1View.Name = "searchLookUpEdit1View"; + this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; + this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false; + // + // gridColumn5 + // + this.gridColumn5.Caption = "浣跨敤缁勭粐"; + this.gridColumn5.FieldName = "fSubsidiary"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 0; + // + // gridColumn2 + // + this.gridColumn2.Caption = "浜х嚎缂栧彿"; + this.gridColumn2.FieldName = "lineNo"; + this.gridColumn2.MinWidth = 80; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 1; + this.gridColumn2.Width = 80; + // + // gridColumn3 + // + this.gridColumn3.Caption = "浜х嚎鍚嶇О"; + this.gridColumn3.FieldName = "name"; + this.gridColumn3.MinWidth = 100; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 2; + this.gridColumn3.Width = 100; + // + // gridColumn4 + // + this.gridColumn4.Caption = "guid"; + this.gridColumn4.FieldName = "guid"; + this.gridColumn4.Name = "gridColumn4"; + // + // UcLookWorkline + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lookSearchSupplier); + this.Name = "UcLookWorkline"; + this.Size = new System.Drawing.Size(278, 27); + ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier; + private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs new file mode 100644 index 0000000..7c95a9f --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs @@ -0,0 +1,110 @@ +锘縰sing DevExpress.XtraEditors; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Data.SqlTypes; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.UserControl +{ + public partial class UcLookWorkline : DevExpress.XtraEditors.XtraUserControl + { + public UcLookWorkline() + { + InitializeComponent(); + lookSearchSupplier.Properties.NullText = "璇烽�夋嫨"; + lookSearchSupplier.EditValueChanged += + LookSearchSupplier_EditValueChanged; + } + public bool IsReadly { get; set; } + private string _KeyFile = ""; + public string KeyFile + { + get { return _KeyFile; } + set { _KeyFile = value; } + } + /// <summary> + /// 鏀瑰彉浜嬩欢 + /// </summary> + public event EventHandler EditChanged; + + private void LookSearchSupplier_EditValueChanged(object sender, + EventArgs e) + { + if (EditChanged != null) EditChanged(this, e); + } + + public void getSuppler(string shopGuid) + { + var _obj = new + { + guid = shopGuid //涓诲缓 + }; + var json = JsonConvert.SerializeObject(_obj); + try + { + var strReturn = UtilityHelper.HttpPost("", + "MesWorkshopManager/GetModel", json); + var _job = JObject.Parse(strReturn); + var array = new JArray(); + var d = _job["rtnData"]["list"]; + foreach (var a in d) array.Add(a); + var dt = + JsonConvert.DeserializeObject<DataTable>( + array.ToString()); + lookSearchSupplier.Properties.DataSource = dt; + lookSearchSupplier.Properties.DisplayMember = "name"; + // lookSearchSupplier.Properties.ValueMember = "suppNo"; + lookSearchSupplier.Properties.ValueMember = KeyFile; + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + public string GetId() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["guid"].ToString(); + return id; + } + return ""; + } + public string GetCode() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["lineNo"].ToString(); + return id; + } + return ""; + } + public string GetName() + { + var name = lookSearchSupplier.Text.Trim(); + return name; + } + + public void SetIdOrCode(string Code) + { + if (Code == "-1") + { + lookSearchSupplier.EditValue = null; + return; + } + lookSearchSupplier.EditValue = ((Code.ToString().Trim())); + } + } +} \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.resx b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs new file mode 100644 index 0000000..67f8291 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs @@ -0,0 +1,135 @@ +锘縩amespace Gs.DevApp.UserControl +{ + partial class UcLookWorkshop + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit(); + this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit(); + this.SuspendLayout(); + // + // lookSearchSupplier + // + this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill; + this.lookSearchSupplier.EditValue = "璇烽�夋嫨"; + this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0); + this.lookSearchSupplier.Name = "lookSearchSupplier"; + this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); + this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true; + this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View; + this.lookSearchSupplier.Size = new System.Drawing.Size(193, 28); + this.lookSearchSupplier.TabIndex = 9; + // + // searchLookUpEdit1View + // + this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { + this.gridColumn5, + this.gridColumn1, + this.gridColumn2, + this.gridColumn3, + this.gridColumn4}); + this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus; + this.searchLookUpEdit1View.Name = "searchLookUpEdit1View"; + this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false; + this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false; + // + // gridColumn5 + // + this.gridColumn5.Caption = "浣跨敤缁勭粐"; + this.gridColumn5.FieldName = "fSubsidiary"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 0; + // + // gridColumn2 + // + this.gridColumn2.Caption = "杞﹂棿缂栧彿"; + this.gridColumn2.FieldName = "workshopNo"; + this.gridColumn2.MinWidth = 80; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.UnboundDataType = typeof(string); + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 1; + this.gridColumn2.Width = 80; + // + // gridColumn3 + // + this.gridColumn3.Caption = "杞﹂棿鍚嶇О"; + this.gridColumn3.FieldName = "name"; + this.gridColumn3.MinWidth = 100; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 2; + this.gridColumn3.Width = 100; + // + // gridColumn4 + // + this.gridColumn4.Caption = "guid"; + this.gridColumn4.FieldName = "guid"; + this.gridColumn4.Name = "gridColumn4"; + // + // gridColumn1 + // + this.gridColumn1.Caption = "杞﹂棿ID"; + this.gridColumn1.FieldName = "workshopId"; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 3; + // + // UcLookWorkshop + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lookSearchSupplier); + this.Name = "UcLookWorkshop"; + this.Size = new System.Drawing.Size(193, 29); + ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier; + private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs new file mode 100644 index 0000000..c601720 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs @@ -0,0 +1,108 @@ +锘縰sing DevExpress.XtraEditors; +using Gs.DevApp.Entity; +using Gs.DevApp.ToolBox; +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Gs.DevApp.UserControl +{ + public partial class UcLookWorkshop : DevExpress.XtraEditors.XtraUserControl + { + public UcLookWorkshop() + { + InitializeComponent(); + lookSearchSupplier.Properties.NullText = "璇烽�夋嫨"; + lookSearchSupplier.EditValueChanged += + LookSearchSupplier_EditValueChanged; + } + + public bool IsReadly { get; set; } + private string _KeyFile = ""; + + public string KeyFile + { + get { return _KeyFile; } + set + { + _KeyFile = value; + getSuppler(); + } + } + /// <summary> + /// 鏀瑰彉浜嬩欢 + /// </summary> + public event EventHandler EditChanged; + + private void LookSearchSupplier_EditValueChanged(object sender, + EventArgs e) + { + if (EditChanged != null) EditChanged(this, e); + } + + private void getSuppler() + { + var pgq = new PageQueryModel(1, 999999, "workshop_no", "asc", "", " and is_status=1"); + var json = JsonConvert.SerializeObject(pgq); + try + { + var strReturn = UtilityHelper.HttpPost("", "MesWorkshopManager/GetListPage", json); + var rtn = UtilityHelper.ReturnToTablePage(strReturn); + var dt = rtn.rtnData.list; + lookSearchSupplier.Properties.DataSource = dt; + lookSearchSupplier.Properties.DisplayMember = "name"; + lookSearchSupplier.Properties.ValueMember = KeyFile; + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + + public string GetId() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["workid"].ToString(); + return id; + } + return ""; + } + public string GetCode() + { + var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView; + if (row != null) + { + string id = row["workshopNo"].ToString(); + return id; + } + return ""; + } + public string GetName() + { + var name = lookSearchSupplier.Text.Trim(); + return name; + } + + public void SetIdOrCode(string Code) + { + if (Code == "-1") + { + lookSearchSupplier.EditValue = null; + return; + } + if (KeyFile.ToUpper() == "workid".ToUpper()) + lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim()))); + else + lookSearchSupplier.EditValue = ((Code.ToString().Trim())); + } + } +} diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.resx b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.resx @@ -0,0 +1,120 @@ +锘�<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs index 53f85a5..f26ff57 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs @@ -65,6 +65,7 @@ this.btnZanTing = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnBdll = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnWg = new DevExpress.XtraBars.BarLargeButtonItem(); + this.btnTb = new DevExpress.XtraBars.BarLargeButtonItem(); this.barDockControlTop = new DevExpress.XtraBars.BarDockControl(); this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); @@ -115,9 +116,10 @@ this.btnZanTing, this.btnBdll, this.btnWg, - this.barLargeButtonItem1}); + this.barLargeButtonItem1, + this.btnTb}); this.barManager1.MainMenu = this.bar2; - this.barManager1.MaxItemId = 48; + this.barManager1.MaxItemId = 49; // // bar2 // @@ -157,7 +159,8 @@ new DevExpress.XtraBars.LinkPersistInfo(this.btnDkg), new DevExpress.XtraBars.LinkPersistInfo(this.btnZanTing), new DevExpress.XtraBars.LinkPersistInfo(this.btnBdll), - new DevExpress.XtraBars.LinkPersistInfo(this.btnWg)}); + new DevExpress.XtraBars.LinkPersistInfo(this.btnWg), + new DevExpress.XtraBars.LinkPersistInfo(this.btnTb)}); this.bar2.OptionsBar.MultiLine = true; this.bar2.OptionsBar.UseWholeRow = true; this.bar2.Text = "Main menu"; @@ -475,19 +478,32 @@ this.btnWg.Name = "btnWg"; this.btnWg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // + // btnTb + // + this.btnTb.Caption = "鍚屾"; + this.btnTb.Id = 48; + this.btnTb.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sortasc_16x161; + this.btnTb.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sortasc_32x321; + this.btnTb.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F); + this.btnTb.ItemAppearance.Normal.Options.UseFont = true; + this.btnTb.ItemInMenuAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 12F); + this.btnTb.ItemInMenuAppearance.Normal.Options.UseFont = true; + this.btnTb.Name = "btnTb"; + this.btnTb.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + // // barDockControlTop // this.barDockControlTop.CausesValidation = false; this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top; this.barDockControlTop.Location = new System.Drawing.Point(0, 0); this.barDockControlTop.Manager = this.barManager1; - this.barDockControlTop.Size = new System.Drawing.Size(1543, 145); + this.barDockControlTop.Size = new System.Drawing.Size(1543, 148); // // barDockControlBottom // this.barDockControlBottom.CausesValidation = false; this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.barDockControlBottom.Location = new System.Drawing.Point(0, 45); + this.barDockControlBottom.Location = new System.Drawing.Point(0, 61); this.barDockControlBottom.Manager = this.barManager1; this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0); // @@ -495,7 +511,7 @@ // this.barDockControlLeft.CausesValidation = false; this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left; - this.barDockControlLeft.Location = new System.Drawing.Point(0, 145); + this.barDockControlLeft.Location = new System.Drawing.Point(0, 148); this.barDockControlLeft.Manager = this.barManager1; this.barDockControlLeft.Size = new System.Drawing.Size(0, 0); // @@ -503,7 +519,7 @@ // this.barDockControlRight.CausesValidation = false; this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right; - this.barDockControlRight.Location = new System.Drawing.Point(1543, 145); + this.barDockControlRight.Location = new System.Drawing.Point(1543, 148); this.barDockControlRight.Manager = this.barManager1; this.barDockControlRight.Size = new System.Drawing.Size(0, 0); // @@ -522,7 +538,7 @@ this.Controls.Add(this.barDockControlBottom); this.Controls.Add(this.barDockControlTop); this.Name = "UcToolBarMenu"; - this.Size = new System.Drawing.Size(1543, 45); + this.Size = new System.Drawing.Size(1543, 61); ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -569,5 +585,6 @@ private DevExpress.XtraBars.BarLargeButtonItem btnBdll; private DevExpress.XtraBars.BarLargeButtonItem btnWg; private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1; + private DevExpress.XtraBars.BarLargeButtonItem btnTb; } } diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index 2e39bb8..95c7388 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -51,7 +51,7 @@ btnZanTing.ItemClick += BtnZanTing_ItemClick; btnBdll.ItemClick += BtnBdll_ItemClick; btnWg.ItemClick += BtnWg_ItemClick; - + btnTb.ItemClick += BtnTb_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) @@ -62,6 +62,7 @@ } + /// <summary> /// 鍒濆鍖栨寜閽姸鎬� /// </summary> @@ -452,6 +453,10 @@ private void BtnQuery_ItemClick(object sender, ItemClickEventArgs e) { if (btnQueryClick != null) btnQueryClick(this, e); + } + private void BtnTb_ItemClick(object sender, ItemClickEventArgs e) + { + if (btnTbClick != null) btnTbClick(this, e); } private void BtnEsc_ItemClick(object sender, ItemClickEventArgs e) @@ -917,6 +922,9 @@ /// 鎵嬪姩瀹屽伐 /// </summary> public event EventHandler btnWgClick; + + + public event EventHandler btnTbClick; #endregion #region 鍏叡灞炴�� -- Gitblit v1.9.3