Browse Source

1. 修正PCS032 跳站錯誤問題

2. 修正QASRV 錯誤訊息
PTD
ray 2 years ago
parent
commit
f34e4b7943
  1. 2
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 20
      AMESCoreStudio.WebApi/Controllers/QASRV/DocEsopViewController.cs
  3. 12
      AMESCoreStudio.WebApi/Controllers/QASRV/RuleController.cs
  4. 4
      AMESCoreStudio.WebApi/Models/QASRV/DocEsopView.cs

2
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -6497,7 +6497,7 @@ namespace AMESCoreStudio.Web.Controllers
var RuleStations = new List<SelectListItem>(); var RuleStations = new List<SelectListItem>();
for (int i = 0; i < result_RuleStation.Count; i++) 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.Data = RuleStations;
result.Success = true; result.Success = true;

20
AMESCoreStudio.WebApi/Controllers/QASRV/DocEsopViewController.cs

@ -29,15 +29,15 @@ namespace AMESCoreStudio.WebApi.Controllers.QASRV
_context = context; _context = context;
} }
///// <summary> /// <summary>
///// Get標準SOP路徑 /// Get標準SOP路徑
///// </summary> /// </summary>
///// <returns></returns> /// <returns></returns>
//[HttpGet] [HttpGet]
//public async Task<ActionResult<IEnumerable<DocEsopView>>> GetDocEsopView() public async Task<ActionResult<IEnumerable<DocEsopView>>> GetDocEsopView()
//{ {
// IQueryable<DocEsopView> q = _context.DocEsopViews; IQueryable<DocEsopView> q = _context.DocEsopViews;
// return await q.Take(100).ToListAsync(); return await q.Take(100).ToListAsync();
//} }
} }
} }

12
AMESCoreStudio.WebApi/Controllers/QASRV/RuleController.cs

@ -33,11 +33,11 @@ namespace AMESCoreStudio.WebApi.Controllers.QASRV
/// Get標準SOP路徑 /// Get標準SOP路徑
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet] //[HttpGet]
public async Task<ActionResult<IEnumerable<Rule>>> GetRule() //public async Task<ActionResult<IEnumerable<Rule>>> GetRule()
{ //{
IQueryable<Rule> q = _context.Rules; // IQueryable<Rule> q = _context.Rules;
return await q.Take(100).ToListAsync(); // return await q.Take(100).ToListAsync();
} //}
} }
} }

4
AMESCoreStudio.WebApi/Models/QASRV/DocEsopView.cs

@ -1,5 +1,7 @@
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using Microsoft.EntityFrameworkCore;
using System;
#nullable disable #nullable disable
@ -34,6 +36,6 @@ namespace AMESCoreStudio.WebApi.Models.QASRV
[Column("issue_date")] [Column("issue_date")]
[DataMember] [DataMember]
public string issue_date { get; set; } public DateTime issue_date { get; set; }
} }
} }

Loading…
Cancel
Save