From 149a78a65194a4fb39b2a737f7ba6b14a4a3b2fb Mon Sep 17 00:00:00 2001
From: kamonwan taengsuk <kamonwantbb@gmail.com>
Date: Mon, 31 Jul 2023 12:39:10 +0700
Subject: [PATCH] update field

---
 Models/RoReport/form_1_2.cs                            | 5 +++++
 Models/RoReport/form_1_3.cs                            | 7 +++++++
 wwwroot/reports/change_position_offer_request_form.frx | 6 ++++--
 wwwroot/reports/new_rate_offer_request_form.frx        | 7 +++++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Models/RoReport/form_1_2.cs b/Models/RoReport/form_1_2.cs
index f3e1200..35fcee3 100644
--- a/Models/RoReport/form_1_2.cs
+++ b/Models/RoReport/form_1_2.cs
@@ -55,6 +55,11 @@ namespace rmutr_report.Models.RoThree
 
         public string new_position { get; set; }
         //
+        public Guid? budget_project_uid { get; set; }
+        public Guid? budget_plan_uid { get; set; }
+        public string new_qualification { get; set; }
+        public string new_salaray { get; set; }
+        public string budget_year_name_th { get; set; }
         public List<t_form_1_2_images> form_1_2_images { get; set; }
         public List<t_form_1_2_images_2> form_1_2_images_2 { get; set; }
     }
diff --git a/Models/RoReport/form_1_3.cs b/Models/RoReport/form_1_3.cs
index 846522d..2ccd248 100644
--- a/Models/RoReport/form_1_3.cs
+++ b/Models/RoReport/form_1_3.cs
@@ -55,6 +55,11 @@ namespace rmutr_report.Models.RoThree
 
         //
         public string another_document_remark { get; set; }
+        //
+        public string budget_year { get; set; }
+        public string agency_category_name { get; set; }
+        public Guid? budget_project_uid { get; set; }
+        public Guid? budget_plan_uid { get; set; }
         public List<t_form_1_3_detail> form_1_3_details { get; set; }
     }
 
@@ -124,6 +129,8 @@ namespace rmutr_report.Models.RoThree
 
         //
         public int? row { get; set; }
+        //
+        public decimal? quantity { get; set; }
         public List<t_form_1_3_files> files { get; set; }
     }
    
diff --git a/wwwroot/reports/change_position_offer_request_form.frx b/wwwroot/reports/change_position_offer_request_form.frx
index 1acf4f4..5711be9 100644
--- a/wwwroot/reports/change_position_offer_request_form.frx
+++ b/wwwroot/reports/change_position_offer_request_form.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="04/15/2021 16:43:09" ReportInfo.Modified="07/27/2023 15:30:06" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="04/15/2021 16:43:09" ReportInfo.Modified="07/31/2023 12:34:25" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="form_1_2" ReferenceName="form_1_2" DataType="null" Enabled="true">
       <Column Name="no" DataType="System.String"/>
@@ -22,6 +22,8 @@
       <Column Name="qualification" DataType="System.String"/>
       <Column Name="salary" DataType="System.Decimal"/>
       <Column Name="new_position" DataType="System.String"/>
+      <Column Name="new_qualification" DataType="System.String"/>
+      <Column Name="new_salaray" DataType="System.String"/>
     </BusinessObjectDataSource>
   </Dictionary>
   <ReportPage Name="Page1" PaperHeight="330" Watermark.Font="Arial, 60pt">
@@ -103,7 +105,7 @@
       <TextObject Name="Text402" Left="311.85" Top="434.7" Width="226.8" Height="28.35" Text="[form_1_2.new_position]" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text403" Left="538.65" Top="434.7" Width="66.15" Height="28.35" Text="คุณวุฒิ" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text404" Top="453.6" Width="226.8" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>
-      <TextObject Name="Text405" Top="463.05" Width="226.8" Height="28.35" Text="[form_1_2.qualification]" Font="TH Sarabun New, 16pt"/>
+      <TextObject Name="Text405" Top="463.05" Width="226.8" Height="28.35" Text="[form_1_2.new_qualification]" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text406" Left="226.8" Top="463.05" Width="245.7" Height="28.35" Text="ดังเอกสารหลักฐานที่แนบมาพร้อมนี้" Font="TH Sarabun New, 16pt"/>
       <TextObject Name="Text407" Left="444.15" Top="463.05" Width="236.25" Height="28.35" Text="( กรุณาแนบเอกสารให้ครบถ้วน )" Font="TH Sarabun New, 16pt, style=Bold"/>
       <TextObject Name="Text408" Left="170.1" Top="529.2" Width="18.9" Height="18.9" Border.Lines="All" HorzAlign="Right" Font="TH Sarabun New, 16pt" TextFill.Color="DarkGray"/>
diff --git a/wwwroot/reports/new_rate_offer_request_form.frx b/wwwroot/reports/new_rate_offer_request_form.frx
index 2e57897..5e341cf 100644
--- a/wwwroot/reports/new_rate_offer_request_form.frx
+++ b/wwwroot/reports/new_rate_offer_request_form.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="04/15/2021 16:43:09" ReportInfo.Modified="07/28/2023 12:37:52" ReportInfo.CreatorVersion="2021.1.0.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="04/15/2021 16:43:09" ReportInfo.Modified="07/31/2023 12:38:26" ReportInfo.CreatorVersion="2021.1.0.0">
   <Dictionary>
     <BusinessObjectDataSource Name="form_1_3" ReferenceName="form_1_3" DataType="null" Enabled="true">
       <Column Name="no" DataType="System.String"/>
@@ -21,6 +21,8 @@
       <Column Name="salary_rate" DataType="System.Decimal"/>
       <Column Name="currently_exists" DataType="System.Decimal"/>
       <Column Name="another_document_remark" DataType="System.String"/>
+      <Column Name="budget_year" DataType="System.String"/>
+      <Column Name="agency_category_name" DataType="System.String"/>
       <BusinessObjectDataSource Name="form_1_3_details" DataType="null" Enabled="true">
         <Column Name="no" DataType="System.String"/>
         <Column Name="offer_position" DataType="System.String"/>
@@ -42,6 +44,7 @@
         <Column Name="reason_and_necessity" DataType="System.String"/>
         <Column Name="effects_if1" DataType="System.String"/>
         <Column Name="workloads" DataType="System.String"/>
+        <Column Name="quantity" DataType="System.Decimal"/>
         <BusinessObjectDataSource Name="effects_if" DataType="null" Enabled="true"/>
         <BusinessObjectDataSource Name="workload" DataType="null" Enabled="true"/>
       </BusinessObjectDataSource>
@@ -125,7 +128,7 @@
   </ReportPage>
   <ReportPage Name="Page2" RawPaperSize="9" Watermark.Font="Arial, 60pt">
     <DataBand Name="Data2" Width="718.2">
-      <DataBand Name="Data4" Top="5.48" Width="718.2" Height="822.15" DataSource="form_1_3_details">
+      <DataBand Name="Data4" Top="5.41" Width="718.2" Height="822.15" DataSource="form_1_3_details">
         <TextObject Name="Text327" Top="784.35" Width="718.2" Height="28.35" VertAlign="Center" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text326" Top="774.9" Width="718.2" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>
         <TextObject Name="Text324" Top="746.55" Width="718.2" Height="28.35" Border.Lines="Bottom" Border.Style="Dot" Font="TH Sarabun New, 16pt"/>