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(); 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; } - ///// - ///// Get標準SOP路徑 - ///// - ///// - //[HttpGet] - //public async Task>> GetDocEsopView() - //{ - // IQueryable q = _context.DocEsopViews; - // return await q.Take(100).ToListAsync(); - //} + /// + /// Get標準SOP路徑 + /// + /// + [HttpGet] + public async Task>> GetDocEsopView() + { + IQueryable 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路徑 /// /// - [HttpGet] - public async Task>> GetRule() - { - IQueryable q = _context.Rules; - return await q.Take(100).ToListAsync(); - } + //[HttpGet] + //public async Task>> GetRule() + //{ + // IQueryable 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; } } }