From 1d74014c04294e9a0c584730d1e4138a331f788d Mon Sep 17 00:00:00 2001
From: Sai <Sai@hotmail.com>
Date: Tue, 18 Apr 2023 23:54:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3FQC=E5=A0=B1=E8=A1=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=A9=A2=E6=A2=9D=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AMES/FqcResultMasterController.cs         | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
index a0ae044b..3103fa9f 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcResultMasterController.cs
@@ -68,12 +68,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <returns></returns>
         [Route("[action]")]
         [HttpGet]
-        public async Task<ResultModel<dynamic>> GetFQCHeaderData4QRS016(string wipNO, string itemNO, string modelNO, string dateStart, string dateEnd ,string factoryID)
+        public async Task<ResultModel<dynamic>> GetFQCHeaderData4QRS016(string wipNO, string itemNO, string modelNO, string dateStart, string dateEnd, string factoryID)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
             var q = from q1 in _context.FqcResultMasters
                     join q2 in _context.CalendarTables on q1.CreateDate.Date equals q2.TimeID
                     join q3 in _context.WipInfos on q1.WipNo equals q3.WipNO
+                    join q4 in _context.FqcInhouseMasters on new { q1.InhouseNo, q1.SeqID } equals new { q4.InhouseNo, q4.SeqID }
                     select new
                     {
                         q1.FqcID,
@@ -86,7 +87,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         q1.FailQty,
                         q1.QaResult,
                         q2.WeekOfYear,
-                        q3.Werks
+                        q3.Werks,
+                        InhouseCreateDate = q4.CreateDate
                     };
 
             if (wipNO != null && wipNO != "")
@@ -107,10 +109,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             }
             if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
             {
-                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart + " 00:00:00") && w.CreateDate <= DateTime.Parse(dateEnd + " 23:59:59"));
+                q = q.Where(w => w.InhouseCreateDate >= DateTime.Parse(dateStart + " 00:00:00") && w.InhouseCreateDate <= DateTime.Parse(dateEnd + " 23:59:59"));
             }
 
-            q = q.OrderBy(w => w.CreateDate);
+            q = q.OrderBy(w => w.InhouseCreateDate);
 
             /*
             //EF.Functions
@@ -163,13 +165,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             ResultModel<DTO.AMES.QRS016Detail> result = new ResultModel<DTO.AMES.QRS016Detail>();
             var q = from q1 in _context.FqcResultMasters
                     join q2 in _context.WipInfos on q1.WipNo equals q2.WipNO
+                    join q3 in _context.FqcInhouseMasters on new { q1.InhouseNo, q1.SeqID } equals new { q3.InhouseNo, q3.SeqID }
                     select new DTO.AMES.QRS016Detail
                     {
                         wipNo = q1.WipNo,
                         itemNo = q1.ItemNo,
                         modelNo = q1.ModelNo,
                         werks = q2.Werks,
-                        startTime = q1.StartTime,
+                        startTime = q3.CreateDate,
                         qaResult = q1.QaResult,
                         customerMedical = q2.CustomerMedical,
                         unitNo = q2.UnitNO
@@ -205,7 +208,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             double rejectRate = 0;
 
             // 醫療
-            var data = q.Where(w => w.customerMedical == "Y").ToList();
+            var data = q.Where(w => w.customerMedical == "Y" && w.qaResult != "A").ToList();
             allQty = data.Count();
             passQty = data.Where(w => w.qaResult == "P").Count();
             failQty = data.Where(w => w.qaResult == "R").Count();
@@ -222,7 +225,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             // 系統組裝
             data.Clear();
-            data = q.Where(w => w.customerMedical == "N" && w.unitNo == "B").ToList();
+            data = q.Where(w => w.customerMedical == "N" && w.unitNo == "B" && w.qaResult != "A").ToList();
             allQty = data.Count();
             passQty = data.Where(w => w.qaResult == "P").Count();
             failQty = data.Where(w => w.qaResult == "R").Count();
@@ -238,7 +241,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             // 單板
             data.Clear();
-            data = q.Where(w => w.customerMedical == "N" && w.unitNo == "S").ToList();
+            data = q.Where(w => w.customerMedical == "N" && w.unitNo == "S" && w.qaResult != "A").ToList();
             allQty = data.Count();
             passQty = data.Where(w => w.qaResult == "P").Count();
             failQty = data.Where(w => w.qaResult == "R").Count();