diff --git a/AMESCoreStudio.Web/Controllers/SPCController.cs b/AMESCoreStudio.Web/Controllers/SPCController.cs index 5a81b921..e2e6c6dd 100644 --- a/AMESCoreStudio.Web/Controllers/SPCController.cs +++ b/AMESCoreStudio.Web/Controllers/SPCController.cs @@ -1291,14 +1291,15 @@ namespace AMESCoreStudio.Web.Controllers { InspectionNumber = IPQCQuery.InspectionNo, OrderNumber = IPQCQuery.WipNo, - InspectionDate = IPQCQuery.InspectionDate.ToString(), + InspectionDate = IPQCQuery.InspectionDate.ToString("yyyy-MM-dd"), ItemNo = IPQCQuery.ItemNo, PlanQTY = IPQCQuery.PlanQTY.ToString(), MedicalModel = IPQCQuery.CustomerMedical, VIP = IPQCQuery.CustomerVIP, BIOSVer = IPQCQuery.BIOS, Approved = "沈俊輝", - Inspector = IPQCQuery.UpdateUser_Name + Inspector = IPQCQuery.UpdateUser_Name, + ItemNoDesc = IPQCQuery.ItemNoDesc }; diff --git a/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc b/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc index c173d28b..2a06b7ee 100644 --- a/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc +++ b/AMESCoreStudio.Web/wwwroot/Reports/SPC005View.rdlc @@ -49,6 +49,10 @@ ItemNo System.String + + ItemNoDesc + System.String + OrderNumber System.String @@ -853,10 +857,10 @@ OrderNumber - 2.56704cm - 4.99031cm + 2.5741cm + 4.99384cm 0.60324cm - 23.6839cm + 6.38847cm 13 + + true + true + + + + + =First(Fields!ItemNoDesc.Value, "DataSet1") + + + + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + + Black + + 0.5pt + + 2pt + 2pt + 2pt + 2pt + + true 0.31154cm diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs index 0ae93117..be6586e1 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/InspectionResultMastersController.cs @@ -476,7 +476,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES UpdateUser = q8.UserNo, UpdateUser_Name = q8.UserName, InspectionDate= q1.UpdateDate, - BarcodeNo = q1.BarcodeNo + BarcodeNo = q1.BarcodeNo, + ItemNoDesc = q4.Description }; var query = await q.Distinct().ToListAsync(); diff --git a/AMESCoreStudio.WebApi/DTO/AMES/IpqcDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/IpqcDto.cs index db4fdceb..f96b24e6 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/IpqcDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/IpqcDto.cs @@ -48,6 +48,14 @@ namespace AMESCoreStudio.WebApi.DTO.AMES [Display(Name = "料號")] public string ItemNo { get; set; } + /// + /// 料號敘述 + /// + [DataMember] + [Display(Name = "料號敘述")] + public string ItemNoDesc { get; set; } + + /// /// 工單數量 /// diff --git a/AMESCoreStudio.WebApi/DTO/AMES/SPC005VIiew.cs b/AMESCoreStudio.WebApi/DTO/AMES/SPC005VIiew.cs index 94110b86..f4382564 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/SPC005VIiew.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/SPC005VIiew.cs @@ -35,6 +35,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES /// public string ItemNo { get; set; } + /// + /// 料號敘述 + /// + public string ItemNoDesc { get; set; } + /// /// 工單號碼