From 4e867bed9e963c8b7ea5598a775a62d278646232 Mon Sep 17 00:00:00 2001 From: Yiru Date: Sat, 16 Dec 2023 09:01:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B2=A8=E5=BA=8F=E8=99=9F=E5=8F=96?= =?UTF-8?q?=E8=B2=A8=E8=A6=8F=E5=89=87=20=E5=A2=9E=E5=8A=A0[DD]=20?= =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=AA=A2=E6=9F=A5=E5=8C=AF=E5=87=BAPDF=20?= =?UTF-8?q?=E7=9B=B8=E9=97=9C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/SPCController.cs | 2 +- AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml | 2 ++ AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml | 1 + AMESCoreStudio.Web/Views/SPC/SPC005.cshtml | 2 +- AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml | 2 +- AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml | 2 +- AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml | 2 +- .../wwwroot/Reports/SPC005ViewFAI.rdlc | 8 ++++---- .../images/ElectronicSignature/王智永.png | Bin 0 -> 32986 bytes .../images/ElectronicSignature/王素華.png | Bin 0 -> 37717 bytes .../images/ElectronicSignature/鄧鈞澤.png | Bin 0 -> 38483 bytes .../images/ElectronicSignature/鍾美惠.png | Bin 0 -> 45314 bytes .../images/ElectronicSignature/陳信志.png | Bin 0 -> 78715 bytes .../images/ElectronicSignature/陳姿君.png | Bin 0 -> 43403 bytes .../images/ElectronicSignature/陳昱中.png | Bin 0 -> 45981 bytes .../images/ElectronicSignature/陳漢翔.png | Bin 0 -> 41796 bytes .../images/ElectronicSignature/馮琪雅.png | Bin 0 -> 27537 bytes .../AMES/InspectionResultMastersController.cs | 2 +- .../Controllers/AMES/SerialRulesController.cs | 10 ++++++++++ AMESCoreStudio.WebApi/Models/AMES/SerialRule.cs | 8 ++++++++ .../Models/AMES/SerialRuleDetail.cs | 7 +++++++ 21 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/王智永.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/王素華.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/鄧鈞澤.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/鍾美惠.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/陳信志.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/陳姿君.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/陳昱中.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/陳漢翔.png create mode 100644 AMESCoreStudio.Web/wwwroot/images/ElectronicSignature/馮琪雅.png diff --git a/AMESCoreStudio.Web/Controllers/SPCController.cs b/AMESCoreStudio.Web/Controllers/SPCController.cs index 58ab701b..532ef4d6 100644 --- a/AMESCoreStudio.Web/Controllers/SPCController.cs +++ b/AMESCoreStudio.Web/Controllers/SPCController.cs @@ -1620,7 +1620,7 @@ namespace AMESCoreStudio.Web.Controllers MedicalModel = IPQCQuery.CustomerMedical, VIP = IPQCQuery.CustomerVIP, BIOSVer = IPQCQuery.BIOS, - Approved = "黃信志", + Approved = "陳信志", Inspector = IPQCQuery.UpdateUser_Name, ItemNoDesc = IPQCQuery.ItemNoDesc diff --git a/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml index bf9a03b2..05819c69 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS019C.cshtml @@ -41,6 +41,8 @@ + + diff --git a/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml index 79e3b2b3..3e3ca819 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS019U.cshtml @@ -47,6 +47,7 @@ + diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml index 67268af9..5f2b914e 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005.cshtml @@ -259,7 +259,7 @@ if ($("#Type").val() == 1001) { btns = btns + 'PDF '; } - if ($("#Type").val() == 1002) { + if ($("#Type").val() == 1000 || $("#Type").val() == 1002) { btns = btns + 'PDF '; } diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml index 358f6cb0..7b81d5b6 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml @@ -121,7 +121,7 @@ *@
- @if (ViewBag.InspectionTypeID == 1002) + @if (ViewBag.InspectionTypeID == 1000) { QO4-067 } diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml index 838066a7..1371396c 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml @@ -126,7 +126,7 @@ *@
- @if (ViewBag.InspectionTypeID == 1002) + @if (ViewBag.InspectionTypeID == 1000) { QO4-067 } diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml index bb48444a..4f1796c7 100644 --- a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml +++ b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml @@ -57,7 +57,7 @@ @Html.ValidationMessage("error")
- @if (ViewBag.InspectionTypeID == 1002) + @if (ViewBag.InspectionTypeID == 1000) { QO4-067 } diff --git a/AMESCoreStudio.Web/wwwroot/Reports/SPC005ViewFAI.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/SPC005ViewFAI.rdlc index 9d6d5bb4..bcdfde68 100644 --- a/AMESCoreStudio.Web/wwwroot/Reports/SPC005ViewFAI.rdlc +++ b/AMESCoreStudio.Web/wwwroot/Reports/SPC005ViewFAI.rdlc @@ -1220,7 +1220,7 @@ Textbox76 8.57413cm - 14.96744cm + 17.11939cm 1.00557cm 3.14055cm 15 @@ -1241,9 +1241,9 @@ image/png FitProportional 8.57413cm - 20.21795cm + 22.75795cm 1.00557cm - 8.45626cm + 5.06959cm 16