From 7137b4f2c26e4bfccefcbb23a79b0766b3b1d9d9 Mon Sep 17 00:00:00 2001 From: kamonwan taengsuk Date: Thu, 22 Aug 2024 14:52:15 +0700 Subject: [PATCH] Remove code --- Controllers/Budget.Controller.cs | 24 +++---------------- obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs | 2 +- .../rmutr_report.AssemblyInfoInputs.cache | 2 +- obj/rider.project.model.nuget.info | 2 +- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index f9338b0..bc27f9a 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2736,15 +2736,7 @@ 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==5) { indetail.topic5 = indetail.topic; @@ -2755,22 +2747,13 @@ 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==6) { indetail.topic9 = indetail.topic; indetail.topic10 = indetail.qualification; indetail.amount9 = indetail.value1; - indetail.amount10 = indetail.value2*12; + indetail.amount10 = indetail.value2; indetail.text9 = "อัตรา"; indetail.text10 = "บาท"; indetail.row_no3 = no3; @@ -2808,7 +2791,6 @@ namespace rmutr_report.Controllers indetail.amount13 = indetail.value1; indetail.amount14 = indetail.value2; indetail.amount15 = indetail.value3; - //indetail.amount16 = indetail.value4; indetail.text18 = "บาท"; indetail.text19 = "."; indetail.row_no6 = no6; diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index 80e0980..efad618 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+be506637963d971c493b17d48cff9051e6c1e186")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+28053412e780bc3285cdba6f9429908f29b578e1")] [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache index 14ea95d..168fdad 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -bb854ecd343ad1946095299c5eea83cbf1d92adfdf83d66497b41101e0ce62e3 +c930d5c248796f391f6acd0016fb66ad32d9e616e81b02e67616561e4789b2b0 diff --git a/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info index 4b187a0..df16566 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17235282175005895 \ No newline at end of file +17241552033399582 \ No newline at end of file