From 10765cf81e922829a1dfbab052efaa02ec7eda10 Mon Sep 17 00:00:00 2001
From: Ray <Ray@aten.com.tw>
Date: Thu, 4 May 2023 11:42:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=AA=BF=E6=95=B4FQC=E6=8A=BD=E9=A9=97=20?=
 =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E5=82=99=E8=A8=BBbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Views/FQC/FQC008.cshtml                 | 4 ++--
 .../Controllers/AMES/FqcInhouseMasterController.cs         | 6 ++++--
 AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs      | 7 +++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
index ca0789d6..ae333ff7 100644
--- a/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
+++ b/AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
@@ -236,8 +236,8 @@
                 templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>'
             },
             {
-                field: 'qaMeno',
-                title: '備註'
+                field: 'qaMemo',
+                title: '判定備註'
             },
             {
                 title: '操作',
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index 81983882..db874730 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -136,7 +136,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         ProTypeName = q1.ProType,
                         CreateDate = q1.CreateDate,
                         EndTime = q3.EndTime,
-                        SpecialNo = q3.SpecialPo
+                        SpecialNo = q3.SpecialPo,
+                        QaMemo = q3.QaMeno
                     };
             //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
             //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;
@@ -205,7 +206,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 ProTypeName = s.ProTypeName,
                 CreateDate = s.CreateDate,
                 EndTime = s.EndTime,
-                SpecialNo = s.SpecialNo
+                SpecialNo = s.SpecialNo,
+                QaMemo = s.QaMemo
             }).Distinct().ToListAsync();
 
             // 紀錄筆數
diff --git a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs
index bad088b8..4ea5aefa 100644
--- a/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs
@@ -82,6 +82,13 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "抽驗狀態")]
         public string StatusName { get; set; } = "A";
 
+        /// <summary>
+        /// 判定備註
+        /// </summary>
+        [DataMember]
+        [Display(Name = "判定備註")]
+        public string QaMemo { get; set; }
+
         /// <summary>
         /// 抽驗狀態  P-PASS(允收);R-REJECT(批退); A-初始狀態 ; P1-特採允收
         /// </summary>