From f34e4b79431c23cd145bbea9e0dc341a7d9bb80c Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Tue, 22 Nov 2022 21:57:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3PCS032=20=E8=B7=B3?=
 =?UTF-8?q?=E7=AB=99=E9=8C=AF=E8=AA=A4=E5=95=8F=E9=A1=8C=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3QASRV=20=E9=8C=AF=E8=AA=A4=E8=A8=8A=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              |  2 +-
 .../QASRV/DocEsopViewController.cs            | 20 +++++++++----------
 .../Controllers/QASRV/RuleController.cs       | 12 +++++------
 .../Models/QASRV/DocEsopView.cs               |  4 +++-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index c5afabc7..899bc60e 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -6497,7 +6497,7 @@ namespace AMESCoreStudio.Web.Controllers
                 var RuleStations = new List<SelectListItem>();
                 for (int i = 0; i < result_RuleStation.Count; i++)
                 {
-                    RuleStations.Add(new SelectListItem(result_RuleStation[i].Sequence + "-" + result_RuleStation[i].StationDesc, result_RuleStation[i].RuleStationID.ToString()));
+                    RuleStations.Add(new SelectListItem(result_RuleStation[i].Sequence + "-" + result_RuleStation[i].StationDesc, result_RuleStation[i].StationID.ToString()));
                 }
                 result.Data = RuleStations;
                 result.Success = true;
diff --git a/AMESCoreStudio.WebApi/Controllers/QASRV/DocEsopViewController.cs b/AMESCoreStudio.WebApi/Controllers/QASRV/DocEsopViewController.cs
index 45a729ea..ce4bf4da 100644
--- a/AMESCoreStudio.WebApi/Controllers/QASRV/DocEsopViewController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/QASRV/DocEsopViewController.cs
@@ -29,15 +29,15 @@ namespace AMESCoreStudio.WebApi.Controllers.QASRV
             _context = context;
         }
 
-        ///// <summary>
-        ///// Get標準SOP路徑
-        ///// </summary>
-        ///// <returns></returns>
-        //[HttpGet]
-        //public async Task<ActionResult<IEnumerable<DocEsopView>>> GetDocEsopView()
-        //{
-        //    IQueryable<DocEsopView> q = _context.DocEsopViews;
-        //    return await q.Take(100).ToListAsync();
-        //}
+        /// <summary>
+        /// Get標準SOP路徑
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<DocEsopView>>> GetDocEsopView()
+        {
+            IQueryable<DocEsopView> q = _context.DocEsopViews;
+            return await q.Take(100).ToListAsync();
+        }
     }
 }
diff --git a/AMESCoreStudio.WebApi/Controllers/QASRV/RuleController.cs b/AMESCoreStudio.WebApi/Controllers/QASRV/RuleController.cs
index 2d3a5fd7..7a8ba7b5 100644
--- a/AMESCoreStudio.WebApi/Controllers/QASRV/RuleController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/QASRV/RuleController.cs
@@ -33,11 +33,11 @@ namespace AMESCoreStudio.WebApi.Controllers.QASRV
         /// Get標準SOP路徑
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
-        public async Task<ActionResult<IEnumerable<Rule>>> GetRule()
-        {
-            IQueryable<Rule> q = _context.Rules;
-            return await q.Take(100).ToListAsync();
-        }
+        //[HttpGet]
+        //public async Task<ActionResult<IEnumerable<Rule>>> GetRule()
+        //{
+        //    IQueryable<Rule> q = _context.Rules;
+        //    return await q.Take(100).ToListAsync();
+        //}
     }
 }
diff --git a/AMESCoreStudio.WebApi/Models/QASRV/DocEsopView.cs b/AMESCoreStudio.WebApi/Models/QASRV/DocEsopView.cs
index 97e6f6fe..af8fc16d 100644
--- a/AMESCoreStudio.WebApi/Models/QASRV/DocEsopView.cs
+++ b/AMESCoreStudio.WebApi/Models/QASRV/DocEsopView.cs
@@ -1,5 +1,7 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using Microsoft.EntityFrameworkCore;
+using System;
 
 #nullable disable
 
@@ -34,6 +36,6 @@ namespace AMESCoreStudio.WebApi.Models.QASRV
 
         [Column("issue_date")]
         [DataMember]
-        public string issue_date { get; set; }
+        public DateTime issue_date { get; set; }
     }
 }