1. 修正工單鎖定解鎖Bug

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1566,7 +1566,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         //頁面提交，id=0 添加，id>0 修改
         [HttpPost]
-        public async Task<IActionResult> PCS010Async(WipLock model, IFormFile formFile)
+        public async Task<IActionResult> 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
         /// </summary>
         /// <param name="id">WipLockID</param>
         /// <returns></returns>
-        public async Task<IActionResult> PCS011(string id)
+        public async Task<IActionResult> 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
         /// </summary>
         /// <param name="id">WipLockID</param>
         /// <returns></returns>
-        public async Task<IActionResult> PCS014(string id)
+        public async Task<IActionResult> 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 修改

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -375,7 +375,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipLock/{id}")]
-        ITask<ResultModel<WipLock>> GetWipLock(string id);
+        ITask<List<WipLock>> GetWipLock(int id);
 
         /// <summary>
         /// 製程工單鎖定查詢 Query
@@ -450,14 +450,14 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpPost("api/BarcodeLock")]
-        ITask<ResultModel<WipLock>> PostBarcodeLock([FromBody, RawJsonContent] string model);
+        ITask<ResultModel<BarcodeLock>> PostBarcodeLock([FromBody, RawJsonContent] string model);
 
         /// <summary>
         /// 工單解鎖資料檔
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpPut("api/BarcodeLock")]
-        ITask<ResultModel<WipLock>> PutBarcodeLock([FromBody, RawJsonContent] string model);
+        ITask<ResultModel<BarcodeLock>> PutBarcodeLock([FromBody, RawJsonContent] string model);
         #endregion
 
         #region MaterialItem 料號基本資料檔

AMESCoreStudio.Web/Views/PCS/PCS011.cshtml

@@ -31,7 +31,7 @@
                 <div class="layui-inline">
                     <label asp-for="StationID" class="layui-form-label"></label>
                     <div class="layui-input-inline">
-                        <select asp-for="StationID" asp-items="@ViewBag.GetStationsList" disabled></select>
+                        <select asp-for="StationID" asp-items="@ViewBag.GetStationList" disabled></select>
                     </div>
                 </div>
             </div>

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
 {

AMESCoreStudio.WebApi/Models/AMES/WipLock.cs

@@ -123,7 +123,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 站别資料
         /// </summary>
         [ForeignKey("StationID")]
-        public virtual AMESCoreStudio.WebApi.Models.BAS.Stations Stations { get; set; }
+        public virtual BAS.Stations Stations { get; set; }
 
         /// <summary>
         /// 工單機種資料