From e7745b7e5ee257f07774dac55851db956ad46083 Mon Sep 17 00:00:00 2001 From: ray Date: Sun, 19 Feb 2023 20:50:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=20FQC=E6=9F=A5=E8=A9=A2=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AMES/FqcInhouseMasterController.cs | 3 ++- AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs index 70f7349e..ab436339 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs @@ -113,7 +113,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES , string inhouseNo, string date_str, string date_end, string status, string factoryID, string factoryNo, int page = 0, int limit = 10) { var q = from q1 in _context.FqcInhouseMasters - join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID } + join q2 in _context.FqcInhouseDetails on new { q1.InhouseNo, q1.SeqID } equals new { q2.InhouseNo, q2.SeqID } into j0 + from q2 in j0.DefaultIfEmpty() join q3 in _context.FqcResultMasters on q1.InhouseNo equals q3.InhouseNo into j1 from q3 in j1.DefaultIfEmpty() join q4 in _context.WipInfos on q1.WipNo equals q4.WipNO into s diff --git a/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs b/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs index e78b2ad2..7b16de7e 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs @@ -177,6 +177,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string PartsBakeRemarks { get; set; } + /// + /// PCB是否需要烘烤(Y/N) + /// + [Column("IS_PCB_BAKE")] + [DataMember] + [Display(Name = "PCB是否需要烘烤")] + public string ISPcbBake { get; set; } + /// /// PCB烘烤 ///