From a9195a7ac6d216f23a770c515f84f8946f97cb0f Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Fri, 10 Mar 2023 16:58:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=20FQC=E5=A0=B1=E8=A1=A8=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=AA=A2=E9=A9=97=E6=99=82=E9=96=93=202.=20WipLabel=20?=
 =?UTF-8?q?=E5=88=97=E5=8D=B0=E5=BC=B5=E6=95=B8=E9=A0=90=E8=A8=AD=E6=94=B9?=
 =?UTF-8?q?1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/Reports/FQC010View.rdlc           | 66 +++++++++++++++++++
 .../Controllers/BLL/ADUserNameController.cs   | 19 ++++--
 AMESCoreStudio.WebApi/Models/AMES/WipLabel.cs |  2 +-
 3 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
index 7c3b2cfa..fb84445a 100644
--- a/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
+++ b/AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc
@@ -3991,6 +3991,72 @@
               </Border>
             </Style>
           </Image>
+          <Textbox Name="InspectionDate2">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=First(Fields!InspectionDate.Value, "DataSet1")</Value>
+                    <Style>
+                      <FontFamily>微軟正黑體</FontFamily>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style />
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>InspectionDate</rd:DefaultName>
+            <Top>15.41084cm</Top>
+            <Left>17.27016cm</Left>
+            <Height>0.60324cm</Height>
+            <Width>4.02034cm</Width>
+            <ZIndex>58</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <VerticalAlign>Middle</VerticalAlign>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
+          <Textbox Name="InspectionDate3">
+            <CanGrow>true</CanGrow>
+            <KeepTogether>true</KeepTogether>
+            <Paragraphs>
+              <Paragraph>
+                <TextRuns>
+                  <TextRun>
+                    <Value>=First(Fields!InspectionDate.Value, "DataSet1")</Value>
+                    <Style>
+                      <FontFamily>微軟正黑體</FontFamily>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style />
+              </Paragraph>
+            </Paragraphs>
+            <rd:DefaultName>InspectionDate</rd:DefaultName>
+            <Top>15.41084cm</Top>
+            <Left>10.95682cm</Left>
+            <Height>0.60324cm</Height>
+            <Width>4.02034cm</Width>
+            <ZIndex>59</ZIndex>
+            <Style>
+              <Border>
+                <Style>None</Style>
+              </Border>
+              <VerticalAlign>Middle</VerticalAlign>
+              <PaddingLeft>2pt</PaddingLeft>
+              <PaddingRight>2pt</PaddingRight>
+              <PaddingTop>2pt</PaddingTop>
+              <PaddingBottom>2pt</PaddingBottom>
+            </Style>
+          </Textbox>
         </ReportItems>
         <KeepTogether>true</KeepTogether>
         <Top>0.34078cm</Top>
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/ADUserNameController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/ADUserNameController.cs
index 79835902..fb2b9562 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/ADUserNameController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/ADUserNameController.cs
@@ -34,15 +34,20 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
                 }
                 else
                 {
-                    Msg += "登入成功  ";
-
-                    System.DirectoryServices.DirectorySearcher search = new DirectorySearcher(de);
+                    //Msg += "登入成功  ";
+                    DirectorySearcher search = new DirectorySearcher(de);
                     search.Filter = "(SAMAccountName=" + UserName + ")";
-                    search.PropertiesToLoad.Add("displayname");
-                    search.PropertiesToLoad.Add("department");
+                    //search.PropertiesToLoad.Add("Name");
+                    //search.PropertiesToLoad.Add("displayname");
+                    //search.PropertiesToLoad.Add("department");
+                    //search.PropertiesToLoad.Add("mail");
+                    //search.PropertiesToLoad.Add("title");
+                    //search.PropertiesToLoad.Add("cn");
                     SearchResult result = search.FindOne();
-                    Msg += "  姓名:" + (string)result.Properties["displayname"][0];
-                    Msg += "  部門:" + (string)result.Properties["department"][0];
+                    if (result != null)
+                    {
+                        Msg += result.Path;
+                    }
                 }
                 return Msg;
             }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipLabel.cs b/AMESCoreStudio.WebApi/Models/AMES/WipLabel.cs
index 4451e94c..ec16a112 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WipLabel.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WipLabel.cs
@@ -36,7 +36,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("PRINT_PAGE")]
         [DataMember]
-        public int PrintPage { get; set; } = 0;
+        public int PrintPage { get; set; } = 1;
 
         /// <summary>
         /// 認證LOGO