diff --git a/Controllers/Personnel.Controller.cs b/Controllers/Personnel.Controller.cs index 1dd7a98..d36158f 100644 --- a/Controllers/Personnel.Controller.cs +++ b/Controllers/Personnel.Controller.cs @@ -810,12 +810,12 @@ namespace rmutr_report.Controllers ws.Cell("C12").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("C12").Style.Font.FontSize = 16; ws.Cell("C12").Style.Font.Bold = true; - ws.Cell("C12").Value = "เบิกจ่ายปี งปม."+personnel.year1.Substring(2,2); - ws.Cell("C12").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; - ws.Cell("C12").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; - ws.Cell("C12").Style.Font.FontName = "TH SarabunPSK"; - ws.Cell("C12").Style.Font.FontSize = 16; - ws.Cell("C12").Style.Font.Bold = true; + ws.Cell("D12").Value = "เบิกจ่ายปี งปม."+personnel.year1.Substring(2,2); + ws.Cell("D12").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Cell("D12").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; + ws.Cell("D12").Style.Font.FontName = "TH SarabunPSK"; + 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.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("F12").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; @@ -888,12 +888,12 @@ namespace rmutr_report.Controllers ws.Cell("C13").Style.Font.FontName = "TH SarabunPSK"; ws.Cell("C13").Style.Font.FontSize = 16; ws.Cell("C13").Style.Font.Bold = true; - ws.Cell("C13").Value = "จ่ายจริง "+personnel.actually_paid_month; - ws.Cell("C13").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; - ws.Cell("C13").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; - ws.Cell("C13").Style.Font.FontName = "TH SarabunPSK"; - ws.Cell("C13").Style.Font.FontSize = 16; - ws.Cell("C13").Style.Font.Bold = true; + ws.Cell("D13").Value = "จ่ายจริง "+personnel.actually_paid_month; + ws.Cell("D13").Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left; + ws.Cell("D13").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; + ws.Cell("D13").Style.Font.FontName = "TH SarabunPSK"; + 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.Alignment.Horizontal = XLAlignmentHorizontalValues.Right; ws.Cell("F13").Style.Alignment.Vertical = XLAlignmentVerticalValues.Center; diff --git a/bin/Debug/net5.0/rmutr-report.dll b/bin/Debug/net5.0/rmutr-report.dll index 31602ea..2b40220 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 f0aaf3a..f287758 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/rmutr-report.dll b/obj/Debug/net5.0/rmutr-report.dll index 31602ea..2b40220 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 f0aaf3a..f287758 100644 Binary files a/obj/Debug/net5.0/rmutr-report.pdb and b/obj/Debug/net5.0/rmutr-report.pdb differ