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烘烤
///