diff --git a/Controllers/Personnel.Controller.cs b/Controllers/Personnel.Controller.cs index e034b33..4639695 100644 --- a/Controllers/Personnel.Controller.cs +++ b/Controllers/Personnel.Controller.cs @@ -4217,6 +4217,7 @@ namespace rmutr_report.Controllers ws.Cell("H8").Style.Font.FontSize = 16; ws.Cell("H8").Style.Font.Bold = true; ws.Range("I8:J8").Merge().Value = personnel.budget1; + ws.Range("I8:J8").Style.NumberFormat.Format = "#,##0.0000"; ws.Range("I8:J8").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range("I8:J8").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Range("I8:J8").Style.Font.FontName = "TH SarabunPSK"; @@ -4266,6 +4267,7 @@ namespace rmutr_report.Controllers ws.Cell("H8").Style.Font.FontSize = 16; ws.Cell("H8").Style.Font.Bold = true; ws.Range("I10:J10").Merge().Value = personnel.budget1; + ws.Range("I10:J10").Style.NumberFormat.Format = "#,##0.0000"; ws.Range("I10:J10").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Range("I10:J10").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Range("I10:J10").Style.Font.FontName = "TH SarabunPSK"; @@ -4284,6 +4286,7 @@ namespace rmutr_report.Controllers ws.Cell("A12").Style.Font.FontSize = 16; ws.Cell("A12").Style.Font.Bold = true; ws.Cell("B12").Value = personnel.act_old1; + ws.Cell("B12").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("B12").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("B12").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("B12").Style.Font.FontName = "TH SarabunPSK"; @@ -4302,6 +4305,7 @@ namespace rmutr_report.Controllers ws.Cell("D12").Style.Font.FontSize = 16; ws.Cell("D12").Style.Font.Bold = true; ws.Cell("F12").Value = personnel.disbursement_year_act_old1; + ws.Cell("F12").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("F12").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("F12").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("F12").Style.Font.FontName = "TH SarabunPSK"; @@ -4332,6 +4336,7 @@ namespace rmutr_report.Controllers ws.Cell("J12").Style.Font.FontSize = 16; ws.Cell("J12").Style.Font.Bold = true; ws.Cell("K12").Value = personnel.remaining_act_old1; + ws.Cell("K12").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("K12").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("K12").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("K12").Style.Font.FontName = "TH SarabunPSK"; @@ -4362,6 +4367,7 @@ namespace rmutr_report.Controllers ws.Cell("A13").Style.Font.FontSize = 16; ws.Cell("A13").Style.Font.Bold = true; ws.Cell("B13").Value = personnel.act_old2; + ws.Cell("B13").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("B13").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("B13").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("B13").Style.Font.FontName = "TH SarabunPSK"; @@ -4380,6 +4386,7 @@ namespace rmutr_report.Controllers ws.Cell("D13").Style.Font.FontSize = 16; ws.Cell("D13").Style.Font.Bold = true; ws.Cell("F13").Value = personnel.actually_paid; + ws.Cell("F13").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("F13").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("F13").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("F13").Style.Font.FontName = "TH SarabunPSK"; @@ -4410,6 +4417,7 @@ namespace rmutr_report.Controllers ws.Cell("J13").Style.Font.FontSize = 16; ws.Cell("J13").Style.Font.Bold = true; ws.Cell("K13").Value = personnel.remaining_act_old2; + ws.Cell("K13").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("K13").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("K13").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("K13").Style.Font.FontName = "TH SarabunPSK"; @@ -4440,6 +4448,7 @@ namespace rmutr_report.Controllers ws.Cell("A14").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("A14").Style.Font.FontSize = 16; ws.Cell("B14").Value = personnel.not_include_salary1; + ws.Cell("A14").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("B14").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("B14").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("B14").Style.Font.FontName = "TH SarabunPSK"; @@ -4455,6 +4464,7 @@ namespace rmutr_report.Controllers ws.Cell("D14").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("D14").Style.Font.FontSize = 16; ws.Cell("F14").Value = personnel.not_include_salary2; + ws.Cell("F14").Style.NumberFormat.Format = "#,##0.0000"; ws.Cell("F14").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("F14").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; ws.Cell("F14").Style.Font.FontName = "TH SarabunPSK"; diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll index 8635871..80b0211 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 3720f17..7b407c0 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/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll index 8635871..80b0211 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 3720f17..7b407c0 100644 Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ