diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml index 70806b07..72579ae6 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml @@ -251,8 +251,11 @@ if (item.statusNo == "暫存") btns = btns + '编辑'; else if (item.statusNo == "保存") { - btns = btns + '檢視\ - PDF '; + btns = btns + '檢視'; + if ($("#Type").val() == 1001) { + btns = btns + 'PDF '; + } + } diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs index 9658b1ed..fe3d0b00 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/SerialRulesController.cs @@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore; using AMESCoreStudio.WebApi.Models.AMES; using AMESCoreStudio.CommonTools.Result; using AMESCoreStudio.WebApi.DTO.AMES; +using System.Net; namespace AMESCoreStudio.WebApi.Controllers.AMES { @@ -76,6 +77,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES [HttpGet("ItemNo/{id}")] public async Task>> GetSerialRuleByItemNo(string id, int page = 0, int limit = 10) { + id = WebUtility.UrlDecode(id); IQueryable q = _context.SerialRules; q = q.Where(p => p.ItemNo == id); @@ -529,7 +531,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES 4、更新Detail 相同規則+Y+M+W+Lot的所有資料最大值 */ - + itemNo = WebUtility.UrlDecode(itemNo); IQueryable q = _context.SerialRules;