From d6184f50412dd745a4caedadc6e60711454ee75d Mon Sep 17 00:00:00 2001
From: "BB.Wang" <BB.Wang@git.com>
Date: Wed, 30 Aug 2023 11:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9IPQC=E5=B0=8D=E6=87=89?=
 =?UTF-8?q?=E7=9A=84=E8=B3=87=E6=96=99=E5=8F=8ARDLC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/Reports/SPC005View.rdlc           | 54 +++++++++++++++----
 .../AMES/InspectionResultMastersController.cs |  4 +-
 2 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc
index 80390147..c173d28b 100644
--- a/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc
+++ b/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc
@@ -1428,7 +1428,7 @@
                 <Top>5.15641cm</Top>
                 <Left>0.30622cm</Left>
                 <Height>1.24234cm</Height>
-                <Width>28.36799cm</Width>
+                <Width>28.368cm</Width>
                 <ZIndex>21</ZIndex>
                 <Style>
                   <Border>
@@ -1875,7 +1875,7 @@
                 <Top>9.24403cm</Top>
                 <Left>0.30622cm</Left>
                 <Height>1.24234cm</Height>
-                <Width>28.36799cm</Width>
+                <Width>28.368cm</Width>
                 <ZIndex>24</ZIndex>
                 <Style>
                   <Border>
@@ -2322,7 +2322,7 @@
                 <Top>12.95878cm</Top>
                 <Left>0.30622cm</Left>
                 <Height>1.24234cm</Height>
-                <Width>28.36799cm</Width>
+                <Width>28.368cm</Width>
                 <ZIndex>27</ZIndex>
                 <Style>
                   <Border>
@@ -2515,13 +2515,10 @@
                 <MIMEType>image/png</MIMEType>
                 <Sizing>FitProportional</Sizing>
                 <Top>15.5803cm</Top>
-                <Left>18.14327cm</Left>
+                <Left>20.21795cm</Left>
                 <Height>1.00557cm</Height>
                 <Width>4.60783cm</Width>
                 <ZIndex>30</ZIndex>
-                <Visibility>
-                  <Hidden>=iif(IsNothing(First(Fields!InspectorSignImg.Value, "DataSet1")),True,False)</Hidden>
-                </Visibility>
                 <Style>
                   <Border>
                     <Style>None</Style>
@@ -2607,25 +2604,60 @@
                 <MIMEType>image/png</MIMEType>
                 <Sizing>FitProportional</Sizing>
                 <Top>15.5803cm</Top>
-                <Left>10.28905cm</Left>
+                <Left>12.27991cm</Left>
                 <Height>1.00557cm</Height>
                 <Width>4.60783cm</Width>
                 <ZIndex>33</ZIndex>
+                <Style>
+                  <Border>
+                    <Style>None</Style>
+                  </Border>
+                </Style>
+              </Image>
+              <Textbox Name="Inspector">
+                <CanGrow>true</CanGrow>
+                <KeepTogether>true</KeepTogether>
+                <Paragraphs>
+                  <Paragraph>
+                    <TextRuns>
+                      <TextRun>
+                        <Value>=First(Fields!Inspector.Value, "DataSet1")</Value>
+                        <Style>
+                          <FontFamily>微軟正黑體</FontFamily>
+                          <FontSize>14pt</FontSize>
+                        </Style>
+                      </TextRun>
+                    </TextRuns>
+                    <Style>
+                      <TextAlign>Left</TextAlign>
+                    </Style>
+                  </Paragraph>
+                </Paragraphs>
+                <Top>15.5803cm</Top>
+                <Left>18.21382cm</Left>
+                <Height>1.00557cm</Height>
+                <Width>4.594cm</Width>
+                <ZIndex>34</ZIndex>
                 <Visibility>
-                  <Hidden>=iif(IsNothing(First(Fields!ApprovedSignImg.Value, "DataSet1")),True,False)</Hidden>
+                  <Hidden>=iif(IsNothing(First(Fields!ApprovedSignImg.Value, "DataSet1")), False, True)</Hidden>
                 </Visibility>
                 <Style>
                   <Border>
                     <Style>None</Style>
                   </Border>
+                  <VerticalAlign>Middle</VerticalAlign>
+                  <PaddingLeft>2pt</PaddingLeft>
+                  <PaddingRight>2pt</PaddingRight>
+                  <PaddingTop>2pt</PaddingTop>
+                  <PaddingBottom>2pt</PaddingBottom>
                 </Style>
-              </Image>
+              </Textbox>
             </ReportItems>
             <KeepTogether>true</KeepTogether>
             <Top>0.31154cm</Top>
             <Left>0.20185cm</Left>
             <Height>17.34369cm</Height>
-            <Width>29.08642cm</Width>
+            <Width>29.26494cm</Width>
             <Style>
               <Border>
                 <Style>Solid</Style>
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
index abe88c3c..0ae93117 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs
@@ -506,7 +506,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 var query_Detail = await q_Detail.Distinct().ToListAsync();
 
 
-                var query_Detail_ASSY = query_Detail.Where(w => w.InspectionItemDesc.Contains("ASSY") && (w.InspectionResult == "P" || w.InspectionResult == "F")).OrderBy(o => o.Seq).ToList();
+                var query_Detail_ASSY = query_Detail.Where(w => w.InspectionItemDesc.Contains("Assy") && (w.InspectionResult == "P" || w.InspectionResult == "F")).OrderBy(o => o.Seq).ToList();
                 if (query_Detail_ASSY.Count() > 0)
                 {
                     IpqcDetail_ASSY.Add(new IpqcDto.IpqcDetailDto
@@ -532,7 +532,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 };
 
 
-                var query_Detail_TEST = query_Detail.Where(w => w.InspectionItemDesc.Contains("TEST") && (w.InspectionResult == "P" || w.InspectionResult == "F")).OrderBy(o => o.Seq).ToList();
+                var query_Detail_TEST = query_Detail.Where(w => w.InspectionItemDesc.Contains("Test") && (w.InspectionResult == "P" || w.InspectionResult == "F")).OrderBy(o => o.Seq).ToList();
                 if (query_Detail_TEST.Count() > 0)
                 {
                     IpqcDetail_TEST.Add(new IpqcDto.IpqcDetailDto