From 4bca678c092d53d53140fab2ce25363026cbc6ec Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 10 十一月 2024 11:19:02 +0800
Subject: [PATCH] 打印
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 14 +
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs | 16 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 11 -
DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 2
/dev/null | 120 -------------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 52 ++---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 49 +++-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 62 +++++-
DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs | 10
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 100 -----------
DevApp/Gs.DevApp/Properties/Resources.resx | 75 ++++----
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 10
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 1
14 files changed, 182 insertions(+), 342 deletions(-)
diff --git a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
index d09848a..ecf934d 100644
--- a/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
+++ b/DevApp/Gs.DevApp/.vs/Gs.DevApp.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp","ProjectFileName":"Gs.DevApp.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Customer.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Department.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Holidy.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItems.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesItemType.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesPosition.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshop.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesWorkshop.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Staff.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_Supplier.Designer.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.cs"},{"SourceFile":"DevFrm\\BasicData\\Frm_MesUnit.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_IQCLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaItemsDetect01Check.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQaMj.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmAql1.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesQmCheckitemDt.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Frm_MesSysLookups.Designer.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaMj.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetect01.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail12.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQaItemsDetectDetail5.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql1.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql2.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmAql3.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitem.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesQmCheckitemDt.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookups.cs"},{"SourceFile":"DevFrm\\QC\\Models\\MesSysLookupTypes.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.cs"},{"SourceFile":"DevFrm\\Rpt\\RptPreview.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.cs"},{"SourceFile":"DevFrm\\Sys\\EasyRptDesign.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\FileSelector.cs"},{"SourceFile":"DevFrm\\FrmLogin.cs"},{"SourceFile":"DevFrm\\FrmLogin.Designer.cs"},{"SourceFile":"DevFrm\\FrmMain.cs"},{"SourceFile":"DevFrm\\FrmMain.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.cs"},{"SourceFile":"DevFrm\\Sys\\DocNoRule.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.cs"},{"SourceFile":"DevFrm\\Sys\\EasyCode.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.cs"},{"SourceFile":"DevFrm\\Sys\\SysLog.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.cs"},{"SourceFile":"DevFrm\\Sys\\Organization.Designer.cs"},{"SourceFile":"DevFrm\\User\\Role.cs"},{"SourceFile":"DevFrm\\User\\Role.Designer.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.cs"},{"SourceFile":"DevFrm\\Sys\\SysMenu.Designer.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.cs"},{"SourceFile":"DevFrm\\User\\RoleSelectAction.Designer.cs"},{"SourceFile":"DevFrm\\User\\User.cs"},{"SourceFile":"DevFrm\\User\\User.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.cs"},{"SourceFile":"DevFrm\\User\\UserSelectRole.Designer.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.cs"},{"SourceFile":"DevFrm\\User\\UserSetPwd.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesDepot.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesInvItemArn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_InitialBarcode.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Frm_MesRohIn.Designer.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepots.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesDepotSections.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArn.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemArnDetail.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemBarcodes.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesInvItemStocks.cs"},{"SourceFile":"DevFrm\\Warehouse\\Models\\MesItems.cs"},{"SourceFile":"Entity\\LoginInfoModel.cs"},{"SourceFile":"Entity\\PageQueryModel.cs"},{"SourceFile":"Entity\\ReturnModel.cs"},{"SourceFile":"Entity\\XlsOutModel.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"TestForm\\FluentDesignForm1.cs"},{"SourceFile":"TestForm\\FluentDesignForm1.Designer.cs"},{"SourceFile":"TestForm\\XtraForm1.cs"},{"SourceFile":"TestForm\\XtraForm1.Designer.cs"},{"SourceFile":"TestForm\\XtraForm2.cs"},{"SourceFile":"TestForm\\XtraForm2.Designer.cs"},{"SourceFile":"ToolBox\\LogHelper.cs"},{"SourceFile":"ToolBox\\MsgHelper.cs"},{"SourceFile":"ToolBox\\UpdateParentEventArgs.cs"},{"SourceFile":"ToolBox\\UtilityHelper.cs"},{"SourceFile":"UserControl\\SelectCgMx.cs"},{"SourceFile":"UserControl\\SelectCgMx.Designer.cs"},{"SourceFile":"UserControl\\SelectCheckDt.cs"},{"SourceFile":"UserControl\\SelectCheckDt.Designer.cs"},{"SourceFile":"UserControl\\ShowLogcs.cs"},{"SourceFile":"UserControl\\ShowLogcs.Designer.cs"},{"SourceFile":"UserControl\\ShowRptWizard.cs"},{"SourceFile":"UserControl\\ShowRptWizard.Designer.cs"},{"SourceFile":"UserControl\\UcComBox.cs"},{"SourceFile":"UserControl\\UcComBox.Designer.cs"},{"SourceFile":"UserControl\\UcLoading.cs"},{"SourceFile":"UserControl\\UcLoading.Designer.cs"},{"SourceFile":"UserControl\\UcLookCk.cs"},{"SourceFile":"UserControl\\UcLookCk.Designer.cs"},{"SourceFile":"UserControl\\UcLookItems.cs"},{"SourceFile":"UserControl\\UcLookItems.Designer.cs"},{"SourceFile":"UserControl\\UcLookSupplier.cs"},{"SourceFile":"UserControl\\UcLookSupplier.Designer.cs"},{"SourceFile":"UserControl\\UcPageBar.cs"},{"SourceFile":"UserControl\\UcPageBar.Designer.cs"},{"SourceFile":"UserControl\\ShowDialogForm.cs"},{"SourceFile":"UserControl\\ShowDialogForm.designer.cs"},{"SourceFile":"UserControl\\ShowFilter.cs"},{"SourceFile":"UserControl\\ShowFilter.Designer.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.cs"},{"SourceFile":"UserControl\\UcToolBarMenu.Designer.cs"},{"SourceFile":"UserControl\\XtraUserControl1.cs"},{"SourceFile":"UserControl\\XtraUserControl1.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Autoupdater.NET.Official.1.9.2\\lib\\net462\\AutoUpdater.NET.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.BonusSkins.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Charts.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.Desktop.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Data.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.DataAccess.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Drawing.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Images.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Office.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Pdf.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.PivotGrid.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Printing.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.RichEdit.v22.2.Export.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Sparkline.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.Utils.v22.2.UI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraBars.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraCharts.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraEditors.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGauges.v22.2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraGrid.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraLayout.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraNavBar.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraPrinting.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraReports.v22.2.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraTreeList.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\appinstal\\DevExpress 22.2\\Bin\\Framework\\DevExpress.XtraWizard.v22.2.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\GsMesV2\\DevApp\\Gs.DevApp\\bin\\Debug\\FastReport.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.WinForms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Microsoft.Web.WebView2.1.0.2592.51\\lib\\net462\\Microsoft.Web.WebView2.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\Oracle.ManagedDataAccess.23.6.0\\lib\\net472\\Oracle.ManagedDataAccess.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Buffers.4.5.1\\lib\\net461\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Configuration.ConfigurationManager.8.0.0\\lib\\net462\\System.Configuration.ConfigurationManager.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Diagnostics.DiagnosticSource.6.0.1\\lib\\net461\\System.Diagnostics.DiagnosticSource.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Formats.Asn1.8.0.1\\lib\\net462\\System.Formats.Asn1.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Memory.4.5.5\\lib\\net461\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Numerics.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Numerics.Vectors.4.5.0\\lib\\net46\\System.Numerics.Vectors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Runtime.CompilerServices.Unsafe.6.0.0\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Encodings.Web.8.0.0\\lib\\net462\\System.Text.Encodings.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Text.Json.8.0.4\\lib\\net462\\System.Text.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"F:\\QiXiSource\\GsMesClient\\DevApp\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"F:\\QiXiSource\\GsMesClient\\DevApp\\Gs.DevApp\\bin\\Debug\\Gs.DevApp.exe","OutputItemRelativePath":"Gs.DevApp.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
+{"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
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index 3ccf9f5..df222b5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Data;
using System.IO;
+using DevExpress.Utils.VisualEffects;
using DevExpress.XtraEditors;
using FastReport;
using Gs.DevApp.ToolBox;
@@ -12,10 +13,11 @@
public partial class RptPreview : XtraForm
{
private readonly string _rptParameter;
-
- public RptPreview(string rptParameter)
+ private readonly string _rptGuid;
+ public RptPreview(string strGuid, string rptParameter)
{
_rptParameter = rptParameter;
+ _rptGuid = strGuid;
InitializeComponent();
Text = _rptParameter + "鎶ヨ〃鏌ョ湅锛�";
getRptData();
@@ -28,7 +30,9 @@
{
var _obj = new
{
- rptParameter = _rptParameter
+ rptParameter = _rptParameter,
+ guid = _rptGuid,
+ isDesign = 0
};
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
index 167b95f..5c48ea1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptDesign.cs
@@ -13,9 +13,10 @@
public partial class EasyRptDesign : XtraForm
{
private readonly string _rptParameter;
-
- public EasyRptDesign(string rptParameter)
+ private readonly string _rptGuid;
+ public EasyRptDesign(string strGuid, string rptParameter)
{
+ _rptGuid = strGuid;
_rptParameter = rptParameter;
InitializeComponent();
Text = _rptParameter + "鎶ヨ〃璁捐锛氳璁℃椂璇峰弬鑰冨瓧娈佃鏄庯紝寤鸿z寮�澶翠负涓昏〃,m寮�澶翠负鏄庣粏琛�";
@@ -23,24 +24,25 @@
var RptRow = new DataTable();
var _obj = new
{
- rptParameter = _rptParameter
+ rptParameter = _rptParameter,
+ guid = _rptGuid,
+ isDesign = 1
};
try
{
- var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
var dy = _rtn.rtnData;
- if (dy.reportData.ToString().Length > 0)
+ if (dy.reportTemplateData.ToString().Length > 0)
{
- var buffer = (byte[])dy.reportData;
+ var buffer = (byte[])dy.reportTemplateData;
using (var Stream = new MemoryStream(buffer))
{
report.Load(Stream);
}
-
var d = dy.reportCol;
foreach (var a in d) listBox1.Items.Add(a);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index 484e70d..a938bdd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -457,7 +457,7 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.rptParameter = "rpt_ItemInv{}";
this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index 1e6fb42..07954cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -6,6 +6,7 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -19,7 +20,8 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
+ toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
+ toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -99,15 +101,54 @@
else
getPageList(1, UtilityHelper.GetPageSize());
}
-
- /// <summary>
- /// 鎵撳嵃
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
{
-
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemName, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+ private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemName, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ getModel(rowGuid, false, 999);
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_suppNo_1.GetCode()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
+ txt_suppNo_1.Focus();
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ txt_iCount_1.Focus();
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_ItemInv{" + txt_createDate1.Text.Trim()
+ + "," + txt_tc_1.Checked.ToString().ToUpper()
+ + "," + txt_suppNo_1.GetId()
+ + "," + txt_iCount_1.Text.Trim()
+ + "," + txt_psnQty_1.Text.Trim()
+ + "}";
}
/// <summary>
@@ -159,6 +200,9 @@
return;
}
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ txt_suppNo_1.SetIdOrCode("-1");
var _obj = new
{
guid = strGuid,//涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 8746ab7..d273d3a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -146,7 +146,6 @@
_loading.Stop();
};
}
-
/// <summary>
/// 鍙屽嚮浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 2c5f719..7b2432a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -531,12 +531,6 @@
<Compile Include="UserControl\UCUpFile.Designer.cs">
<DependentUpon>UCUpFile.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\XtraUserControl1.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="UserControl\XtraUserControl1.Designer.cs">
- <DependentUpon>XtraUserControl1.cs</DependentUpon>
- </Compile>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Customer.resx">
<DependentUpon>Frm_Customer.cs</DependentUpon>
</EmbeddedResource>
@@ -703,9 +697,6 @@
<EmbeddedResource Include="UserControl\UCUpFile.resx">
<DependentUpon>UCUpFile.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\XtraUserControl1.resx">
- <DependentUpon>XtraUserControl1.cs</DependentUpon>
- </EmbeddedResource>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
@@ -844,6 +835,8 @@
<None Include="Resources\updatetableofcontents_16x16.png" />
<None Include="Resources\close_16x16.png" />
<None Include="Resources\print_16x16.png" />
+ <None Include="Resources\printlayoutview_32x32.png" />
+ <None Include="Resources\printlayoutview_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 71933b5..72372d8 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -983,9 +983,19 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
- internal static System.Drawing.Bitmap print_16x16 {
+ internal static System.Drawing.Bitmap printlayoutview_16x16 {
get {
- object obj = ResourceManager.GetObject("print_16x16", resourceCulture);
+ object obj = ResourceManager.GetObject("printlayoutview_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
+ internal static System.Drawing.Bitmap printlayoutview_32x32 {
+ get {
+ object obj = ResourceManager.GetObject("printlayoutview_32x32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index f15da16..81721a1 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -183,9 +186,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="sortbyinvoice_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -244,9 +244,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -261,6 +258,11 @@
</data>
<data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -307,8 +309,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
+ <data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fullstackedcolumn3d_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -424,10 +426,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -477,8 +477,8 @@
<data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_trackchanges_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_trackchanges_16x16.png;System.Drawing.Bitmap,
@@ -544,6 +544,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -555,10 +560,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_16x16.png;System.Drawing.Bitmap,
+ <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
@@ -575,9 +583,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="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,
@@ -588,8 +593,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="salesperiodlifetime_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salesperiodlifetime_16x16.png;System.Drawing.Bitmap,
@@ -637,6 +644,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="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,
@@ -647,10 +659,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
@@ -671,10 +681,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="exportfile_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\exportfile_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
@@ -703,11 +711,6 @@
</data>
<data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="fullstackedcolumn3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fullstackedcolumn3d_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
@@ -742,7 +745,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="print_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\print_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="printlayoutview_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\printlayoutview_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
index 0a2cc53..3d5da77 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowRptWizard.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.ComponentModel;
+using System.Data.SqlTypes;
using DevExpress.XtraEditors;
using DevExpress.XtraWizard;
using Gs.DevApp.DevFrm.Sys;
@@ -11,10 +12,12 @@
public partial class ShowRptWizard : XtraForm
{
private readonly string _rptParameter;
+ private readonly string _rptGuid;
- public ShowRptWizard(string rptParameter)
+ public ShowRptWizard(string strGuid, string rptParameter)
{
_rptParameter = rptParameter;
+ _rptGuid = strGuid;
InitializeComponent();
wizardControl1.NextClick += WizardControl1_NextClick;
wizardControl1.FinishClick += WizardControl1_FinishClick;
@@ -35,13 +38,12 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- var frm = new EasyRptDesign(_rptParameter);
+ var frm = new EasyRptDesign(_rptGuid,_rptParameter);
frm.Show();
}
else
{
- MsgHelper.ShowError("鎻愮ず锛�" +
- _rtn.rtnData["outMsg"].ToString());
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData["outMsg"].ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 1dded60..a7a58ac 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -31,7 +31,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UcToolBarMenu));
- this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
this.bar2 = new DevExpress.XtraBars.Bar();
this.btnAdd = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -42,7 +41,6 @@
this.btnDel = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnChk = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnFchk = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnPrint = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnHb = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnKG = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnQuery = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -62,17 +60,10 @@
this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
+ this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
- //
- // barDockControlLeft
- //
- this.barDockControlLeft.CausesValidation = false;
- this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 145);
- this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
// barManager1
//
@@ -93,7 +84,6 @@
this.btnOut,
this.btnChk,
this.btnFchk,
- this.btnPrint,
this.btnHb,
this.btnIn,
this.btnLog,
@@ -128,7 +118,6 @@
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnDel, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(this.btnChk),
new DevExpress.XtraBars.LinkPersistInfo(this.btnFchk),
- new DevExpress.XtraBars.LinkPersistInfo(this.btnPrint),
new DevExpress.XtraBars.LinkPersistInfo(this.btnHb),
new DevExpress.XtraBars.LinkPersistInfo(this.btnKG),
new DevExpress.XtraBars.LinkPersistInfo(this.btnQuery),
@@ -240,17 +229,6 @@
this.btnFchk.Name = "btnFchk";
this.btnFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnPrint
- //
- this.btnPrint.Caption = "鎵撳嵃";
- this.btnPrint.Id = 15;
- this.btnPrint.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.ImageOptions.Image")));
- this.btnPrint.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnPrint.ImageOptions.LargeImage")));
- this.btnPrint.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
- this.btnPrint.ItemAppearance.Normal.Options.UseFont = true;
- this.btnPrint.Name = "btnPrint";
- this.btnPrint.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
- //
// btnHb
//
this.btnHb.Caption = "鍚堝苟";
@@ -314,16 +292,17 @@
//
// btnReport
//
- this.btnReport.Caption = "鎶ヨ〃";
+ this.btnReport.Caption = "鎵撳嵃";
this.btnReport.Id = 22;
- this.btnReport.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnReport.ImageOptions.Image")));
+ this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printlayoutview_16x16;
+ this.btnReport.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.printlayoutview_32x32;
this.btnReport.Name = "btnReport";
this.btnReport.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
this.btnReport.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// btnDesign
//
- this.btnDesign.Caption = "璁捐鎶ヨ〃";
+ this.btnDesign.Caption = "璁捐鎵撳嵃";
this.btnDesign.Id = 26;
this.btnDesign.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.Image")));
this.btnDesign.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("btnDesign.ImageOptions.LargeImage")));
@@ -423,9 +402,17 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 74);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 70);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+ //
+ // barDockControlLeft
+ //
+ this.barDockControlLeft.CausesValidation = false;
+ this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 145);
+ this.barDockControlLeft.Manager = this.barManager1;
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
// barDockControlRight
//
@@ -444,7 +431,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 74);
+ this.Size = new System.Drawing.Size(1543, 70);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -452,7 +439,6 @@
}
#endregion
- private DevExpress.XtraBars.BarDockControl barDockControlLeft;
private DevExpress.XtraBars.BarManager barManager1;
private DevExpress.XtraBars.Bar bar2;
private DevExpress.XtraBars.BarLargeButtonItem btnAdd;
@@ -464,10 +450,6 @@
private DevExpress.XtraBars.BarLargeButtonItem btnOut;
private DevExpress.XtraBars.BarLargeButtonItem btnChk;
private DevExpress.XtraBars.BarLargeButtonItem btnFchk;
- private DevExpress.XtraBars.BarDockControl barDockControlTop;
- private DevExpress.XtraBars.BarDockControl barDockControlBottom;
- private DevExpress.XtraBars.BarDockControl barDockControlRight;
- private DevExpress.XtraBars.BarLargeButtonItem btnPrint;
private DevExpress.XtraBars.BarLargeButtonItem btnHb;
private DevExpress.XtraBars.BarLargeButtonItem btnIn;
private DevExpress.XtraBars.BarLargeButtonItem btnLog;
@@ -484,5 +466,9 @@
private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouChk;
private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouFchk;
private DevExpress.XtraBars.BarLargeButtonItem btnBoHui;
+ private DevExpress.XtraBars.BarDockControl barDockControlTop;
+ private DevExpress.XtraBars.BarDockControl barDockControlBottom;
+ private DevExpress.XtraBars.BarDockControl barDockControlLeft;
+ private DevExpress.XtraBars.BarDockControl barDockControlRight;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index c43e44e..b595b7b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -44,7 +44,6 @@
btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
btnBoHui.ItemClick += BtnBoHui_ItemClick;
- btnPrint.ItemClick += BtnPrint_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -53,7 +52,7 @@
actions = lst;
}
-
+
/// <summary>
@@ -65,11 +64,6 @@
if (Parent != null) getNamespace();
}
- private void BtnPrint_ItemClick(object sender, ItemClickEventArgs e)
- {
- if (btnPrintClick != null)
- btnPrintClick(this, e);
- }
private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
@@ -382,17 +376,23 @@
private void BtnReport_ItemClick(object sender, ItemClickEventArgs e)
{
+ if (btnReportClick != null)
+ btnReportClick(this, e);
+ else
+ return;
+
+ if (rptParameter == "return false")
+ return;
if (string.IsNullOrEmpty(rptParameter))
{
MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
-
var _bl = false;
_bl = _ckRptService();
if (_bl)
{
- var frm = new RptPreview(rptParameter);
+ var frm = new RptPreview(guidKey, rptParameter);
frm.Show();
return;
}
@@ -402,24 +402,27 @@
private void BtnDesign_ItemClick(object sender, ItemClickEventArgs e)
{
+ if (btnDesignClick != null)
+ btnDesignClick(this, e);
+ else
+ return;
+
if (string.IsNullOrEmpty(rptParameter))
{
MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
return;
}
-
var _bl = false;
_bl = _ckRptService();
//濡傛灉宸茬粡鏈夋ā鏉夸簡锛岀洿鎺ユ墦寮�璁剧疆妯℃澘
if (_bl)
{
- var frm = new EasyRptDesign(rptParameter);
+ var frm = new EasyRptDesign(guidKey, rptParameter);
frm.Show();
return;
}
-
//鍚﹀垯鍚戝璁捐妯℃澘
- var rptWizard = new ShowRptWizard(rptParameter);
+ var rptWizard = new ShowRptWizard(guidKey, rptParameter);
rptWizard.ShowDialog();
}
@@ -675,9 +678,11 @@
{
var _obj = new
{
- rptParameter
+ guid = guidKey,
+ rptParameter,
+ isDesign = 1
};
- var strJson = UtilityHelper.HttpPost("", "Report/GetTemplate",
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0) return true;
@@ -816,8 +821,20 @@
/// </summary>
public event EventHandler btnBoHuiClick;
-
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
public event EventHandler btnPrintClick;
+
+ /// <summary>
+ /// 璁剧疆鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnDesignClick;
+
+ /// <summary>
+ /// 鎶ヨ〃
+ /// </summary>
+ public event EventHandler btnReportClick;
#endregion
#region 鍏叡灞炴��
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index 40edfd6..7500f0b 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -187,70 +187,6 @@
f+6EnGfdugKwnQr2BIeDYf6s2JhN/P3hT7WuAGyDQf4foiES/RvDCa9FOGI5gAAAAABJRU5ErkJggg==
</value>
</data>
- <data name="btnPrint.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABx0RVh0VGl0
- bGUAUHJpbnRMYXlvdXRWaWV3O1ByaW50OyLF4Y0AAAM1SURBVDhPVZP9Txt1HMfvfzAx/uA/5K86dQ7r
- nM5EnahMnIQly5gDCn2CUiilPI7CyOYYBZMlJktkm5vZNA7alVLKYNAn2l57d732+gB5+b0zmnjJJ3f5
- 5vt+uPf3/ZUml36+H7y5RnBxjYnFVQILYQKhMOPzK/jnlxmbu8Po7E/4Zm7jnb6Fd2qJ4eASnolFPIGF
- +5IJbjRb1OtNqrU6etVAq9RQNZ2yUkEuqxTkshgVpVJF1Q3xNiiLPW5/CMlUbjRaFrhrMSFmmx9CcS6J
- 6byxJSbGxdkXdMxEyebl/8AlrYbTfwPJtF0XBBW9ZoFbJyfUWyfo9WPUWgtZb3Kk1vlmOsJBOmeBywJc
- 0qo4RudMgrCw37IsX1qIYzSO8azu/G9SskH75Cb7B1kLLKtViqrOgG8WKbCwgiH+v6RofC9sV4xjFL1F
- sdIgI9fYP9JJZlQ+H/uDePIlBTMXAS4qOnbvNJJ//i6G0UQuKXTOb1GuNi1V98o254af8PHQE856HmNz
- PuJDxyPSR0VBolMo6/QPT5kEy9QEQb5Q4uJcjLzaIC2UdzNlCyxXhButJXJo0jb4kNjOS16lcmQLCn1D
- QSTznKtGg1yuSMdslFSxhmtqjc+6x7G5HlvArNLkUG5w2v6A09866fHeJPkqRa9nAsksiV4Tqtm8lfRe
- TuP85QDmY3P+RpvjIWeEsgW2r1vr77cPEEvscd0dQDIbVqnWORS2vp7aJJ5S+LR7zNr45vlVLoc1upcV
- 2ucyvHbmFg+eRnn3Qj+R7V1+dI0jjYh6aoIglT7iq+CGSPsZn3T9Q/B2/zpvnL3L67Y7Anybt678wvrT
- CKe+7GVja4drDj+S2W2znnJZE+ec4Xkkxrkun0WwL1ztirWdvTSx5AHRxD6//r7JO1/08mckTo9jFGlI
- XAyznopVzyqHmTzOyTAfdXqxfTdEW4eLD0Rw77XbOXWhT6j30TMc4nkswdUBk0Dcqn/raTYsV1TYFQlv
- idJEE0k2hdUNsfmvaFyoxni28UJ8b7OXzguCESR3IHTPPR6yLobZ7UHfjNUwsyR9Q5PWUV13BazArjn9
- 9AyOWcpXB3xcsY/c+xvJRDliKSBA7QAAAABJRU5ErkJggg==
-</value>
- </data>
- <data name="btnPrint.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
-</value>
- </data>
<data name="btnHb.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@@ -367,42 +303,6 @@
DteHOHBt4MVt6Sf/lJJV6Uv5qAopu4kDbP9N2gaOeMyKs80S41Ri265KbFXRIVFg5Dnhg8yKxeTttvdF
l98F6suIGwI/k7g78dlkdTI938XP/gc//y/wP66AfCWnrvo4tX6eMyXWT/P/B9Tgy6joJj3zb99dMruc
T5oqAAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="btnReport.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- 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
- UnOkUrvSAAAAAElFTkSuQmCC
</value>
</data>
<data name="btnDesign.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/DevApp/Gs.DevApp/UserControl/XtraUserControl1.Designer.cs b/DevApp/Gs.DevApp/UserControl/XtraUserControl1.Designer.cs
deleted file mode 100644
index 97a2c8c..0000000
--- a/DevApp/Gs.DevApp/UserControl/XtraUserControl1.Designer.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-锘縩amespace Gs.DevApp.UserControl
-{
- partial class XtraUserControl1
- {
- /// <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.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.SuspendLayout();
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(0, 34);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(81, 18);
- this.labelControl1.TabIndex = 0;
- this.labelControl1.Text = "labelControl1";
- //
- // XtraUserControl1
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.labelControl1);
- this.Name = "XtraUserControl1";
- this.Size = new System.Drawing.Size(295, 150);
- this.ResumeLayout(false);
- this.PerformLayout();
-
- }
-
- #endregion
-
- private DevExpress.XtraEditors.LabelControl labelControl1;
- }
-}
diff --git a/DevApp/Gs.DevApp/UserControl/XtraUserControl1.cs b/DevApp/Gs.DevApp/UserControl/XtraUserControl1.cs
deleted file mode 100644
index 205bcde..0000000
--- a/DevApp/Gs.DevApp/UserControl/XtraUserControl1.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-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 XtraUserControl1 : DevExpress.XtraEditors.XtraUserControl
- {
- private Timer timer;
- private int angle = 0;
-
- public XtraUserControl1()
- {
- InitializeComponent();
- this.DoubleBuffered = true;
- timer = new Timer();
- timer.Interval = 1000 / 60; // 60甯�/绉�
- timer.Tick += Timer_Tick;
- }
-
- protected override void OnPaint(PaintEventArgs e)
- {
- base.OnPaint(e);
- DrawLoadingCircle(e.Graphics);
- }
-
- private void DrawLoadingCircle(Graphics g)
- {
- g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
- int radius = Math.Min(this.Width, this.Height) / 2 - 5;
- Rectangle rect = new Rectangle(this.Width / 2 - radius, this.Height / 2 - radius, radius * 2, radius * 2);
- using (SolidBrush brush = new SolidBrush(Color.FromArgb(128, Color.Blue)))
- {
- g.FillPie(brush, rect, angle, 90);
- }
- labelControl1.Text = DateTime.Now.ToString();
- }
-
- private void Timer_Tick(object sender, EventArgs e)
- {
- angle = (angle + 30) % 360;
- this.Invalidate();
- }
-
- public void Start()
- {
- timer.Start();
- }
-
- public void Stop()
- {
- timer.Stop();
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/XtraUserControl1.resx b/DevApp/Gs.DevApp/UserControl/XtraUserControl1.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/UserControl/XtraUserControl1.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
--
Gitblit v1.9.3