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

bug fixed

Browse Source
This commit is contained in:
kamonwan taengsuk
2023-03-23 11:02:12 +07:00
parent 905360683d
commit cd5f274c60
4 changed files with 819 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1423
Controllers/Summary.Controller.cs
View File

File diff suppressed because it is too large Load Diff

19
Controllers/building_four.Controller.cs
View File

@@ -109,6 +109,25 @@ namespace rmutr_report.Controllers
} }
foreach (var boqPrice in building_fours.boq)
{
if (boqPrice.is_data == "1")
{
boqPrice.text1 = "- มี วงเงิน "+ boqPrice.have + " บาท";
boqPrice.text2 = "- ดำเนินการจัดทำ BOQ เดือน "+ boqPrice.pending_boq_month;
boqPrice.text3 = "- BOQ แล้วเสร็จเดือน "+ boqPrice.done_boq_month;
boqPrice.text4 = "- ขออนุมัติ BOQ เดือน "+ boqPrice.approval_month;
boqPrice.text5 = "- ทำสัญญาก่อสร้าง เดือน "+ boqPrice.construction_contract_month;
}
if (boqPrice.is_data == "2")
{
boqPrice.text1 = "- ไม่มี";
boqPrice.text2 = "- กรณีไม่มีคาดว่าจะแล้วเสร็จ เดือน "+ boqPrice.months + " ปี "+
boqPrice.years;
boqPrice.text3 = "- ขณะนี้อยูในขั้นตอน "+ boqPrice.step;
}
}
var _building_fours = new List<building_four>() {building_fours}; var _building_fours = new List<building_four>() {building_fours};

10
Models/budget/building_four.cs
View File

@@ -13,7 +13,7 @@ namespace rmutr_report.Models
public string product { get; set; } public string product { get; set; }
public string budget_year { get; set; } public string budget_year { get; set; }
public List<building_four_detail> data { get; set; } public List<building_four_detail> data { get; set; }
public string year_range { get; set; } public string list { get; set; }
public List<building_type> building_type { get; set; } public List<building_type> building_type { get; set; }
public string year1 { get; set; } public string year1 { get; set; }
public string year2 { get; set; } public string year2 { get; set; }
@@ -124,12 +124,18 @@ namespace rmutr_report.Models
public class boq_price public class boq_price
{ {
public string is_data { get; set; }
public string text1 { get; set; }
public string text2 { get; set; }
public string text3 { get; set; }
public string text4 { get; set; }
public string text5 { get; set; }
public string have { get; set; } public string have { get; set; }
public string pending_boq_month { get; set; } public string pending_boq_month { get; set; }
public string done_boq_month { get; set; } public string done_boq_month { get; set; }
public string approval_month { get; set; } public string approval_month { get; set; }
public string construction_contract_month { get; set; } public string construction_contract_month { get; set; }
public string no_have { get; set; } //public string no_have { get; set; }
public string months { get; set; } public string months { get; set; }
public string years { get; set; } public string years { get; set; }
public string step { get; set; } public string step { get; set; }

123
wwwroot/reports/building_fours.frx
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="03/02/2023 21:57:02" ReportInfo.Modified="03/22/2023 22:11:27" ReportInfo.CreatorVersion="2022.1.0.0"> <Report ScriptLanguage="CSharp" ReportInfo.Created="03/02/2023 21:57:02" ReportInfo.Modified="03/23/2023 10:21:46" ReportInfo.CreatorVersion="2022.1.0.0">
<Dictionary> <Dictionary>
<BusinessObjectDataSource Name="building_four" ReferenceName="building_four" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="building_four" ReferenceName="building_four" DataType="null" Enabled="true">
<Column Name="agency_faculty" DataType="System.String"/> <Column Name="agency_faculty" DataType="System.String"/>
@@ -11,7 +11,7 @@
<Column Name="product" DataType="System.String"/> <Column Name="product" DataType="System.String"/>
<Column Name="budget_year" DataType="System.String"/> <Column Name="budget_year" DataType="System.String"/>
<Column Name="budget_spending_plan_year" DataType="System.String"/> <Column Name="budget_spending_plan_year" DataType="System.String"/>
<Column Name="year_range" DataType="System.String"/> <Column Name="list" DataType="System.String"/>
<Column Name="necessity_reason" DataType="System.String"/> <Column Name="necessity_reason" DataType="System.String"/>
<Column Name="utility" DataType="System.String"/> <Column Name="utility" DataType="System.String"/>
<Column Name="processing_time" DataType="System.String"/> <Column Name="processing_time" DataType="System.String"/>
@@ -90,12 +90,17 @@
<Column Name="construction_contract_month" DataType="System.String"/> <Column Name="construction_contract_month" DataType="System.String"/>
</BusinessObjectDataSource> </BusinessObjectDataSource>
<BusinessObjectDataSource Name="boq" DataType="null" Enabled="true"> <BusinessObjectDataSource Name="boq" DataType="null" Enabled="true">
<Column Name="is_data" DataType="System.String"/>
<Column Name="text1" DataType="System.String"/>
<Column Name="text2" DataType="System.String"/>
<Column Name="text3" DataType="System.String"/>
<Column Name="text4" DataType="System.String"/>
<Column Name="text5" DataType="System.String"/>
<Column Name="have" DataType="System.String"/> <Column Name="have" DataType="System.String"/>
<Column Name="pending_boq_month" DataType="System.String"/> <Column Name="pending_boq_month" DataType="System.String"/>
<Column Name="done_boq_month" DataType="System.String"/> <Column Name="done_boq_month" DataType="System.String"/>
<Column Name="approval_month" DataType="System.String"/> <Column Name="approval_month" DataType="System.String"/>
<Column Name="construction_contract_month" DataType="System.String"/> <Column Name="construction_contract_month" DataType="System.String"/>
<Column Name="no_have" DataType="System.String"/>
<Column Name="months" DataType="System.String"/> <Column Name="months" DataType="System.String"/>
<Column Name="years" DataType="System.String"/> <Column Name="years" DataType="System.String"/>
<Column Name="step" DataType="System.String"/> <Column Name="step" DataType="System.String"/>
@@ -181,7 +186,7 @@
</DataBand> </DataBand>
<DataBand Name="Data3" Top="311.81" Width="718.2" Height="103.95"> <DataBand Name="Data3" Top="311.81" Width="718.2" Height="103.95">
<TextObject Name="Text54" Width="292.95" Height="28.35" Text="1. จำแนกประเภทสิ่งก่อสร้าง" Font="TH SarabunPSK, 16pt, style=Bold"/> <TextObject Name="Text54" Width="292.95" Height="28.35" Text="1. จำแนกประเภทสิ่งก่อสร้าง" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TextObject Name="Text55" Left="75.6" Top="28.35" Width="642.6" Height="28.35" Text="สิ่งก่อสร้างที่มีภาระผูกพัน (ทำสัญญาเรียบร้อยแล้ว งบประมาณปี [building_four.year_range])" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text55" Left="75.6" Top="28.35" Width="737.1" Height="28.35" Text="[building_four.list]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text70" Top="75.6" Width="699.3" Height="28.35" Text="2. ประเภทสิ่งก่อสร้าง (เลือกตอบเพียง 1 ข้อย่อยเท่านั้น)" Font="TH SarabunPSK, 16pt, style=Bold"/> <TextObject Name="Text70" Top="75.6" Width="699.3" Height="28.35" Text="2. ประเภทสิ่งก่อสร้าง (เลือกตอบเพียง 1 ข้อย่อยเท่านั้น)" Font="TH SarabunPSK, 16pt, style=Bold"/>
<DataBand Name="Data4" Top="420.47" Width="718.2" Height="56.7"> <DataBand Name="Data4" Top="420.47" Width="718.2" Height="56.7">
<TextObject Name="Text71" Width="718.2" Height="56.7" Text="[building_four.building_type.type_name]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH SarabunPSK, 16pt" TextFill.Color="Blue"/> <TextObject Name="Text71" Width="718.2" Height="56.7" Text="[building_four.building_type.type_name]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH SarabunPSK, 16pt" TextFill.Color="Blue"/>
@@ -298,7 +303,7 @@
</DataBand> </DataBand>
</DataBand> </DataBand>
<DataBand Name="Data9" Top="812.51" Width="718.2" Height="85.05"> <DataBand Name="Data9" Top="812.51" Width="718.2" Height="85.05">
<TextObject Name="Text75" Left="47.25" Width="595.35" Height="85.05" Text="[building_four.building_type.text_footer]" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text75" Left="47.25" Width="670.95" Height="85.05" Text="[building_four.building_type.text_footer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="12" Font="TH SarabunPSK, 16pt"/>
</DataBand> </DataBand>
</DataBand> </DataBand>
<DataBand Name="Data8" Top="902.26" Width="718.2" Height="28.35"> <DataBand Name="Data8" Top="902.26" Width="718.2" Height="28.35">
@@ -385,15 +390,12 @@
</DataBand> </DataBand>
<DataBand Name="Data20" Top="1761.99" Width="718.2" Height="28.35"> <DataBand Name="Data20" Top="1761.99" Width="718.2" Height="28.35">
<TextObject Name="Text98" Width="359.1" Height="28.35" Text="11. ราคาประมาณการ (BOQ)" Font="TH SarabunPSK, 16pt, style=Bold"/> <TextObject Name="Text98" Width="359.1" Height="28.35" Text="11. ราคาประมาณการ (BOQ)" Font="TH SarabunPSK, 16pt, style=Bold"/>
<DataBand Name="Data21" Top="1795.04" Width="718.2" Height="226.8" DataSource="boq"> <DataBand Name="Data21" Top="1795.04" Width="718.2" Height="141.75" DataSource="boq">
<TextObject Name="Text99" Left="47.25" Width="661.5" Height="28.35" Text="- มี วงเงิน [building_four.boq.have] บาท" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text99" Left="47.25" Width="661.5" Height="28.35" Text="[building_four.boq.text1]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text100" Left="66.15" Top="28.35" Width="642.6" Height="28.35" Text="- ดำเนินการจัดทำ BOQ เดือน [building_four.boq.pending_boq_month]" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text100" Left="66.15" Top="28.35" Width="642.6" Height="28.35" Text="[building_four.boq.text2]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text101" Left="66.15" Top="56.7" Width="642.6" Height="28.35" Text="- BOQ แล้วเสร็จเดือน [building_four.boq.done_boq_month]" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text101" Left="66.15" Top="56.7" Width="642.6" Height="28.35" Text="[building_four.boq.text3]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text102" Left="66.15" Top="85.05" Width="642.6" Height="28.35" Text="- ขออนุมัติ BOQ เดือน [building_four.boq.approval_month]" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text102" Left="66.15" Top="85.05" Width="642.6" Height="28.35" Text="[building_four.boq.text4]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text103" Left="66.15" Top="113.4" Width="642.6" Height="28.35" Text="- ทำสัญญาก่อสร้าง เดือน [building_four.boq.construction_contract_month]" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text103" Left="66.15" Top="113.4" Width="642.6" Height="28.35" Text="[building_four.boq.text5]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text104" Left="47.25" Top="141.75" Width="661.5" Height="28.35" Text="- ไม่มี" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text105" Left="66.15" Top="170.1" Width="642.6" Height="28.35" Text="- กรณีไม่มีคาดว่าจะแล้วเสร็จ เดือน [building_four.boq.months] ปี [building_four.boq.years]" Font="TH SarabunPSK, 16pt"/>
<TextObject Name="Text106" Left="66.15" Top="198.45" Width="642.6" Height="28.35" Text="- ขณะนี้อยูในขั้นตอน [building_four.boq.step]" Font="TH SarabunPSK, 16pt"/>
</DataBand> </DataBand>
</DataBand> </DataBand>
</ReportPage> </ReportPage>
@@ -490,9 +492,98 @@
</DataBand> </DataBand>
</ReportPage> </ReportPage>
<ReportPage Name="Page3" RawPaperSize="9" Watermark.Font="Arial, 60pt"> <ReportPage Name="Page3" RawPaperSize="9" Watermark.Font="Arial, 60pt">
<DataBand Name="Data31" Width="718.2" Height="28.35"> <DataBand Name="Data24" Width="718.2" Height="75.6">
<TextObject Name="Text118" Width="812.7" Height="28.35" Hyperlink.Expression="[building_four.url_file]" Text="[building_four.url_file]" Font="TH SarabunPSK, 16pt"/> <TextObject Name="Text1" Width="718.2" Height="28.35" Text="13. บัญชีแสดงปริมาณวัสดุและแรงงานค่าก่อสร้าง" Font="TH SarabunPSK, 16pt, style=Bold"/>
<TableObject Name="Table3" Top="28.35" Width="718.2" Height="47.25">
<TableColumn Name="Column3" Width="47.25"/>
<TableColumn Name="Column4" Width="141.75"/>
<TableColumn Name="Column7" Width="56.7"/>
<TableColumn Name="Column8" Width="56.7"/>
<TableColumn Name="Column9" Width="141.75"/>
<TableColumn Name="Column149" Width="141.75"/>
<TableColumn Name="Column150"/>
<TableColumn Name="Column151"/>
<TableRow Name="Row3" Height="47.25">
<TableCell Name="Cell3" Border.Lines="All" Text="ลำดับ&#13;&#10;ที่" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell4" Border.Lines="All" Text="กิจกรรมการดำเนินงาน" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell7" Border.Lines="All" Text="ปริมาณ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell8" Border.Lines="All" Text="หน่วย" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell9" Border.Lines="All" Text="ค่าวัสดุ" HorzAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell199" Border.Lines="All" Text="ค่าแรงงาน" HorzAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell200" Border.Lines="All" Text="ราคารวม" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell201" Border.Lines="All" Text="หมายเหตุ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
</TableRow>
</TableObject>
<TableObject Name="Table4" Left="302.4" Top="47.25" Width="141.75" Height="28.35">
<TableColumn Name="Column10" Width="75.6"/>
<TableColumn Name="Column11"/>
<TableRow Name="Row4" Height="28.35">
<TableCell Name="Cell10" Border.Lines="All" Text="หน่วยละ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 10pt, style=Bold"/>
<TableCell Name="Cell11" Border.Lines="All" Text="รวมเงิน" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 10pt, style=Bold"/>
</TableRow>
</TableObject>
<TableObject Name="Table34" Left="444.15" Top="47.25" Width="141.75" Height="28.35">
<TableColumn Name="Column154" Width="75.6"/>
<TableColumn Name="Column155"/>
<TableRow Name="Row44" Height="28.35">
<TableCell Name="Cell204" Border.Lines="All" Text="หน่วยละ" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 10pt, style=Bold"/>
<TableCell Name="Cell205" Border.Lines="All" Text="รวมเงิน" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 10pt, style=Bold"/>
</TableRow>
</TableObject>
<DataBand Name="Data25" Top="80.31" Width="718.2" Height="47.25" DataSource="material_construction_labor">
<TableObject Name="Table8" Width="718.2" Height="47.25">
<TableColumn Name="Column22" Width="47.25"/>
<TableColumn Name="Column23" Width="141.75"/>
<TableColumn Name="Column24" Width="56.7"/>
<TableColumn Name="Column25" Width="56.7"/>
<TableColumn Name="Column26" Width="75.6"/>
<TableColumn Name="Column27"/>
<TableColumn Name="Column28" Width="75.6"/>
<TableColumn Name="Column29"/>
<TableColumn Name="Column30"/>
<TableColumn Name="Column31"/>
<TableRow Name="Row8" Height="47.25">
<TableCell Name="Cell22" Border.Lines="All" Text="[Row#]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell23" Border.Lines="All" Text="[building_four.material_construction_labor.operational_activities]" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell24" Border.Lines="All" Text="[building_four.material_construction_labor.amount]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell25" Border.Lines="All" Text="[building_four.material_construction_labor.unit]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell26" Border.Lines="All" Text="[building_four.material_construction_labor.material_unit]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell27" Border.Lines="All" Text="[building_four.material_construction_labor.material_cost]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell28" Border.Lines="All" Text="[building_four.material_construction_labor.labor_unit]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell29" Border.Lines="All" Text="[building_four.material_construction_labor.labor_cost]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell30" Border.Lines="All" Text="[building_four.material_construction_labor.total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell31" Border.Lines="All" Text="[building_four.material_construction_labor.note]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
</TableRow>
</TableObject>
</DataBand>
</DataBand> </DataBand>
<ReportSummaryBand Name="ReportSummary1" Top="132.26" Width="718.2" Height="75.6">
<TableObject Name="Table35" Width="718.2" Height="28.35">
<TableColumn Name="Column156" Width="47.25"/>
<TableColumn Name="Column157" Width="141.75"/>
<TableColumn Name="Column158" Width="56.7"/>
<TableColumn Name="Column159" Width="56.7"/>
<TableColumn Name="Column160" Width="75.6"/>
<TableColumn Name="Column161"/>
<TableColumn Name="Column162" Width="75.6"/>
<TableColumn Name="Column163"/>
<TableColumn Name="Column164"/>
<TableColumn Name="Column165"/>
<TableRow Name="Row45" Height="28.35">
<TableCell Name="Cell206" Border.Lines="All" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell207" Border.Lines="All" Text="รวมทั้งสิ้น" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell208" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell209" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell210" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell211" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell212" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell213" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
<TableCell Name="Cell214" Border.Lines="All" Text="[building_four.material_total_amount]" Format="Number" Format.UseLocale="true" Format.DecimalDigits="0" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt, style=Bold"/>
<TableCell Name="Cell215" Border.Lines="All" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 12pt"/>
</TableRow>
</TableObject>
<TextObject Name="Text119" Top="47.25" Width="812.7" Height="28.35" Hyperlink.Expression="[building_four.url_file]" Text="[building_four.url_file]" Font="TH SarabunPSK, 16pt"/>
</ReportSummaryBand>
</ReportPage> </ReportPage>
<ReportPage Name="Page4" RawPaperSize="9" Watermark.Font="Arial, 60pt"> <ReportPage Name="Page4" RawPaperSize="9" Watermark.Font="Arial, 60pt">
<DataBand Name="Data26" Width="718.2" Height="113.4"> <DataBand Name="Data26" Width="718.2" Height="113.4">