From 8d99a779fea84375c8a98e5a4f66f98c0391992c Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 27 Jan 2022 15:06:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E5=B7=A5=E5=96=AE?= =?UTF-8?q?=E9=8E=96=E5=AE=9A=E8=A7=A3=E9=8E=96Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PCSController.cs | 20 +++++++++++-------- AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs | 6 +++--- AMESCoreStudio.Web/Views/PCS/PCS011.cshtml | 2 +- .../Controllers/AMES/WipLockController.cs | 9 ++++----- AMESCoreStudio.WebApi/Models/AMES/WipLock.cs | 2 +- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 4138816e..02485838 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -1566,7 +1566,7 @@ namespace AMESCoreStudio.Web.Controllers //頁面提交，id=0 添加，id>0 修改 [HttpPost] - public async Task PCS010Async(WipLock model, IFormFile formFile) + public async Task PCS010Async(WipLock model) { //if (formFile.Length > 0) @@ -1602,7 +1602,10 @@ namespace AMESCoreStudio.Web.Controllers var q = await _pcsApi.GetWipInfoByWipNO(model.WipNO); if (q.Count() == 0) + { ModelState.AddModelError("error", "找不到工單號碼【" + model.WipNO + "】"); + return View(model); + } // 判斷工單是否有該站 @@ -1611,6 +1614,7 @@ namespace AMESCoreStudio.Web.Controllers if (q1.Data.Where(w => w.LockStatus == "0").Count() != 0) { ModelState.AddModelError("error", "目前此工單號碼【" + model.WipNO + "】尚未解鎖定"); + return View(model); } if (ModelState.IsValid) @@ -1637,17 +1641,17 @@ namespace AMESCoreStudio.Web.Controllers /// /// WipLockID /// - public async Task PCS011(string id) + public async Task PCS011(int id) { var q = await _pcsApi.GetWipLock(id); - q.Data = q.Data.Where(w => w.UnLockReason == null).ToList(); - await GetRuleStation(); + q = q.Where(w => w.UnLockReason == null).ToList(); + await GetStation(); GetLockReasonType(); GetLockType(); //var result = new WipAllViewModel(); //return View(result); - return View(q.Data.FirstOrDefault()); + return View(q.FirstOrDefault()); } //[HttpPost] @@ -1939,14 +1943,14 @@ namespace AMESCoreStudio.Web.Controllers /// /// WipLockID /// - public async Task PCS014(string id) + public async Task PCS014(int id) { var q = await _pcsApi.GetWipLock(id); - q.Data = q.Data.Where(w => w.UnLockReason == null).ToList(); + q = q.Where(w => w.UnLockReason == null).ToList(); //var result = new WipAllViewModel(); //return View(result); - return View(q.Data.FirstOrDefault()); + return View(q.FirstOrDefault()); } //頁面提交，id=0 添加，id>0 修改 diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs index 49e39b9a..4c9e2174 100644 --- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs +++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs @@ -375,7 +375,7 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpGet("api/WipLock/{id}")] - ITask> GetWipLock(string id); + ITask> GetWipLock(int id); /// /// 製程工單鎖定查詢 Query @@ -450,14 +450,14 @@ namespace AMESCoreStudio.Web /// /// [WebApiClient.Attributes.HttpPost("api/BarcodeLock")] - ITask> PostBarcodeLock([FromBody, RawJsonContent] string model); + ITask> PostBarcodeLock([FromBody, RawJsonContent] string model); /// /// 工單解鎖資料檔 /// /// [WebApiClient.Attributes.HttpPut("api/BarcodeLock")] - ITask> PutBarcodeLock([FromBody, RawJsonContent] string model); + ITask> PutBarcodeLock([FromBody, RawJsonContent] string model); #endregion #region MaterialItem 料號基本資料檔 diff --git a/AMESCoreStudio.Web/Views/PCS/PCS011.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS011.cshtml index 1a253dd6..79975ab3 100644 --- a/AMESCoreStudio.Web/Views/PCS/PCS011.cshtml +++ b/AMESCoreStudio.Web/Views/PCS/PCS011.cshtml @@ -31,7 +31,7 @@
- +
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs index 6eb56e8a..37e8cda7 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs @@ -1,13 +1,12 @@ -using Microsoft.AspNetCore.Http; +using AMESCoreStudio.CommonTools.Result; +using AMESCoreStudio.WebApi.DTO.AMES; +using AMESCoreStudio.WebApi.Models.AMES; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; -using AMESCoreStudio.WebApi.Models.AMES; -using AMESCoreStudio.CommonTools.Result; -using AMESCoreStudio.WebApi.DTO.AMES; namespace AMESCoreStudio.WebApi.Controllers.AMES { diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs b/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs index d8961cfa..c6476c27 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipLock.cs @@ -123,7 +123,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// 站别資料 /// [ForeignKey("StationID")] - public virtual AMESCoreStudio.WebApi.Models.BAS.Stations Stations { get; set; } + public virtual BAS.Stations Stations { get; set; } /// /// 工單機種資料