From 34a9630493bcdac2cbc70eae21976389ccb8560a Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Tue, 28 Mar 2023 12:56:32 +0700 Subject: [PATCH] fixed --- Controllers/building_four.Controller.cs | 12 ++++++++---- wwwroot/reports/durable_articles_three.frx | 13 +++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Controllers/building_four.Controller.cs b/Controllers/building_four.Controller.cs index 40b533f..0c385a3 100644 --- a/Controllers/building_four.Controller.cs +++ b/Controllers/building_four.Controller.cs @@ -153,12 +153,13 @@ namespace rmutr_report.Controllers boqPrice.list = str.Insert(i, ","); //boqPrice.list = str.Insert(i, ","); } - for (int i = 6; i <= str.Length - 1; i += 8) + for (int i = 5; i <= str.Length - 1; i += 8) { boqPrice.list = str.Insert(i, ","); //boqPrice.list = str.Insert(i, ","); } - + boqPrice.list.Replace("10000000", "10,000,000"); + boqPrice.list.Replace("10000000.0000", "10,000,000"); } } @@ -202,12 +203,15 @@ namespace rmutr_report.Controllers boqPrice.have = str.Insert(i, ","); //boqPrice.have = str.Insert(i, ","); } - for (int i = 6; i <= str.Length - 1; i += 8) + for (int i = 5; i <= str.Length - 1; i += 8) { boqPrice.have = str.Insert(i, ","); //boqPrice.list = str.Insert(i, ","); } - + + boqPrice.have.Replace("10000000", "10,000,000"); + boqPrice.have.Replace("10000000.0000", "10,000,000"); + } boqPrice.text1 = "- มี วงเงิน "+ boqPrice.have + " บาท"; boqPrice.text2 = "- ดำเนินการจัดทำ BOQ เดือน "+ boqPrice.pending_boq_month; diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index 76493e2..1c76d48 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -211,16 +211,9 @@ - + - - - - - - - - +