diff --git a/B3ClientService.Web/B3ClientService.Web.csproj b/B3ClientService.Web/B3ClientService.Web.csproj index 79135ff..aae79c8 100644 --- a/B3ClientService.Web/B3ClientService.Web.csproj +++ b/B3ClientService.Web/B3ClientService.Web.csproj @@ -110,6 +110,7 @@ ASPXCodeBehind + ASPXCodeBehind diff --git a/B3ClientService.Web/Pages/B3ClientService/PageUtil.cs b/B3ClientService.Web/Pages/B3ClientService/PageUtil.cs new file mode 100644 index 0000000..f8dbf61 --- /dev/null +++ b/B3ClientService.Web/Pages/B3ClientService/PageUtil.cs @@ -0,0 +1,44 @@ +using BWP.B3Frameworks.Utils; +using Forks.EnterpriseServices.DataForm; +using Forks.EnterpriseServices.DomainObjects2.DQuery; +using Forks.EnterpriseServices.SqlDoms; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using TSingSoft.WebControls2; +using TSingSoft.WebControls2.DFGrids; +using TSingSoft.WebPluginFramework.Controls; +using TSingSoft.WebPluginFramework.Exports; + +namespace BWP.Web.Pages.B3ClientService +{ + public class PageUtil + { + public static void AddExcelExportPanel(HLayoutPanel toolbar, DFBrowseGrid mBrowseGrid, string title) + { + var exporter = new Exporter(); + toolbar.Add(new TSButton("导出到Excel", delegate + { + var lastQuery = mBrowseGrid.LastQuery; + if (lastQuery == null) + throw new Exception("请先进行查询"); + var dom = new LoadArguments((DQueryDom)lastQuery.DQuery.Clone()); + foreach (var colIndex in lastQuery.SumColumns) + dom.SumColumns.Add(colIndex); + foreach (var colIndex in lastQuery.GroupSumColumns) + dom.GroupSumColumns.Add(colIndex); + dom.DQuery.Range = SelectRange.All; + string fileName = title + ".xlsx"; + exporter.Export(new QueryResultExcelExporter(fileName, GetQueryResult(dom))); + })); + toolbar.Add(exporter); + } + + private static QueryResult GetQueryResult(LoadArguments arg) + { + var data = new DFDataTableEditor().Load(arg); + return new QueryResult(data.TotalCount, data.Data.Rows, data.Data.Columns, arg.SumColumns.Any() ? data.Data.SumRow : null); + } + } +} diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassGradeAnalyse_/CarcassGradeAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassGradeAnalyse_/CarcassGradeAnalyse.cs index 317a164..f8b9b5e 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassGradeAnalyse_/CarcassGradeAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassGradeAnalyse_/CarcassGradeAnalyse.cs @@ -20,6 +20,7 @@ using Forks.EnterpriseServices.DomainObjects2.DQuery; using Forks.EnterpriseServices.SqlDoms; using BWP.B3ClientService.NamedValueTemplate; using Forks.Utils; +using TSingSoft.WebPluginFramework.Exports; namespace BWP.Web.Pages.B3ClientService.Reports.CarcassGradeAnalyse_ { @@ -95,6 +96,16 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassGradeAnalyse_ AllowSorting = true }; result.EAdd(mDFGrid); + + var hbox = result.EAdd(new HLayoutPanel()); + var exporter = new Exporter(); + var excelExporter = new DFGridServiceExcelExporter("白条级别汇总.xlsx", this); + excelExporter.CreateQuerySettings = delegate + { + return new QuerySettings(SelectRange.All, mDFGrid.SortField, mDFGrid.SortDirection); + }; + hbox.Add(new TSButton("导出到Excel", (sender, args) => exporter.Export(excelExporter))); + hbox.Add(exporter); return result; } diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs index abf45e8..8918795 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassLossAnalyse_/CarcassLossAnalyse.cs @@ -80,6 +80,8 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassLossAnalyse_ var result = new TitlePanel("查询结果"); mBrowseGrid = result.EAdd(new DFBrowseGrid(new DFDataTableEditor()) { Width = Unit.Percentage(100) }); mBrowseGrid.Columns.Add(new DFBrowseGridAutoColumn()); + var hPanel = result.EAdd(new HLayoutPanel()); + PageUtil.AddExcelExportPanel(hPanel, mBrowseGrid, "白条损耗"); return result; } diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStateAnalyse_/CarcassStateAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStateAnalyse_/CarcassStateAnalyse.cs index f3979b9..5d943ce 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStateAnalyse_/CarcassStateAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStateAnalyse_/CarcassStateAnalyse.cs @@ -90,6 +90,8 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStateAnalyse_ var result = new TitlePanel("查询结果"); mBrowseGrid = result.EAdd(new DFBrowseGrid(new DFDataTableEditor()) { Width = Unit.Percentage(100) }); mBrowseGrid.Columns.Add(new DFBrowseGridAutoColumn()); + var hPanel = result.EAdd(new HLayoutPanel()); + PageUtil.AddExcelExportPanel(hPanel, mBrowseGrid, "白条状态看板"); return result; } diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs index ddce1b6..c8cd8d3 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassStoreAnalyse_/CarcassStoreAnalyse.cs @@ -109,6 +109,8 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassStoreAnalyse_ var result = new TitlePanel("查询结果"); mBrowseGrid = result.EAdd(new DFBrowseGrid(new DFDataTableEditor()) { Width = Unit.Percentage(100) }); mBrowseGrid.Columns.Add(new DFBrowseGridAutoColumn()); + var hPanel = result.EAdd(new HLayoutPanel()); + PageUtil.AddExcelExportPanel(hPanel, mBrowseGrid, "白条库存"); return result; } diff --git a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs index 3e3f158..74f4cf2 100644 --- a/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs +++ b/B3ClientService.Web/Pages/B3ClientService/Reports/CarcassTrendAnalyse_/CarcassTrendAnalyse.cs @@ -70,6 +70,8 @@ namespace BWP.Web.Pages.B3ClientService.Reports.CarcassTrendAnalyse_ var result = new TitlePanel("查询结果"); mBrowseGrid = result.EAdd(new DFBrowseGrid(new DFDataTableEditor()) { Width = Unit.Percentage(100) }); mBrowseGrid.Columns.Add(new DFBrowseGridAutoColumn()); + var hPanel = result.EAdd(new HLayoutPanel()); + PageUtil.AddExcelExportPanel(hPanel, mBrowseGrid, "白条流向"); return result; } diff --git a/B3ClientService/NamedValueTemplate.cs b/B3ClientService/NamedValueTemplate.cs index 90ebe91..4c47d2e 100644 --- a/B3ClientService/NamedValueTemplate.cs +++ b/B3ClientService/NamedValueTemplate.cs @@ -19,6 +19,8 @@ namespace BWP.B3ClientService.NamedValueTemplate { public static readonly NamedValue<终端> 白条入库 = new NamedValue<终端>(0); public static readonly NamedValue<终端> 白条领用 = new NamedValue<终端>(1); + public static readonly NamedValue<终端> 分割生产 = new NamedValue<终端>(2); + public static readonly NamedValue<终端> 分割入库 = new NamedValue<终端>(3); } public sealed class 适用客户端 diff --git a/WebFolder/config/NamedValue/B3ClientService.xml b/WebFolder/config/NamedValue/B3ClientService.xml index 6d0fd8b..128b884 100644 --- a/WebFolder/config/NamedValue/B3ClientService.xml +++ b/WebFolder/config/NamedValue/B3ClientService.xml @@ -10,6 +10,8 @@ + +