1. FQC報表加入檢驗時間

2. WipLabel 列印張數預設改1

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>

AMESCoreStudio.WebApi/Controllers/BLL/ADUserNameController.cs

@@ -34,15 +34,20 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
                 }
                 else
                 {
-                    Msg += "登入成功  ";
+                    //Msg += "登入成功  ";
-
+                    DirectorySearcher search = new DirectorySearcher(de);
-                    System.DirectoryServices.DirectorySearcher search = new DirectorySearcher(de);
                     search.Filter = "(SAMAccountName=" + UserName + ")";
-                    search.PropertiesToLoad.Add("displayname");
+                    //search.PropertiesToLoad.Add("Name");
-                    search.PropertiesToLoad.Add("department");
+                    //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];
+                    if (result != null)
-                    Msg += "  部門:" + (string)result.Properties["department"][0];
+                    {
+                        Msg += result.Path;
+                    }
                 }
                 return Msg;
             }

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