diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs index 70d7427..51cfb23 100644 --- a/Controllers/Budget.Controller.cs +++ b/Controllers/Budget.Controller.cs @@ -2700,8 +2700,9 @@ namespace rmutr_report.Controllers int no7 = 1; int no8 = 0; int no9 = 0; - int no10 = 1; + int no10 = 0; bool numberingtype10 = false; + bool numberingtype13 = false; bool startNumbering = false; bool startNumbering2 = false; bool startNumbering3 = false; @@ -2807,10 +2808,8 @@ namespace rmutr_report.Controllers indetail.topic14 = indetail.topic; indetail.amount16 = indetail.value2; indetail.text20 = "บาท"; - //indetail.row_no1 = no1; - //no1++; - //startNumbering3 = true; - //no8 = 1; + numberingtype13 = true; + no10 = 1; } if (indetail.topic_type==12) { @@ -2830,21 +2829,11 @@ namespace rmutr_report.Controllers startNumbering3 = true; no8 = 1; } - // if (indetail.topic_type==13&&indetail.topic!="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ"&&indetail.topic!="ค่าใช้จ่ายดำเนินงาน")// - if (indetail.topic_type==13&&indetail.topic=="เงินอุดหนุน ค่าใช้จ่ายโครงการ") - { - indetail.row_no10 = 1; - - } - if (indetail.topic_type==13&&indetail.topic=="ค่าครุภัณฑ์") - { - indetail.row_no10 = 1; - - } - if (indetail.topic_type==13&&indetail.topic=="ค่าที่ดินและสิ่งก่อสร้าง") - { - indetail.row_no10 = 2; - + //if (numberingtype13&&indetail.topic_type==13&&indetail.topic=="เงินอุดหนุน ค่าใช้จ่ายโครงการ"||indetail.topic=="ค่าครุภัณฑ์"||indetail.topic=="ค่าที่ดินและสิ่งก่อสร้าง") + if (numberingtype13&&indetail.topic_type==13&&indetail.topic!="ค่าตอบแทน ค่าใช้สอยและค่าวัสดุ"&&indetail.topic!="ค่าใช้จ่ายดำเนินงาน") + { + indetail.row_no10 = no10; + no10++; } if (startNumbering3&&indetail.topic_type==14)// { diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 02673ed..b665f79 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 8f871f6..87a96ae 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/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs index a516938..f5f08e1 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+a58f124c5e1b7bf7f1b0591338972b1f20fc15ef")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9f3a5950c6b7ac84b119c1da665181a21fa0cc3d")] [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 b9ed8ae..441e57d 100644 --- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -a0b143487f58687fcc3a233d310f87177bc7f39ae577501ceb3c1b6e985ed707 +6e26ef425d4087be28f5fb85467b9c133a915d3e1912eee2a3f15b843cf44656 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs index a516938..f5f08e1 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs +++ b/obj/Debug/netcoreapp3.1/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+a58f124c5e1b7bf7f1b0591338972b1f20fc15ef")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9f3a5950c6b7ac84b119c1da665181a21fa0cc3d")] [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/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache index b9ed8ae..441e57d 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache @@ -1 +1 @@ -a0b143487f58687fcc3a233d310f87177bc7f39ae577501ceb3c1b6e985ed707 +6e26ef425d4087be28f5fb85467b9c133a915d3e1912eee2a3f15b843cf44656 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache index 6e27f2f..a6a161c 100644 --- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache +++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache @@ -1 +1 @@ -71dbdc370cb9ef82945d6737f2f7a61200e20b5f6e8324df2cb0a1160a0f7103 +3a116f3c0c9cf22172c0ea51b3597dbcd2a282291e8f917ee57f68aa92c16ec0 diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 02673ed..b665f79 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 8f871f6..87a96ae 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.model.nuget.info b/obj/rider.project.model.nuget.info index df16566..c19d258 100644 --- a/obj/rider.project.model.nuget.info +++ b/obj/rider.project.model.nuget.info @@ -1 +1 @@ -17241552033399582 \ No newline at end of file +17244186673993103 \ No newline at end of file diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info index c19d258..9fb68d4 100644 --- a/obj/rider.project.restore.info +++ b/obj/rider.project.restore.info @@ -1 +1 @@ -17244186673993103 \ No newline at end of file +17246377264487259 \ No newline at end of file