From 619203467245dd957d43e0eb1a3b26846519ce7d Mon Sep 17 00:00:00 2001
From: Yiru <yiru@aten.com.tw>
Date: Fri, 8 Sep 2023 13:31:37 +0800
Subject: [PATCH] =?UTF-8?q?IPQC=E7=94=A2=E7=94=9FPDF=E5=A0=B1=E8=A1=A8->?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E9=A6=96=E4=BB=B6=20=E4=BF=AE=E6=94=B9Serial?=
 =?UTF-8?q?Rule=20=E6=96=99=E8=99=9F=E6=94=B6=E5=88=B0=E6=9C=89/=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E5=AD=97=E5=85=83=E8=99=95=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Views/SPC/SPC005.cshtml                 | 7 +++++--
 .../Controllers/AMES/SerialRulesController.cs              | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

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 + '<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>';
                     else if (item.statusNo == "保存") {
-                        btns = btns + '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="view">檢視</a>\
-                                                      <a class="layui-btn layui-btn-xs" lay-event="PDF">PDF</a> ';
+                        btns = btns + '<a class="layui-btn layui-btn-warm layui-icon layui-icon-list layui-btn-xs" lay-event="view">檢視</a>';
+                        if ($("#Type").val() == 1001) {
+                            btns = btns + '<a class="layui-btn layui-btn-xs" lay-event="PDF">PDF</a> ';
+                        }
+                                                     
                     }
                        
 
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<ActionResult<IEnumerable<SerialRule>>> GetSerialRuleByItemNo(string id, int page = 0, int limit = 10)
         {
+            id = WebUtility.UrlDecode(id);
             IQueryable<SerialRule> 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<SerialRule> q = _context.SerialRules;