diff --git a/Controllers/building_four.Controller.cs b/Controllers/building_four.Controller.cs index b463bf7..77151c8 100644 --- a/Controllers/building_four.Controller.cs +++ b/Controllers/building_four.Controller.cs @@ -166,6 +166,11 @@ namespace rmutr_report.Controllers //boqPrice.list = str.Insert(i, ","); } } + + if (boqPrice.list == "10000000") + { + boqPrice.list = "10,000,000"; + } } foreach (var boqPrice in building_fours.boq) @@ -225,7 +230,10 @@ namespace rmutr_report.Controllers // boqPrice.have.Replace("10000000.0000", "10,000,000"); // } - + if (boqPrice.have == "10000000") + { + boqPrice.have = "10,000,000"; + } boqPrice.text1 = "- มี วงเงิน " + boqPrice.have + " บาท"; boqPrice.text2 = "- ดำเนินการจัดทำ BOQ เดือน " + boqPrice.pending_boq_month; boqPrice.text3 = "- BOQ แล้วเสร็จเดือน " + boqPrice.done_boq_month; diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs index d9e92e6..a2cd895 100644 --- a/Models/budget/durable_articles_three.cs +++ b/Models/budget/durable_articles_three.cs @@ -112,6 +112,14 @@ namespace rmutr_report.Models public string list { get; set;} public string quantity { get; set;} public string attribute { get; set;} + public List data_detail2 { get; set; } + + } + + public class specification_data_details2 + { + public string attribute { get; set;} + } public class budget_spending_plans diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index 3df2e07..c8853fc 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -1,5 +1,5 @@  - + @@ -65,6 +65,9 @@ + + + @@ -252,6 +255,9 @@ + + +