diff --git a/Controllers/building_four.Controller.cs b/Controllers/building_four.Controller.cs index 6f18dbd..063f375 100644 --- a/Controllers/building_four.Controller.cs +++ b/Controllers/building_four.Controller.cs @@ -56,36 +56,36 @@ namespace rmutr_report.Controllers } - foreach (var bb in building_fours.material_construction_labor1) - { - if (bb != null) - { - bb.total_amount = bb.material_cost + bb.labor_unit; - var f = building_fours.material_construction_labor1.Where(d => d.total_amount == d.total_amount) - .Sum(o => o.total_amount); - building_fours.material_total_amount1 = f; - } - } - foreach (var bb in building_fours.material_construction_labor2) - { - if (bb != null) - { - bb.total_amount = bb.material_cost + bb.labor_unit; - var f = building_fours.material_construction_labor2.Where(d => d.total_amount == d.total_amount) - .Sum(o => o.total_amount); - building_fours.material_total_amount2 = f; - } - } - foreach (var bb in building_fours.material_construction_labor3) - { - if (bb != null) - { - bb.total_amount = bb.material_cost + bb.labor_unit; - var f = building_fours.material_construction_labor3.Where(d => d.total_amount == d.total_amount) - .Sum(o => o.total_amount); - building_fours.material_total_amount3 = f; - } - } + // foreach (var bb in building_fours.material_construction_labor1) + // { + // if (bb != null) + // { + // bb.total_amount = bb.material_cost + bb.labor_unit; + // var f = building_fours.material_construction_labor1.Where(d => d.total_amount == d.total_amount) + // .Sum(o => o.total_amount); + // building_fours.material_total_amount1 = f; + // } + // } + // foreach (var bb in building_fours.material_construction_labor2) + // { + // if (bb != null) + // { + // bb.total_amount = bb.material_cost + bb.labor_unit; + // var f = building_fours.material_construction_labor2.Where(d => d.total_amount == d.total_amount) + // .Sum(o => o.total_amount); + // building_fours.material_total_amount2 = f; + // } + // } + // foreach (var bb in building_fours.material_construction_labor3) + // { + // if (bb != null) + // { + // bb.total_amount = bb.material_cost + bb.labor_unit; + // var f = building_fours.material_construction_labor3.Where(d => d.total_amount == d.total_amount) + // .Sum(o => o.total_amount); + // building_fours.material_total_amount3 = f; + // } + // } foreach (var cc in building_fours.budget_limit) { if (cc != null) @@ -104,7 +104,11 @@ namespace rmutr_report.Controllers building_fours.outside_amount = null; } - + + if (cc.amount != null && cc.outside_amount != null) + { + cc.total_amount = cc.amount + cc.outside_amount; + } var c = building_fours.budget_limit.Where(d => d.total_amount == d.total_amount) .Sum(o => o.total_amount); building_fours.total_amount = c; diff --git a/Models/budget/building_four.cs b/Models/budget/building_four.cs index 76b6748..55618f2 100644 --- a/Models/budget/building_four.cs +++ b/Models/budget/building_four.cs @@ -40,9 +40,28 @@ 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 project_name_1 { get; set; } + public string project_name_2 { get; set; } + public string project_name_3 { 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 number_pages_1 { get; set; } + public string number_pages_2 { get; set; } + public string number_pages_3 { get; set; } + public string calculate_price_date_1 { get; set; } + public string calculate_price_date_2 { get; set; } + public string calculate_price_date_3 { get; set; } + public decimal? construct_total_amount { get; set; } + public decimal? mid_amount { get; set; } + public string amount_bath_text { get; set; } + public decimal? total_amount_porro5_1 { get; set; } + public decimal? total_amount_porro5_2 { get; set; } + public decimal? square_meter { get; set; } + public decimal? square_meter_amount { get; set; } public List material_construction_labor1 { get; set; } - public List material_construction_labor2 { get; set; } - public List material_construction_labor3 { get; set; } + public List material_construction_labor2 { get; set; } + public List material_construction_labor3 { get; set; } public string url_file { get; set; } public decimal? material_total_amount1 { get; set; } public decimal? material_total_amount2 { get; set; } @@ -164,19 +183,29 @@ namespace rmutr_report.Models public string month_12 { get; set; } } + public class materials_construction_labor { - public string operational_activities { get; set; } + 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_amount { get; set; } public string note { get; set; } } - + public class materials_construction_labor2 + { + public string list { get; set; } + public decimal? amount1 { get; set; } + public decimal? factor { get; set; } + public decimal? amount2 { get; set; } + public string note { get; set; } + } + public class materials_construction_labor3 + { + public string list { get; set; } + public decimal? amount1 { get; set; } + public string vat { get; set; } + public decimal? amount2 { get; set; } + public string note { get; set; } + } public class details_division_work { public string budget_year { get; set; } diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs index b4c04e1..dba4065 100644 --- a/Models/budget/durable_articles_three.cs +++ b/Models/budget/durable_articles_three.cs @@ -41,10 +41,11 @@ namespace rmutr_report.Models // public string image_description1 { get; set; } // public string image_description2 { get; set; } public List descript_more { get; set; } + public List specification_data { get; set; } public string specification { get; set; } - // public string quantity_specification { get; set; } - // public decimal? unit_price_specification { get; set; } - // public decimal? amount_specification { get; set; } + public string quantity_specification { get; set; } + public decimal? unit_price_specification { get; set; } + public decimal? amount_specification { get; set; } public List budget_spending_plan {get; set; } public string procurement_process { get; set; } public string incurring_debt { get; set; } @@ -97,21 +98,21 @@ namespace rmutr_report.Models public string remark { get; set; } } - // public class specification_datas - // { - // public string specification { get; set; } - // public string quantity { get; set; } - // public decimal? unit_price { get; set; } - // public decimal? amount { get; set; } - // public List data_detail { get; set; } - // } + public class specification_datas + { + public string specification { get; set; } + public string quantity { get; set; } + public decimal? unit_price { get; set; } + public decimal? amount { get; set; } + public List data_detail { get; set; } + } - // public class specification_data_details - // { - // public string list { get; set;} - // public string quantity { get; set;} - // public string attribute { get; set;} - // } + public class specification_data_details + { + public string list { get; set;} + public string quantity { get; set;} + public string attribute { get; set;} + } public class budget_spending_plans { diff --git a/wwwroot/reports/building_fours.frx b/wwwroot/reports/building_fours.frx index c38da1e..76cce96 100644 --- a/wwwroot/reports/building_fours.frx +++ b/wwwroot/reports/building_fours.frx @@ -1,27 +1,5 @@  - - using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel; -using System.Windows.Forms; -using System.Drawing; -using System.Data; -using FastReport; -using FastReport.Data; -using FastReport.Dialog; -using FastReport.Barcode; -using FastReport.Table; -using FastReport.Utils; - -namespace FastReport -{ - public class ReportScript - { - - } -} - + @@ -145,37 +123,42 @@ namespace FastReport + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - + + + + - - - - - - - - + + + + @@ -220,7 +203,7 @@ namespace FastReport - + @@ -231,16 +214,16 @@ namespace FastReport - + - + - + - + @@ -257,7 +240,7 @@ namespace FastReport - + @@ -277,7 +260,7 @@ namespace FastReport - + @@ -298,7 +281,7 @@ namespace FastReport - + @@ -325,7 +308,7 @@ namespace FastReport - + @@ -349,38 +332,38 @@ namespace FastReport - + - + - + - + - + - + - + - + - + @@ -395,7 +378,7 @@ namespace FastReport - + @@ -408,7 +391,7 @@ namespace FastReport - + @@ -424,10 +407,10 @@ namespace FastReport - + - + @@ -436,9 +419,9 @@ namespace FastReport - + - + @@ -505,7 +488,7 @@ namespace FastReport - + @@ -540,283 +523,265 @@ namespace FastReport - - - + + + - - - - - - - + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + - - - - - - - - - + + + - - + + - - - - - - - - - + + + - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx index fd3de4d..c627b6d 100644 --- a/wwwroot/reports/durable_articles_three.frx +++ b/wwwroot/reports/durable_articles_three.frx @@ -32,8 +32,11 @@ - - + + + + + @@ -53,6 +56,17 @@ + + + + + + + + + + + @@ -211,11 +225,38 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +