kamonwantaengsuk/rmutr_report
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Bug Fixed
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
kamonwan taengsuk
2024-08-23 20:13:50 +07:00
parent a58f124c5e
commit 9f3a5950c6
20 changed files with 114 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
Controllers/Budget.Controller.cs
View File

@@ -2692,16 +2692,24 @@ namespace rmutr_report.Controllers
[FromBody] budget_expenditure_report_from_revenue_v2 budget)
{
int no1 = 1;
int no2 = 1;
int no3 = 1;
int no4 = 1;
int no2 = 0;
int no3 = 0;
int no4 = 0;
int no5 = 1;
int no6 = 1;
int no6 = 0;
int no7 = 1;
int no8 = 1;
var detail = budget.details.ToArray();
foreach (var indetail in detail)
int no8 = 0;
int no9 = 0;
int no10 = 1;
bool numberingtype10 = false;
bool startNumbering = false;
bool startNumbering2 = false;
bool startNumbering3 = false;
bool startNumbering4 = false;
bool startNumbering5 = false;
foreach (var indetail in budget.details)
{
if (indetail.topic_type==1)
{
indetail.topic1 = indetail.topic;
@@ -2735,9 +2743,11 @@ namespace rmutr_report.Controllers
indetail.text6 = "บาท";
indetail.row_no1 = no1;
no1++;
startNumbering = true;
no2 = 1;
}
if (indetail.topic_type==5)
if (startNumbering && indetail.topic_type==5)
{
indetail.topic5 = indetail.topic;
indetail.amount7 = indetail.value1;
@@ -2745,10 +2755,12 @@ namespace rmutr_report.Controllers
indetail.text7 = "อัตรา";
indetail.text8 = "บาท";
indetail.row_no2 = no2;
no2++;
no2++;
startNumbering2 = true;
no3 = 1;
}
if (indetail.topic_type==6)
if (startNumbering2 &&indetail.topic_type==6)
{
indetail.topic9 = indetail.topic;
indetail.topic10 = indetail.qualification;
@@ -2759,15 +2771,7 @@ namespace rmutr_report.Controllers
indetail.row_no3 = no3;
no3++;
}
if (indetail.topic_type==7)
{
indetail.topic11 = indetail.topic;
indetail.amount11 = indetail.value1;
indetail.text11 = "บาท";
indetail.row_no4 = no4;
no4++;
}
if (indetail.topic_type==8)
if (indetail.topic_type==8)
{
indetail.topic12 = indetail.topic;
indetail.amount12 = indetail.value1;
@@ -2783,9 +2787,10 @@ namespace rmutr_report.Controllers
indetail.text15 = "หน่วยนับ";
indetail.text16 = "ราคาต่อหน่วย";
indetail.text17 = "รวมเงิน";
numberingtype10 = true;
no6 = 1;
}
if (indetail.topic_type==10)
if (numberingtype10&&indetail.topic_type==10)//
{
indetail.topic13 = indetail.topic;
indetail.amount13 = indetail.value1;
@@ -2802,7 +2807,10 @@ namespace rmutr_report.Controllers
indetail.topic14 = indetail.topic;
indetail.amount16 = indetail.value2;
indetail.text20 = "บาท";
//indetail.row_no1 = no1;
//no1++;
//startNumbering3 = true;
//no8 = 1;
}
if (indetail.topic_type==12)
{
@@ -2812,24 +2820,66 @@ namespace rmutr_report.Controllers
indetail.text22 = ".";
indetail.row_no7 = no7;
no7++;
}
if (indetail.topic_type==13)
if (indetail.topic_type==13)//
{
indetail.topic16 = indetail.topic;
indetail.amount18 = indetail.value2;
indetail.text23 = "บาท";
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==14)
if (indetail.topic_type==13&&indetail.topic=="ค่าที่ดินและสิ่งก่อสร้าง")
{
indetail.row_no10 = 2;
}
if (startNumbering3&&indetail.topic_type==14)//
{
indetail.topic17 = indetail.topic;
indetail.amount19 = indetail.value2;
indetail.text24 = "บาท";
indetail.row_no8 = no8;
no8++;
indetail.row_no8 = no8;
no8++;
startNumbering4 = true;
no4 = 1;
}
if (startNumbering4 &&indetail.topic_type==7&&indetail.is_other!=true)//
{
indetail.topic11 = indetail.topic;
indetail.amount11 = indetail.value1;
indetail.text11 = "บาท";
indetail.row_no4 = no4;
no4++;
startNumbering5 = true;
no9 = 1;
}
if (startNumbering5&&indetail.topic_type==7&&indetail.is_other==true)
{
indetail.topic18 = indetail.topic;
indetail.amount20 = indetail.value1;
indetail.text25 = "บาท";
indetail.text26 = ".";
indetail.row_no9 = no9;
no9++;
}
}
int academic_year_name_th = Convert.ToInt32(budget.academic_year_name_th);
budget.academic_year_1 = (academic_year_name_th-1).ToString();
budget.academic_year_2 = academic_year_name_th.ToString();
var sum1 = budget.details.Where(f=>f.topic_type==1).Sum(d => d.value1);
var sum2 = budget.details.Where(f=>f.topic_type==2&&f.topic == "รายการบุคลากร").Sum(d => d.value2);
budget.total = sum1+sum2;

10
Models/budget/budget_expenditure_report_from_revenue_v2.cs
View File

@@ -9,12 +9,15 @@ namespace rmutr_report.Models
public string parent_agency_name { get; set; } //หน่วยงาน
public string agency_name_th { get; set; } //พื้นที่
public decimal? total { get; set; }
public string academic_year_1 { get; set; }
public string academic_year_2 { get; set; }
public List<budget_expenditure_report_from_revenue_v2_detail> details { get; set; }
}
public class budget_expenditure_report_from_revenue_v2_detail
{
public int? topic_type { get; set; }
public bool? is_other { get; set; }
public int? row_no1 { get; set; }
public int? row_no2 { get; set; }
public int? row_no3 { get; set; }
@@ -23,6 +26,8 @@ namespace rmutr_report.Models
public int? row_no6 { get; set; }
public int? row_no7 { get; set; }
public int? row_no8 { get; set; }
public int? row_no9 { get; set; }
public int? row_no10 { get; set; }
public string topic { get; set; }
public string qualification { get; set; }
public string unit { get; set; }
@@ -47,6 +52,7 @@ namespace rmutr_report.Models
public string topic15 { get; set; }
public string topic16 { get; set; }
public string topic17 { get; set; }
public string topic18 { get; set; }
public decimal? amount1 { get; set; }
public decimal? amount2 { get; set; }
public decimal? amount3 { get; set; }
@@ -66,6 +72,7 @@ namespace rmutr_report.Models
public decimal? amount17 { get; set; }
public decimal? amount18 { get; set; }
public decimal? amount19 { get; set; }
public decimal? amount20 { get; set; }
public string text1 { get; set; }
public string text2 { get; set; }
public string text3 { get; set; }
@@ -90,6 +97,7 @@ namespace rmutr_report.Models
public string text22 { get; set; }
public string text23 { get; set; }
public string text24 { get; set; }
//public string line { get; set; }
public string text25 { get; set; }
public string text26 { get; set; }
}
}

BIN
bin/Debug/net5.0/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/net5.0/rmutr_report.pdb
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
bin/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

BIN
obj/Debug/net5.0/ref/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/refint/rmutr_report.dll
View File

Binary file not shown.

2
obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
View File

@@ -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+7137b4f2c26e4bfccefcbb23a79b0766b3b1d9d9")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a58f124c5e1b7bf7f1b0591338972b1f20fc15ef")]
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
View File

@@ -1 +1 @@
4fc55d7fe67163ea39ae278786d3fa415d97ea0737e0aadc65b0b3c224d08a73
a0b143487f58687fcc3a233d310f87177bc7f39ae577501ceb3c1b6e985ed707

2
obj/Debug/net5.0/rmutr_report.RazorTargetAssemblyInfo.cache
View File

@@ -1 +1 @@
18d969bee34f2773c817401f309a2895e4bed6fa15fa976682d2da1b92c7a164
71dbdc370cb9ef82945d6737f2f7a61200e20b5f6e8324df2cb0a1160a0f7103

BIN
obj/Debug/net5.0/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/net5.0/rmutr_report.pdb
View File

Binary file not shown.

2
obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
View File

@@ -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+a58f124c5e1b7bf7f1b0591338972b1f20fc15ef")]
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

2
obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
View File

@@ -1 +1 @@
bb854ecd343ad1946095299c5eea83cbf1d92adfdf83d66497b41101e0ce62e3
a0b143487f58687fcc3a233d310f87177bc7f39ae577501ceb3c1b6e985ed707

2
obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
View File

@@ -1 +1 @@
279632d20a71efddaec7d7dd8e4f82c69645ce40f221ec526dfebe37ed8f764e
71dbdc370cb9ef82945d6737f2f7a61200e20b5f6e8324df2cb0a1160a0f7103

BIN
obj/Debug/netcoreapp3.1/rmutr_report.dll
View File

Binary file not shown.

BIN
obj/Debug/netcoreapp3.1/rmutr_report.pdb
View File

Binary file not shown.

2
obj/rider.project.restore.info
View File

@@ -1 +1 @@
17241552033399582
17244186673993103

28
wwwroot/reports/budget_expenditure_report_from_revenue_v2.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="01/29/2024 11:35:11" ReportInfo.CreatorVersion="2021.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="07/13/2023 16:12:54" ReportInfo.Modified="08/23/2024 20:07:34" ReportInfo.CreatorVersion="2021.1.0.0">
<Dictionary>
<BusinessObjectDataSource Name="budget_expenditure_report_from_revenue_v2" ReferenceName="budget_expenditure_report_from_revenue_v2" DataType="null" Enabled="true">
<Column Name="academic_year_name_th" DataType="System.String"/>
@@ -7,6 +7,8 @@
<Column Name="parent_agency_name" DataType="System.String"/>
<Column Name="agency_name_th" DataType="System.String"/>
<Column Name="total" DataType="System.Decimal"/>
<Column Name="academic_year_1" DataType="System.String"/>
<Column Name="academic_year_2" DataType="System.String"/>
<BusinessObjectDataSource Name="details" DataType="System.Int32" Enabled="true">
<Column Name="topic_type" DataType="System.Int32"/>
<Column Name="row_no1" DataType="System.Int32"/>
@@ -17,6 +19,8 @@
<Column Name="row_no6" DataType="System.Int32"/>
<Column Name="row_no7" DataType="System.Int32"/>
<Column Name="row_no8" DataType="System.Int32"/>
<Column Name="row_no9" DataType="System.Int32"/>
<Column Name="row_no10" DataType="System.Int32"/>
<Column Name="topic" DataType="System.String"/>
<Column Name="amount1" DataType="System.Decimal"/>
<Column Name="amount2" DataType="System.Decimal"/>
@@ -37,6 +41,7 @@
<Column Name="amount17" DataType="System.Decimal"/>
<Column Name="amount18" DataType="System.Decimal"/>
<Column Name="amount19" DataType="System.Decimal"/>
<Column Name="amount20" DataType="System.Decimal"/>
<Column Name="topic1" DataType="System.String"/>
<Column Name="topic2" DataType="System.String"/>
<Column Name="topic3" DataType="System.String"/>
@@ -54,6 +59,7 @@
<Column Name="topic15" DataType="System.String"/>
<Column Name="topic16" DataType="System.String"/>
<Column Name="topic17" DataType="System.String"/>
<Column Name="topic18" DataType="System.String"/>
<Column Name="text1" DataType="System.String"/>
<Column Name="text2" DataType="System.String"/>
<Column Name="text3" DataType="System.String"/>
@@ -78,6 +84,8 @@
<Column Name="text22" DataType="System.String"/>
<Column Name="text23" DataType="System.String"/>
<Column Name="text24" DataType="System.String"/>
<Column Name="text25" DataType="System.String"/>
<Column Name="text26" DataType="System.String"/>
<Column Name="unit" DataType="System.String"/>
</BusinessObjectDataSource>
</BusinessObjectDataSource>
@@ -96,13 +104,14 @@
<TextObject Name="Text4" Top="132.3" Width="94.5" Height="37.8" Text="หน่วยงาน :" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<LineObject Name="Line3" Left="85.05" Top="122.85" Width="491.4" Diagonal="true"/>
<TextObject Name="Text3" Top="94.5" Width="75.6" Height="37.8" Text="พื้นที่ :" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม 2565 - 30 กันยายน 2566 )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text2" Top="37.8" Width="945" Height="37.8" Text="( 1 ตุลาคม [budget_expenditure_report_from_revenue_v2.academic_year_1] - 30 กันยายน [budget_expenditure_report_from_revenue_v2.academic_year_2] )" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<TextObject Name="Text1" Width="945" Height="37.8" Text="งบประมาณรายจ่ายจากเงินรายได้ ประจำปีงบประมาณ พ.ศ. [budget_expenditure_report_from_revenue_v2.academic_year_name_th]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold"/>
<DataBand Name="Data3" Top="212.39" Width="945" Height="28.35" CanShrink="true" DataSource="details">
<TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="0, 32, 96"/>
<DataBand Name="Data3" Top="213.09" Width="945" Height="28.35" CanShrink="true" DataSource="details">
<TextObject Name="Text29" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic5]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text11" Width="604.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic1]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
<TextObject Name="Text14" Left="18.9" Width="491.4" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic2]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="32, 55, 100"/>
<TextObject Name="Text15" Left="699.3" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount2]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>
<TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="0, 32, 96"/>
<TextObject Name="Text12" Left="727.65" Width="141.75" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount1]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
<TextObject Name="Text17" Left="28.35" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic3]" AutoShrink="FontSize" AutoShrinkMinSize="14" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold, Underline" TextFill.Color="31, 78, 120"/>
<TextObject Name="Text18" Left="548.1" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount3]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
<TextObject Name="Text19" Left="604.8" Width="66.15" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text3]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
@@ -112,7 +121,6 @@
<TextObject Name="Text25" Left="595.35" Width="56.7" Height="28.35" Text=" [budget_expenditure_report_from_revenue_v2.details.text5]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text26" Left="642.6" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount6]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
<TextObject Name="Text28" Left="66.15" Width="37.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no2]" HorzAlign="Center" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text29" Left="103.95" Width="415.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic5]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text30" Left="519.75" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount7]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text31" Left="548.1" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text7]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text32" Left="614.25" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount8]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
@@ -149,7 +157,7 @@
<TextObject Name="Text66" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount17]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
<TextObject Name="Text67" Left="793.8" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text21]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
<TextObject Name="Text16" Left="841.05" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text2]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="32, 55, 100"/>
<TextObject Name="Text13" Left="869.4" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text1]" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="0, 32, 96"/>
<TextObject Name="Text13" Left="869.4" Width="56.7" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text1]" VertAlign="Center" Font="TH Sarabun New, 17.5pt, style=Bold" TextFill.Color="0, 32, 96"/>
<TextObject Name="Text69" Left="66.15" Width="472.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic16]" AutoShrink="FontSize" AutoShrinkMinSize="11" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold, Underline"/>
<TextObject Name="Text70" Left="765.45" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text23]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text71" Left="737.1" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text24]" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
@@ -162,6 +170,12 @@
<TextObject Name="Text48" Left="567" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text12]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 15pt"/>
<TextObject Name="Text20" Left="670.95" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount4]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 18pt, style=Bold" TextFill.Color="31, 78, 120"/>
<TextObject Name="Text73" Left="642.6" Width="122.85" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount18]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text74" Left="170.1" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no9][budget_expenditure_report_from_revenue_v2.details.text26]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
<TextObject Name="Text75" Left="198.45" Width="226.8" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.topic18]" AutoShrink="FontSize" AutoShrinkMinSize="9" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
<TextObject Name="Text77" Left="519.75" Width="47.25" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.text25]" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
<TextObject Name="Text76" Left="425.25" Width="94.5" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.amount20]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" AutoShrink="FontSize" AutoShrinkMinSize="12" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 13pt"/>
<TextObject Name="Text78" Left="75.6" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no8]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
<TextObject Name="Text79" Left="37.8" Width="28.35" Height="28.35" Text="[budget_expenditure_report_from_revenue_v2.details.row_no10]" HorzAlign="Right" VertAlign="Center" Font="TH Sarabun New, 16pt, style=Bold"/>
</DataBand>
</DataBand>
</ReportPage>