diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 7e8b2e0..42fa9fe 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2653,6 +2653,8 @@ namespace rmutr_report.Controllers int no4 = 1; int no5 = 1; int no6 = 1; + int no7 = 1; + int no8 = 1; var detail = budget.details.ToArray(); foreach (var indetail in detail) @@ -2662,18 +2664,14 @@ namespace rmutr_report.Controllers indetail.topic1 = indetail.topic; indetail.amount1 = indetail.value1; indetail.text1 = "บาท"; - indetail.topic2 = null; - indetail.amount2 = null; - indetail.text2 = null; + } if (indetail.topic_type==2) { indetail.topic2 = indetail.topic; indetail.amount2 = indetail.value1; indetail.text2 = "บาท"; - indetail.topic1 = null; - indetail.amount1 = null; - indetail.text1 = null; + } if (indetail.topic_type==3) { @@ -2682,28 +2680,9 @@ namespace rmutr_report.Controllers indetail.amount4 = indetail.value2; indetail.text3 = "อัตรา"; indetail.text4 = "บาท"; - indetail.topic1 = null; - indetail.amount1 = null; - indetail.text1 = null; - indetail.topic2 = null; - indetail.amount2 = null; - indetail.text2 = null; - } - if (indetail.topic_type==3 && indetail.topic=="งบดําเนินงาน") - { - indetail.topic3 = indetail.topic; - //indetail.amount3 = indetail.value1; - indetail.amount4 = indetail.value1; - indetail.text3 = null; - indetail.text4 = "บาท"; - indetail.topic1 = null; - indetail.amount1 = null; - indetail.text1 = null; - indetail.topic2 = null; - indetail.amount2 = null; - indetail.amount3 = null; - indetail.text2 = null; + } + if (indetail.topic_type==4) { indetail.topic4 = indetail.topic; @@ -2714,15 +2693,15 @@ namespace rmutr_report.Controllers indetail.row_no1 = no1; no1++; } - if (indetail.topic_type==4&& indetail.topic=="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ") - { - - indetail.row_no1 = null; - indetail.amount6 = indetail.value1; - indetail.text5 = null; - indetail.amount5 =null; - indetail.text6 = "บาท"; - } + // if (indetail.topic_type==4&& indetail.topic=="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ") + // { + // + // indetail.row_no1 = null; + // indetail.amount6 = indetail.value1; + // indetail.text5 = null; + // indetail.amount5 =null; + // indetail.text6 = "บาท"; + // } if (indetail.topic_type==5) { indetail.topic5 = indetail.topic; @@ -2733,16 +2712,16 @@ namespace rmutr_report.Controllers indetail.row_no2 = no2; no2++; } - if (indetail.topic_type==5&& indetail.topic=="ค่าตอบแทน") - { - - indetail.topic5 = indetail.topic; - indetail.amount7 = null; - indetail.amount8 = indetail.value1; - indetail.text7 = null; - indetail.text8 = "บาท"; - indetail.row_no2 = null; - } + // if (indetail.topic_type==5&& indetail.topic=="ค่าตอบแทน") + // { + // + // indetail.topic5 = indetail.topic; + // indetail.amount7 = null; + // indetail.amount8 = indetail.value1; + // indetail.text7 = null; + // indetail.text8 = "บาท"; + // indetail.row_no2 = null; + // } if (indetail.topic_type==6) { indetail.topic9 = indetail.topic; @@ -2793,6 +2772,37 @@ namespace rmutr_report.Controllers no6++; } + if (indetail.topic_type==11) + { + indetail.topic14 = indetail.topic; + indetail.amount16 = indetail.value1; + indetail.text20 = "บาท"; + + } + if (indetail.topic_type==12) + { + indetail.topic15 = indetail.topic; + indetail.amount17 = indetail.value1; + indetail.text21 = "บาท"; + indetail.text22 = "."; + indetail.row_no7 = no7; + no7++; + } + if (indetail.topic_type==13) + { + indetail.topic16 = indetail.topic; + indetail.amount18 = indetail.value1; + indetail.text23 = "บาท"; + + } + if (indetail.topic_type==14) + { + indetail.topic17 = indetail.topic; + indetail.amount19 = indetail.value1; + indetail.text24 = "บาท"; + indetail.row_no8 = no8; + no8++; + } } var budgetExpenditure = new List() { budget }; diff --git a/Models/budget/budget_expenditure_report_from_revenue_v2.cs b/Models/budget/budget_expenditure_report_from_revenue_v2.cs index 90c4abd..bc867df 100644 --- a/Models/budget/budget_expenditure_report_from_revenue_v2.cs +++ b/Models/budget/budget_expenditure_report_from_revenue_v2.cs @@ -21,6 +21,8 @@ namespace rmutr_report.Models public int? row_no4 { get; set; } public int? row_no5 { get; set; } public int? row_no6 { get; set; } + public int? row_no7 { get; set; } + public int? row_no8 { get; set; } public string topic { get; set; } public string qualification { get; set; } public string unit { get; set; } @@ -43,6 +45,8 @@ namespace rmutr_report.Models public string topic13 { get; set; } public string topic14 { get; set; } public string topic15 { get; set; } + public string topic16 { get; set; } + public string topic17 { get; set; } public decimal? amount1 { get; set; } public decimal? amount2 { get; set; } public decimal? amount3 { get; set; } @@ -60,6 +64,8 @@ namespace rmutr_report.Models public decimal? amount15 { get; set; } public decimal? amount16 { get; set; } public decimal? amount17 { get; set; } + public decimal? amount18 { get; set; } + public decimal? amount19 { get; set; } public string text1 { get; set; } public string text2 { get; set; } public string text3 { get; set; } @@ -82,6 +88,8 @@ namespace rmutr_report.Models public string text20 { get; set; } public string text21 { get; set; } public string text22 { get; set; } + public string text23 { get; set; } + public string text24 { get; set; } //public string line { get; set; } } } \ No newline at end of file diff --git a/bin/Debug/net5.0/rmutr_report.dll b/bin/Debug/net5.0/rmutr_report.dll index ccd962e..ca62892 100644 Binary files a/bin/Debug/net5.0/rmutr_report.dll and b/bin/Debug/net5.0/rmutr_report.dll differ diff --git a/bin/Debug/net5.0/rmutr_report.pdb b/bin/Debug/net5.0/rmutr_report.pdb index e1fbb1e..0f903ac 100644 Binary files a/bin/Debug/net5.0/rmutr_report.pdb and b/bin/Debug/net5.0/rmutr_report.pdb differ diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index a00eeed..52bd5a8 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 688c404..2850124 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/ref/rmutr_report.dll b/obj/Debug/net5.0/ref/rmutr_report.dll index 40378fd..f08eb50 100644 Binary files a/obj/Debug/net5.0/ref/rmutr_report.dll and b/obj/Debug/net5.0/ref/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/refint/rmutr_report.dll b/obj/Debug/net5.0/refint/rmutr_report.dll index 40378fd..f08eb50 100644 Binary files a/obj/Debug/net5.0/refint/rmutr_report.dll and b/obj/Debug/net5.0/refint/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache index a5674f5..8c7b669 100644 --- a/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d4f69e2c0b0b612e84d5079dbaec8a33abddb288 +f29f532d408de6504926f35348a4e885e76ac54a diff --git a/obj/Debug/net5.0/rmutr_report.dll b/obj/Debug/net5.0/rmutr_report.dll index ccd962e..ca62892 100644 Binary files a/obj/Debug/net5.0/rmutr_report.dll and b/obj/Debug/net5.0/rmutr_report.dll differ diff --git a/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache index cd61800..cb0391e 100644 --- a/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache +++ b/obj/Debug/net5.0/rmutr_report.genruntimeconfig.cache @@ -1 +1 @@ -25bc6a5eaedb2db86355a587eb0689ad31009d02 +1d39a36735b2d72fa7731390686302bd2991a9b8 diff --git a/obj/Debug/net5.0/rmutr_report.pdb b/obj/Debug/net5.0/rmutr_report.pdb index e1fbb1e..0f903ac 100644 Binary files a/obj/Debug/net5.0/rmutr_report.pdb and b/obj/Debug/net5.0/rmutr_report.pdb differ diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index a00eeed..52bd5a8 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 688c404..2850124 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.restore.info b/obj/rider.project.restore.info index 2ab0b68..181859f 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -16926988309592902 \ No newline at end of file +16927797904985249 \ No newline at end of file diff --git a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx index 8e21b09..ee0ecb2 100644 --- a/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx +++ b/wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx @@ -1,5 +1,5 @@  - + @@ -15,6 +15,8 @@ + + @@ -33,6 +35,8 @@ + + @@ -48,6 +52,8 @@ + + @@ -70,6 +76,8 @@ + + @@ -91,23 +99,20 @@ - - - - - - - - - - - + + + + + + + + + - @@ -122,7 +127,6 @@ - @@ -141,6 +145,23 @@ + + + + + + + + + + + + + + + + +