diff --git a/Controllers/building_four.Controller.cs b/Controllers/building_four.Controller.cs index c4e8c25..e3a4e94 100644 --- a/Controllers/building_four.Controller.cs +++ b/Controllers/building_four.Controller.cs @@ -10,10 +10,11 @@ using FastReport.Export.OoXML; using FastReport.Export.Pdf; using Microsoft.AspNetCore.Mvc; using rmutr_report.Models; +using Swashbuckle.AspNetCore.Annotations; namespace rmutr_report.Controllers { - //[SwaggerTag("สำหรับรายงาน ง.4")] + [SwaggerTag("สำหรับรายงาน ง.4")] public class BuildingFour : Controller { readonly Setting _setting; diff --git a/Models/budget/building_four.cs b/Models/budget/building_four.cs index 144e03e..236346c 100644 --- a/Models/budget/building_four.cs +++ b/Models/budget/building_four.cs @@ -40,14 +40,70 @@ namespace rmutr_report.Models public List spending_plan { get; set; } public string budget_spending_plan_year { get; set; } //public decimal? spending_plan_amount { get; set; } + + public string work_group_2 { get; set; } + public string work_group_3 { get; set; } + public string work_group_5 { get; set; } + public string work_group_6 { get; set; } + public string work_group_7 { get; set; } + public string work_group_8 { get; set; } + public string work_group_9 { get; set; } + public string work_group_10 { get; set; } + public string work_group_11 { get; set; } + public string work_group_12 { get; set; } + public string work_group_13 { get; set; } public string project_name_1 { get; set; } public string project_name_2 { get; set; } public string project_name_3 { get; set; } - public string list_4 { get; set; } public string project_name_4 { get; set; } + public string project_name_5 { get; set; } + public string project_name_6 { get; set; } + public string project_name_7 { get; set; } + public string project_name_8 { get; set; } + public string project_name_9 { get; set; } + public string project_name_10 { get; set; } + public string project_name_11 { get; set; } + public string project_name_12 { get; set; } + public string project_name_13 { get; set; } + public string location_name_1 { get; set; } + public string location_name_2 { get; set; } + public string location_name_3 { get; set; } + public string location_name_4 { get; set; } + public string location_name_5 { get; set; } + public string location_name_6{ get; set; } + public string location_name_7{ get; set; } + public string location_name_8{ get; set; } + public string location_name_9{ get; set; } + public string location_name_10{ get; set; } + public string location_name_11{ get; set; } + public string location_name_12{ get; set; } + public string location_name_13{ get; set; } + public string list_4 { get; set; } public string model_number_1 { get; set; } public string model_number_2 { get; set; } public string model_number_3 { get; set; } + public string model_number_5 { get; set; } + public string model_number_6 { get; set; } + public string model_number_7 { get; set; } + public string model_number_8 { get; set; } + public string model_number_9 { get; set; } + public string model_number_10 { get; set; } + public string model_number_11 { get; set; } + public string model_number_12 { get; set; } + public string model_number_13 { get; set; } + public string agency_name_1 { get; set; } + public string agency_name_2 { get; set; } + public string agency_name_3 { get; set; } + public string agency_name_4 { get; set; } + public string agency_name_5 { get; set; } + public string agency_name_6 { get; set; } + public string agency_name_7 { get; set; } + public string agency_name_8 { get; set; } + public string agency_name_9 { get; set; } + public string agency_name_10 { get; set; } + public string agency_name_11 { get; set; } + public string agency_name_12 { get; set; } + public string agency_name_13 { get; set; } public string number_pages_1 { get; set; } public string number_pages_2 { get; set; } public string number_pages_3 { get; set; } @@ -55,6 +111,15 @@ namespace rmutr_report.Models public string calculate_price_date_2 { get; set; } public string calculate_price_date_3 { get; set; } public string calculate_price_date_4 { get; set; } + public string calculate_price_date_5 { get; set; } + public string calculate_price_date_6 { get; set; } + public string calculate_price_date_7 { get; set; } + public string calculate_price_date_8 { get; set; } + public string calculate_price_date_9 { get; set; } + public string calculate_price_date_10 { get; set; } + public string calculate_price_date_11 { get; set; } + public string calculate_price_date_12 { get; set; } + public string calculate_price_date_13 { get; set; } public string reason { get; set; } public decimal? construct_total_amount { get; set; } public decimal? mid_amount { get; set; } @@ -70,6 +135,60 @@ namespace rmutr_report.Models public List material_construction_labor2 { get; set; } public List material_construction_labor3 { get; set; } public List expense_category { get; set; } + public List demolish_category { get; set; } + public List engineering_category { get; set; } + public List architectural_category { get; set; } + public List bathroom_category { get; set; } + public List sanitary_system_category { get; set; } + public List electrical_system_category { get; set; } + public List air_conditioning_category { get; set; } + public List durable_goods_category { get; set; } + public List extra_cost_category { get; set; } + public decimal? total_material_unit1 { get; set; } + public decimal? total_material_cost1 { get; set; } + public decimal? total_labor_unit1 { get; set; } + public decimal? total_labor_cost1 { get; set; } + public decimal? total_all1 { get; set; } + public decimal? total_material_unit2 { get; set; } + public decimal? total_material_cost2 { get; set; } + public decimal? total_labor_unit2 { get; set; } + public decimal? total_labor_cost2 { get; set; } + public decimal? total_all2 { get; set; } + public decimal? total_material_unit3 { get; set; } + public decimal? total_material_cost3 { get; set; } + public decimal? total_labor_unit3 { get; set; } + public decimal? total_labor_cost3 { get; set; } + public decimal? total_all3 { get; set; } + public decimal? total_material_unit4 { get; set; } + public decimal? total_material_cost4 { get; set; } + public decimal? total_labor_unit4 { get; set; } + public decimal? total_labor_cost4 { get; set; } + public decimal? total_all4 { get; set; } + public decimal? total_material_unit5 { get; set; } + public decimal? total_material_cost5 { get; set; } + public decimal? total_labor_unit5 { get; set; } + public decimal? total_labor_cost5 { get; set; } + public decimal? total_all5 { get; set; } + public decimal? total_material_unit6 { get; set; } + public decimal? total_material_cost6 { get; set; } + public decimal? total_labor_unit6 { get; set; } + public decimal? total_labor_cost6 { get; set; } + public decimal? total_all6 { get; set; } + public decimal? total_material_unit7 { get; set; } + public decimal? total_material_cost7 { get; set; } + public decimal? total_labor_unit7 { get; set; } + public decimal? total_labor_cost7 { get; set; } + public decimal? total_all7 { get; set; } + public decimal? total_material_unit8 { get; set; } + public decimal? total_material_cost8 { get; set; } + public decimal? total_labor_unit8 { get; set; } + public decimal? total_labor_cost8 { get; set; } + public decimal? total_all8 { get; set; } + public decimal? total_material_unit9 { get; set; } + public decimal? total_material_cost9 { get; set; } + public decimal? total_labor_unit9 { get; set; } + public decimal? total_labor_cost9 { get; set; } + public decimal? total_all9 { get; set; } public string url_file { get; set; } public decimal? material_total_amount1 { get; set; } public decimal? material_total_amount2 { get; set; } @@ -215,6 +334,19 @@ namespace rmutr_report.Models public string note { get; set; } } + public class demolish_categorys + { + public string list { get; set; } + public decimal? amount { get; set; } + public string unit { get; set; } + public decimal? material_unit { get; set; } + public decimal? material_cost { get; set; } + public decimal? labor_unit { get; set; } + public decimal? labor_cost { get; set; } + public decimal? total { get; set; } + public string note { get; set; } + } + public class details_division_work { diff --git a/bin/Debug/net5.0/ref/rmutr-report.dll b/bin/Debug/net5.0/ref/rmutr-report.dll index df3ec87..5ef180f 100644 Binary files a/bin/Debug/net5.0/ref/rmutr-report.dll and b/bin/Debug/net5.0/ref/rmutr-report.dll differ diff --git a/bin/Debug/net5.0/rmutr-report.dll b/bin/Debug/net5.0/rmutr-report.dll index d13c18f..90ddc43 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 37cef05..ccbe860 100644 Binary files a/bin/Debug/net5.0/rmutr-report.pdb and b/bin/Debug/net5.0/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 df3ec87..5ef180f 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/rmutr-report.dll b/obj/Debug/net5.0/rmutr-report.dll index d13c18f..90ddc43 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.pdb b/obj/Debug/net5.0/rmutr-report.pdb index 37cef05..ccbe860 100644 Binary files a/obj/Debug/net5.0/rmutr-report.pdb and b/obj/Debug/net5.0/rmutr-report.pdb differ diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx index 1b189af..142c0a8 100644 --- a/wwwroot/reports/building_fours.frx +++ b/wwwroot/reports/building_fours.frx @@ -1,5 +1,5 @@  - + @@ -123,12 +123,20 @@ + + + + + + + + @@ -161,6 +169,217 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -203,7 +422,7 @@ - + @@ -214,16 +433,16 @@ - + - + - + - + @@ -240,7 +459,7 @@ - + @@ -260,7 +479,7 @@ - + @@ -281,7 +500,7 @@ - + @@ -308,7 +527,7 @@ - + @@ -332,38 +551,38 @@ - + - + - + - + - + - + - + - + - + @@ -378,7 +597,7 @@ - + @@ -391,7 +610,7 @@ - + @@ -407,10 +626,10 @@ - + - + @@ -419,9 +638,9 @@ - + - + @@ -488,7 +707,7 @@ - + @@ -522,7 +741,7 @@ - + @@ -538,16 +757,14 @@ - - - - - - - - + + + + + - + + @@ -560,7 +777,7 @@ - + @@ -588,7 +805,7 @@ - + @@ -608,7 +825,7 @@ - + @@ -628,17 +845,15 @@ - - - - - - - - + + + + + + - - + + @@ -655,7 +870,7 @@ - + @@ -676,7 +891,7 @@ - + @@ -696,7 +911,7 @@ - + @@ -716,17 +931,15 @@ - - - - - - - - + + + + + + - - + + @@ -743,7 +956,7 @@ - + @@ -763,7 +976,7 @@ - + @@ -783,17 +996,994 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -810,7 +2000,7 @@ - + @@ -829,7 +2019,7 @@ - +