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 @@ + + true + true + + + + + =First(Fields!InspectionDate.Value, "DataSet1") + + + + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =First(Fields!InspectionDate.Value, "DataSet1") + + + + + + Middle + 2pt + 2pt + 2pt + 2pt + + true 0.34078cm 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 /// [Column("PRINT_PAGE")] [DataMember] - public int PrintPage { get; set; } = 0; + public int PrintPage { get; set; } = 1; /// /// 認證LOGO