From b93ad1e66a8d3c66f92848480e9a7ef537a71820 Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Wed, 5 Apr 2023 10:57:31 +0700
Subject: [PATCH] fixed

---
 Models/budget/durable_articles_three.cs    |  2 +-
 wwwroot/reports/durable_articles_three.frx | 40 ++++++++++------------
 2 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Models/budget/durable_articles_three.cs b/Models/budget/durable_articles_three.cs
index a2cd895..369a27d 100644
--- a/Models/budget/durable_articles_three.cs
+++ b/Models/budget/durable_articles_three.cs
@@ -100,7 +100,7 @@ namespace rmutr_report.Models
     }
     public class specification_datas
     {
-        public string specification { get; set; }
+        public string list { get; set; }
         public string quantity { get; set; }
         public decimal? unit_price { get; set; }
         public decimal? amount { get; set; }
diff --git a/wwwroot/reports/durable_articles_three.frx b/wwwroot/reports/durable_articles_three.frx
index c8853fc..7fdaf14 100644
--- a/wwwroot/reports/durable_articles_three.frx
+++ b/wwwroot/reports/durable_articles_three.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="03/28/2023 14:15:06" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="03/01/2023 13:13:10" ReportInfo.Modified="04/05/2023 10:57:04" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="durable_articles_three" ReferenceName="durable_articles_three" DataType="null" Enabled="true">
       <Column Name="budget_year" DataType="System.String"/>
@@ -57,7 +57,7 @@
         <Column Name="remark" DataType="System.String"/>
       </BusinessObjectDataSource>
       <BusinessObjectDataSource Name="specification_data" DataType="null" Enabled="true">
-        <Column Name="specification" DataType="System.String"/>
+        <Column Name="list" DataType="System.String"/>
         <Column Name="quantity" DataType="System.String"/>
         <Column Name="unit_price" DataType="System.Decimal"/>
         <Column Name="amount" DataType="System.Decimal"/>
@@ -140,8 +140,8 @@
         </TableRow>
       </TableObject>
     </ReportTitleBand>
-    <DataBand Name="Data1" Top="203.39" Width="831.6">
-      <DataBand Name="Data2" Top="208.33" Width="831.6" Height="47.25" DataSource="data">
+    <DataBand Name="Data1" Top="202.94" Width="831.6">
+      <DataBand Name="Data2" Top="207.44" Width="831.6" Height="47.25" DataSource="data">
         <TableObject Name="Table2" Width="831.6" Height="47.25">
           <TableColumn Name="Column5" Width="406.35"/>
           <TableColumn Name="Column6" Width="132.3"/>
@@ -155,7 +155,7 @@
           </TableRow>
         </TableObject>
       </DataBand>
-      <DataFooterBand Name="DataFooter1" Top="260.51" Width="831.6" Height="28.35">
+      <DataFooterBand Name="DataFooter1" Top="259.18" Width="831.6" Height="28.35">
         <TableObject Name="Table3" Width="831.6" Height="28.35">
           <TableColumn Name="Column9" Width="406.35"/>
           <TableColumn Name="Column10" Width="132.3"/>
@@ -170,7 +170,7 @@
         </TableObject>
       </DataFooterBand>
     </DataBand>
-    <DataBand Name="Data3" Top="293.8" Width="831.6" Height="737.1">
+    <DataBand Name="Data3" Top="292.03" Width="831.6" Height="737.1">
       <TextObject Name="Text54" Width="292.95" Height="28.35" Text="2. ประเภทครุภัณฑ์" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text55" Top="28.35" Width="217.35" Height="28.35" Text="[durable_articles_three.durable_type]" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text56" Left="217.35" Top="28.35" Width="567" Height="28.35" Text="ระบุชื่ออาคาร [durable_articles_three.building_name] ห้อง [durable_articles_three.room_name]" Font="TH SarabunPSK, 16pt"/>
@@ -228,9 +228,8 @@
     </DataBand>
   </ReportPage>
   <ReportPage Name="Page4" PaperWidth="240" Watermark.Font="Arial, 60pt">
-    <DataBand Name="Data8" Width="831.6" Height="113.4">
-      <TextObject Name="Text2" Width="812.7" Height="28.35" Text="10. คุณลักษณะเฉพาะ (Specification)" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <TextObject Name="Text3" Top="28.35" Width="812.7" Height="56.7" Text="[durable_articles_three.specification] จำนวน  [durable_articles_three.quantity_specification] ห้อง ราคาต่อหน่วย  [durable_articles_three.unit_price_specification] บาท รวมทั้งสิ้น  [durable_articles_three.amount_specification] บาท " Font="TH Sarabun New, 16pt, style=Bold">
+    <DataBand Name="Data8" Width="831.6" Height="85.05">
+      <TextObject Name="Text3" Width="812.7" Height="85.05" Text="[durable_articles_three.specification_data.list]" Font="TH Sarabun New, 16pt, style=Bold">
         <Formats>
           <NumberFormat/>
           <GeneralFormat/>
@@ -238,9 +237,8 @@
           <GeneralFormat/>
         </Formats>
       </TextObject>
-      <TextObject Name="Text105" Top="85.05" Width="812.7" Height="28.35" Text="ประกอบด้วย" Font="TH Sarabun New, 16pt, style=Bold"/>
-      <DataBand Name="Data9" Top="118.34" Width="831.6" Height="85.05" DataSource="specification_data">
-        <TextObject Name="Text106" Width="812.7" Height="56.7" Text="[durable_articles_three.specification_data.specification] จำนวน  [durable_articles_three.specification_data.quantity] ห้อง ราคาต่อหน่วย  [durable_articles_three.specification_data.unit_price] บาท รวมทั้งสิ้น  [durable_articles_three.specification_data.amount] บาท " Font="TH Sarabun New, 16pt, style=Bold">
+      <DataBand Name="Data9" Top="89.54" Width="831.6" Height="85.05" DataSource="specification_data">
+        <TextObject Name="Text106" Width="812.7" Height="85.05" Text="[durable_articles_three.specification_data.data_detail.list]" Font="TH Sarabun New, 16pt, style=Bold">
           <Formats>
             <NumberFormat/>
             <GeneralFormat/>
@@ -248,14 +246,12 @@
             <GeneralFormat/>
           </Formats>
         </TextObject>
-        <TextObject Name="Text107" Top="56.7" Width="812.7" Height="28.35" Text="ประกอบด้วย" Font="TH Sarabun New, 16pt, style=Bold"/>
-        <DataBand Name="Data10" Top="208.33" Width="831.6" Height="85.05" DataSource="specification_data">
+        <DataBand Name="Data10" Top="179.09" Width="831.6" Height="85.05" DataSource="specification_data">
           <TextObject Name="Text108" Width="812.7" Height="28.35" Text="[durable_articles_three.specification_data.data_detail.list]" Font="TH Sarabun New, 16pt"/>
-          <TextObject Name="Text109" Left="18.9" Top="56.7" Width="812.7" Height="28.35" Text="คุณลักษณะ" Font="TH Sarabun New, 16pt"/>
           <TextObject Name="Text110" Top="28.35" Width="812.7" Height="28.35" Text="[durable_articles_three.specification_data.data_detail.quantity]" Font="TH Sarabun New, 16pt"/>
-          <DataBand Name="Data23" Top="298.31" Width="831.6" Height="47.25" DataSource="data_detail">
+          <DataBand Name="Data23" Top="268.63" Width="831.6" Height="47.25" DataSource="data_detail">
             <TextObject Name="Text111" Left="18.9" Width="812.7" Height="47.25" Text="[durable_articles_three.specification_data.data_detail.attribute]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH Sarabun New, 14pt"/>
-            <DataBand Name="Data20" Top="350.5" Width="831.6" Height="47.25" DataSource="data_detail2">
+            <DataBand Name="Data20" Top="320.38" Width="831.6" Height="47.25" DataSource="data_detail2">
               <TextObject Name="Text135" Left="37.8" Width="812.7" Height="47.25" Text="[durable_articles_three.specification_data.data_detail.data_detail2.attribute]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="11" Font="TH Sarabun New, 14pt"/>
             </DataBand>
           </DataBand>
@@ -361,7 +357,7 @@
           <TableCell Name="Cell19" Border.Lines="All" Text="ปี [durable_articles_three.year5]" HorzAlign="Center" VertAlign="Center" Font="TH SarabunPSK, 14pt, style=Bold"/>
         </TableRow>
       </TableObject>
-      <DataBand Name="Data15" Top="80.31" Width="831.6" Height="66.15" DataSource="objective_management">
+      <DataBand Name="Data15" Top="80.09" Width="831.6" Height="66.15" DataSource="objective_management">
         <TableObject Name="Table5" Width="831.6" Height="66.15">
           <TableColumn Name="Column26" Width="255.15"/>
           <TableColumn Name="Column27" Width="103.95"/>
@@ -382,20 +378,20 @@
         </TableObject>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data16" Top="151.16" Width="831.6" Height="160.65" DataSource="durable_articles_three">
+    <DataBand Name="Data16" Top="150.74" Width="831.6" Height="160.65" DataSource="durable_articles_three">
       <TextObject Name="Text6" Width="812.7" Height="28.35" Text="13. คำชี้แจงอื่นๆ เพื่อประกอบการพิจารณา" Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text9" Top="28.35" Width="831.6" Height="94.5" Text="[durable_articles_three.other_clarifications]" Font="TH SarabunPSK, 16pt"/>
       <TextObject Name="Text10" Top="132.3" Width="812.7" Height="28.35" Text="14. ข้อมูลใบเสนอราคา" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data17" Top="316.52" Width="831.6" Height="56.7" DataSource="quotation">
+      <DataBand Name="Data17" Top="315.88" Width="831.6" Height="56.7" DataSource="quotation">
         <TextObject Name="Text12" Width="623.7" Height="28.35" Text="[durable_articles_three.quotation.company]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text130" Top="28.35" Width="812.7" Height="28.35" Hyperlink.Expression="[durable_articles_three.specification]" Text="[durable_articles_three.quotation.url_file]" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text131" Left="623.7" Width="207.9" Height="28.35" Text="วงเงิน [durable_articles_three.quotation.limit_price] บาท" Format="Number" Format.UseLocale="true" Format.DecimalDigits="2" HorzAlign="Right" Font="TH SarabunPSK, 16pt"/>
       </DataBand>
     </DataBand>
-    <DataBand Name="Data18" Top="377.92" Width="831.6" Height="56.7">
+    <DataBand Name="Data18" Top="377.08" Width="831.6" Height="56.7">
       <TextObject Name="Text122" Width="812.7" Height="28.35" Text="15. การวิเคราะห์ครุภัณฑ์ตามวัตถุประสงค์ " Font="TH SarabunPSK, 16pt, style=Bold"/>
       <TextObject Name="Text123" Top="28.35" Width="831.6" Height="28.35" Text="[durable_articles_three.cases]" Font="TH SarabunPSK, 16pt, style=Bold"/>
-      <DataBand Name="Data19" Top="439.33" Width="831.6" Height="160.65" DataSource="invest_detail">
+      <DataBand Name="Data19" Top="438.27" Width="831.6" Height="160.65" DataSource="invest_detail">
         <TextObject Name="Text124" Width="831.6" Height="28.35" Text="[durable_articles_three.invest_detail.list]" Font="TH SarabunPSK, 16pt, style=Bold"/>
         <TextObject Name="Text133" Top="85.05" Width="831.6" Height="75.6" GrowToBottom="true" Text="[durable_articles_three.invest_detail.remark]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="9" Font="TH SarabunPSK, 16pt"/>
         <TextObject Name="Text132" Top="28.35" Width="831.6" Height="56.7" Text="[durable_articles_three.invest_detail.answer]" AutoWidth="true" AutoShrink="FontSize" AutoShrinkMinSize="9" Font="TH SarabunPSK, 16pt"/>