fixed
This commit is contained in:
@@ -5664,7 +5664,6 @@ namespace rmutr_report.Controllers
|
|||||||
{
|
{
|
||||||
if (detail2.is_header == true)
|
if (detail2.is_header == true)
|
||||||
{
|
{
|
||||||
|
|
||||||
ws.Cell(row + 1, 1).Value = "ส่วนที่ 2 เงินเพิ่มอื่นที่จ่ายควบกับเงินเดือน";
|
ws.Cell(row + 1, 1).Value = "ส่วนที่ 2 เงินเพิ่มอื่นที่จ่ายควบกับเงินเดือน";
|
||||||
ws.Cell(row + 1, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
|
ws.Cell(row + 1, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
|
||||||
ws.Cell(row + 1, 1).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
ws.Cell(row + 1, 1).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
||||||
@@ -5799,35 +5798,53 @@ namespace rmutr_report.Controllers
|
|||||||
ws.Cell(row + 4, 8).Style.Border.OutsideBorder =
|
ws.Cell(row + 4, 8).Style.Border.OutsideBorder =
|
||||||
XLBorderStyleValues.Thin;
|
XLBorderStyleValues.Thin;
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Merge().Value = "MTEF";
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Merge().Value = "MTEF";
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Alignment.Horizontal =
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
XLAlignmentHorizontalValues.Center;
|
||||||
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Alignment.Vertical =
|
||||||
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Font.FontName = "TH SarabunPSK";
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Font.FontName = "TH SarabunPSK";
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Font.SetBold().Font.FontSize = 16;
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Font.SetBold().Font.FontSize = 16;
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Fill.BackgroundColor = XLColor.FromArgb(172, 185, 202);
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Fill.BackgroundColor =
|
||||||
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
XLColor.FromArgb(172, 185, 202);
|
||||||
|
ws.Range(ws.Cell(row + 2, 9), ws.Cell(row + 2, 14)).Style.Border.OutsideBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
|
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Merge().Value = "2567";
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Merge().Value = "2567";
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Alignment.Horizontal =
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
XLAlignmentHorizontalValues.Center;
|
||||||
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Alignment.Vertical =
|
||||||
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Font.FontName = "TH SarabunPSK";
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Font.FontName = "TH SarabunPSK";
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Font.SetBold().Font.FontSize = 16;
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Font.SetBold().Font.FontSize = 16;
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Fill.BackgroundColor = XLColor.FromArgb(172, 185, 202);
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Fill.BackgroundColor =
|
||||||
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
XLColor.FromArgb(172, 185, 202);
|
||||||
|
ws.Range(ws.Cell(row + 3, 9), ws.Cell(row + 3, 10)).Style.Border.OutsideBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
|
|
||||||
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Merge().Value = "2568";
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Merge().Value = "2568";
|
||||||
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Alignment.Horizontal =
|
||||||
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
XLAlignmentHorizontalValues.Center;
|
||||||
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Alignment.Vertical =
|
||||||
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Font.FontName = "TH SarabunPSK";
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Font.FontName = "TH SarabunPSK";
|
||||||
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Font.SetBold().Font.FontSize = 16;
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Font.SetBold().Font.FontSize =
|
||||||
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Fill.BackgroundColor = XLColor.FromArgb(172, 185, 202);
|
16;
|
||||||
ws.Range(ws.Cell(row + 3,11), ws.Cell(row + 3, 12)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Fill.BackgroundColor =
|
||||||
|
XLColor.FromArgb(172, 185, 202);
|
||||||
|
ws.Range(ws.Cell(row + 3, 11), ws.Cell(row + 3, 12)).Style.Border.OutsideBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Merge().Value = "2569";
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Merge().Value = "2569";
|
||||||
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Alignment.Horizontal =
|
||||||
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
XLAlignmentHorizontalValues.Center;
|
||||||
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Alignment.Vertical =
|
||||||
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Font.FontName = "TH SarabunPSK";
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Font.FontName = "TH SarabunPSK";
|
||||||
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Font.SetBold().Font.FontSize = 16;
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Font.SetBold().Font.FontSize =
|
||||||
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Fill.BackgroundColor = XLColor.FromArgb(172, 185, 202);
|
16;
|
||||||
ws.Range(ws.Cell(row + 3,13), ws.Cell(row + 3, 14)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Fill.BackgroundColor =
|
||||||
|
XLColor.FromArgb(172, 185, 202);
|
||||||
|
ws.Range(ws.Cell(row + 3, 13), ws.Cell(row + 3, 14)).Style.Border.OutsideBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
|
|
||||||
ws.Cell(row + 4, 9).Value = "อัตรา";
|
ws.Cell(row + 4, 9).Value = "อัตรา";
|
||||||
ws.Cell(row + 4, 9).Style.Alignment.Horizontal =
|
ws.Cell(row + 4, 9).Style.Alignment.Horizontal =
|
||||||
@@ -5896,13 +5913,17 @@ namespace rmutr_report.Controllers
|
|||||||
ws.Cell(row + 4, 14).Style.Border.OutsideBorder =
|
ws.Cell(row + 4, 14).Style.Border.OutsideBorder =
|
||||||
XLBorderStyleValues.Thin;
|
XLBorderStyleValues.Thin;
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Merge().Value = "คำชี้แจง";
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Merge().Value = "คำชี้แจง";
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Alignment.Horizontal =
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Alignment.Vertical = XLAlignmentVerticalValues.Center;
|
XLAlignmentHorizontalValues.Center;
|
||||||
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Alignment.Vertical =
|
||||||
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Font.FontName = "TH SarabunPSK";
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Font.FontName = "TH SarabunPSK";
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Font.SetBold().Font.FontSize = 16;
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Font.SetBold().Font.FontSize =
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Fill.BackgroundColor = XLColor.FromArgb(214, 220, 228);
|
16;
|
||||||
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Fill.BackgroundColor =
|
||||||
|
XLColor.FromArgb(214, 220, 228);
|
||||||
|
ws.Range(ws.Cell(row + 2, 15), ws.Cell(row + 4, 19)).Style.Border.OutsideBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (detail2.is_bold == true && detail2.list == "รวมทั้งสิ้น")
|
if (detail2.is_bold == true && detail2.list == "รวมทั้งสิ้น")
|
||||||
@@ -5925,8 +5946,10 @@ namespace rmutr_report.Controllers
|
|||||||
//ws.Cell(row + 5, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
//ws.Cell(row + 5, 1).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
// ws.Cell(row + 5, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
// ws.Cell(row + 5, 2).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
// ws.Cell(row + 5, 3).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
// ws.Cell(row + 5, 3).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.BottomBorder = XLBorderStyleValues.Thin;
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.BottomBorder =
|
||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.TopBorder = XLBorderStyleValues.Thin;
|
XLBorderStyleValues.Thin;
|
||||||
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.TopBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
|
|
||||||
ws.Cell(row + 5, 5).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Cell(row + 5, 5).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
ws.Cell(row + 5, 6).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Cell(row + 5, 6).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
@@ -5949,7 +5972,8 @@ namespace rmutr_report.Controllers
|
|||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row, 19)).Style.Alignment.Vertical =
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row, 19)).Style.Alignment.Vertical =
|
||||||
XLAlignmentVerticalValues.Center;
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 5, 5), ws.Cell(row + 5, 14)).Style.NumberFormat.SetFormat("#,#");
|
ws.Range(ws.Cell(row + 5, 5), ws.Cell(row + 5, 14)).Style.NumberFormat.SetFormat("#,#");
|
||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center;
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Alignment.Horizontal =
|
||||||
|
XLAlignmentHorizontalValues.Center;
|
||||||
|
|
||||||
ws.Cell(row + 5, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
ws.Cell(row + 5, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
||||||
ws.Cell(row + 5, 6).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
ws.Cell(row + 5, 6).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
||||||
@@ -5962,8 +5986,8 @@ namespace rmutr_report.Controllers
|
|||||||
ws.Cell(row + 5, 13).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
ws.Cell(row + 5, 13).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
||||||
ws.Cell(row + 5, 14).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
ws.Cell(row + 5, 14).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
||||||
ws.Cell(row + 5, 15).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
|
ws.Cell(row + 5, 15).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (detail2.is_bold == true)
|
if (detail2.is_bold == true)
|
||||||
{
|
{
|
||||||
ws.Cell(row + 5, 1).Value = detail2.type;
|
ws.Cell(row + 5, 1).Value = detail2.type;
|
||||||
@@ -5982,8 +6006,10 @@ namespace rmutr_report.Controllers
|
|||||||
// ws.Cell(row, 16).Value = detail.year3_budget;
|
// ws.Cell(row, 16).Value = detail.year3_budget;
|
||||||
ws.Range(ws.Cell(row + 5, 15), ws.Cell(row + 5, 19)).Merge().Value = detail2.remark;
|
ws.Range(ws.Cell(row + 5, 15), ws.Cell(row + 5, 19)).Merge().Value = detail2.remark;
|
||||||
|
|
||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.TopBorder = XLBorderStyleValues.Thin;
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.TopBorder =
|
||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.BottomBorder = XLBorderStyleValues.Thin;
|
XLBorderStyleValues.Thin;
|
||||||
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 4)).Style.Border.BottomBorder =
|
||||||
|
XLBorderStyleValues.Thin;
|
||||||
|
|
||||||
ws.Cell(row + 5, 5).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Cell(row + 5, 5).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
ws.Cell(row + 5, 6).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
ws.Cell(row + 5, 6).Style.Border.OutsideBorder = XLBorderStyleValues.Thin;
|
||||||
@@ -6024,6 +6050,7 @@ namespace rmutr_report.Controllers
|
|||||||
|
|
||||||
row++;
|
row++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (detail2.is_bold == false)
|
if (detail2.is_bold == false)
|
||||||
{
|
{
|
||||||
ws.Range(ws.Cell(row + 5, 2), ws.Cell(row + 5, 4)).Merge().Value = detail2.list;
|
ws.Range(ws.Cell(row + 5, 2), ws.Cell(row + 5, 4)).Merge().Value = detail2.list;
|
||||||
@@ -6066,7 +6093,8 @@ namespace rmutr_report.Controllers
|
|||||||
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 19)).Style.Alignment.Vertical =
|
ws.Range(ws.Cell(row + 5, 1), ws.Cell(row + 5, 19)).Style.Alignment.Vertical =
|
||||||
XLAlignmentVerticalValues.Center;
|
XLAlignmentVerticalValues.Center;
|
||||||
ws.Range(ws.Cell(row + 5, 5), ws.Cell(row + 5, 14)).Style.NumberFormat.SetFormat("#,#");
|
ws.Range(ws.Cell(row + 5, 5), ws.Cell(row + 5, 14)).Style.NumberFormat.SetFormat("#,#");
|
||||||
ws.Range(ws.Cell(row + 5, 2), ws.Cell(row + 5, 4)).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Left;
|
ws.Range(ws.Cell(row + 5, 2), ws.Cell(row + 5, 4)).Style.Alignment.Horizontal =
|
||||||
|
XLAlignmentHorizontalValues.Left;
|
||||||
|
|
||||||
ws.Cell(row + 5, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
ws.Cell(row + 5, 5).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
||||||
ws.Cell(row + 5, 6).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
ws.Cell(row + 5, 6).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Right;
|
||||||
@@ -6083,9 +6111,9 @@ namespace rmutr_report.Controllers
|
|||||||
|
|
||||||
row++;
|
row++;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ws.Cell(row + 6, 1).Value = "หมายเหตุ : " + personnel.remark;
|
ws.Cell(row + 6, 1).Value = "หมายเหตุ : " + personnel.remark;
|
||||||
ws.Cell(row + 6, 1).Style.Alignment.Horizontal =
|
ws.Cell(row + 6, 1).Style.Alignment.Horizontal =
|
||||||
XLAlignmentHorizontalValues.Left;
|
XLAlignmentHorizontalValues.Left;
|
||||||
|
|||||||
Reference in New Issue
Block a user