diff --git a/Controllers/durable_articles_three.Controller.cs b/Controllers/durable_articles_three.Controller.cs index 819d260..114184a 100644 --- a/Controllers/durable_articles_three.Controller.cs +++ b/Controllers/durable_articles_three.Controller.cs @@ -30,25 +30,7 @@ namespace rmutr_report.Controllers public IActionResult GetHrReport([FromRoute] string type, [FromBody] durable_articles_three durable_articles_threes) { - //Console.WriteLine(durable_articles_threes.specification_data[0].data_detail[0].data_detail2); - // var a1 = durable_articles_threes.data.Sum(o => o.amount); - // if (durable_articles_threes.data!=null) - // { - // durable_articles_threes.total_amount = a1; - // - // } - - // int a = 1; - // foreach (var q in durable_articles_threes.quotation) - // { - // - // string t = "ใบเสนอราคาบริษัทที่ " + a++ +" "; - // q.company = t + q.company; - // //a++; - // } - - - var _durable_articles_three = new List() { durable_articles_threes }; + var _durable_articles_three = new List() { durable_articles_threes }; Report report = new Report(); report.Load(_setting.report_path + "durable_articles_three.frx"); @@ -96,20 +78,20 @@ namespace rmutr_report.Controllers report.Export(excelExport, stream); stream.Seek(0, SeekOrigin.Begin); - using (var package = new ExcelPackage(stream)) - { - ExcelWorksheet worksheet = package.Workbook.Worksheets[0]; - - if (worksheet.Dimension != null) - { - //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns(); - worksheet.Cells[worksheet.Dimension.Address].Style.WrapText = true; - } - - package.Save(); - } - - stream.Seek(0, SeekOrigin.Begin); + // using (var package = new ExcelPackage(stream)) + // { + // ExcelWorksheet worksheet = package.Workbook.Worksheets[0]; + // + // if (worksheet.Dimension != null) + // { + // //worksheet.Cells[worksheet.Dimension.Address].AutoFitColumns(); + // worksheet.Cells[worksheet.Dimension.Address].Style.WrapText = true; + // } + // + // package.Save(); + // } + // + // stream.Seek(0, SeekOrigin.Begin); return File(stream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); } diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 728b208..b404076 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb index 561bd11..12d4e17 100644 Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index c547851..82bf118 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+270216d8d7f9b31b247342904d2ffdf650860318")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+84e8167acae7c6ce75082889ae05f72de4031fab")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index 296d94f..9915c84 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -0b8257cc5f79a53168f1226be3eb122441e2f5fdb66e278c0d66c0851bd19bff +22c2f30ff504ab44871d3a8c2236a3f3b96ed9489552a365d3e6532adab30422 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index c547851..82bf118 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+270216d8d7f9b31b247342904d2ffdf650860318")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+84e8167acae7c6ce75082889ae05f72de4031fab")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index 296d94f..9915c84 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -0b8257cc5f79a53168f1226be3eb122441e2f5fdb66e278c0d66c0851bd19bff +22c2f30ff504ab44871d3a8c2236a3f3b96ed9489552a365d3e6532adab30422 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index 13a6b52..c771867 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -7a39c6e274965a418d7645fe73ed56e865dc8bc070cc89bac511f2342882ae9d +1dcc72c16778f3f6e43acb04d5117a06a3b8b3e85eb3acf3f0e42c9daad71ca4 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 728b208..b404076 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb index 561bd11..12d4e17 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 3c051af..aa93b45 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17265722909247533 \ No newline at end of file +17266332419919719 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index aa93b45..8b1015d 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17266332419919719 \ No newline at end of file +17266365726007029 \ No newline at end of file diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index ee1acfb..bac261d 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -214,7 +214,7 @@ - + @@ -225,8 +225,8 @@ - - + + @@ -234,10 +234,10 @@ - - - - + + + + @@ -340,7 +340,7 @@ - + @@ -363,19 +363,19 @@ - + - + - + - - - + + +