From 9e042c2592a093bef5d5a9e523377efe2202be67 Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Mon, 13 Feb 2023 14:23:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E9=87=8D=E6=96=B0=E4=BF=AE=E6=AD=A3FQC?=
 =?UTF-8?q?=E6=9F=A5=E8=A9=A2-=E7=89=B9=E6=8E=A1=E5=85=81=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              |  1 +
 .../wwwroot/Reports/FQC010View.rdlc           | 21 +------------------
 .../AMES/FqcInhouseMasterController.cs        | 19 ++++++++++++-----
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index da7ea6f8..7f101340 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -4102,6 +4102,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             IResultModel result;
             model.WipBarcode.WipNO = model.WipInfo.WipNO;
+            model.WipBarcode.CreateUserID = GetLogInUserID();
             //model.WipBarcode.WipID = model.WipInfo.WipID;
             //model.WipBarcode.UnitNO = model.WipInfo.UnitNO;
 
diff --git a/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
index ea099669..7c3b2cfa 100644
--- a/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
+++ b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
@@ -3861,26 +3861,7 @@
                 <Style>Solid</Style>
                 <Width>0.5pt</Width>
               </Border>
-              <TopBorder>
-                <Color>Black</Color>
-                <Style>Solid</Style>
-                <Width>0.5pt</Width>
-              </TopBorder>
-              <BottomBorder>
-                <Color>Black</Color>
-                <Style>Solid</Style>
-                <Width>0.5pt</Width>
-              </BottomBorder>
-              <LeftBorder>
-                <Color>Black</Color>
-                <Style>Solid</Style>
-                <Width>0.5pt</Width>
-              </LeftBorder>
-              <RightBorder>
-                <Color>Black</Color>
-                <Style>Solid</Style>
-                <Width>0.5pt</Width>
-              </RightBorder>
+              <VerticalAlign>Middle</VerticalAlign>
               <PaddingLeft>2pt</PaddingLeft>
               <PaddingRight>2pt</PaddingRight>
               <PaddingTop>2pt</PaddingTop>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
index 6972ee46..174ae7b6 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
@@ -133,7 +133,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         StatusName = q1.Status,
                         ProTypeName = q1.ProType,
                         CreateDate = q1.CreateDate,
-                        EndTime = q3.EndTime
+                        EndTime = q3.EndTime,
+                        SpecialNo = q3.SpecialPo
                     };
             //q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
             //IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;
@@ -144,7 +145,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Where(w => w.WipNo == wipNo);
 
             if (!string.IsNullOrWhiteSpace(status))
-                q = q.Where(w => w.StatusName == status);
+            {
+                // P1 特採允收
+                if (status != "P1")
+                    q = q.Where(w => w.StatusName == status);
+                else
+                {
+                    q = q.Where(w => w.StatusName == "P" && !string.IsNullOrWhiteSpace(w.SpecialNo));
+                }
+            }
 
             if (!string.IsNullOrWhiteSpace(factoryID))
                 q = q.Where(w => w.Werks.ToString() == factoryID);
@@ -195,10 +204,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
              .ToList();
 
             // 修改狀態名稱
-            result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? "允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
+            result.Data = result.Data.Select(s => { s.StatusName = s.StatusName == "P" ? string.IsNullOrWhiteSpace(s.SpecialNo) ? "允收" : "特採允收" : s.StatusName == "R" ? "批退" : "未驗收完成"; return s; })
                           .ToList();
 
-            
+
 
             return result;
         }
@@ -234,7 +243,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        ModelNo = q1.ModelNo,
                                        InhouseQty = q1.InhouseQty,
                                        SpecialPo = q2.SpecialPo,
-                                       StatusName = q1.Status == "P" ? "允收Pass" : q1.Status == "R" ? "批退Reject" : "",
+                                       StatusName = q1.Status == "P" ? string.IsNullOrWhiteSpace(q2.SpecialPo) ? "允收Pass" : "特採允收" : q1.Status == "R" ? "批退Reject" : "",
                                        FqcID = q2.WipNo == null ? 0 : q2.FqcID,
                                        InhouseMemo = q2.InhouseMemo,
                                        ManualQaMeno = q2.ManualQaMeno,