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: '
{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}
'
},
{
- 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 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";
+ ///
+ /// 判定備註
+ ///
+ [DataMember]
+ [Display(Name = "判定備註")]
+ public string QaMemo { get; set; }
+
///
/// 抽驗狀態 P-PASS(允收);R-REJECT(批退); A-初始狀態 ; P1-特採允收
///