Browse Source

1. FQC查詢修正

PTD
ray 2 years ago
parent
commit
e7745b7e5e
  1. 3
      AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
  2. 8
      AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs

3
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) , 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 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 join q3 in _context.FqcResultMasters on q1.InhouseNo equals q3.InhouseNo into j1
from q3 in j1.DefaultIfEmpty() from q3 in j1.DefaultIfEmpty()
join q4 in _context.WipInfos on q1.WipNo equals q4.WipNO into s join q4 in _context.WipInfos on q1.WipNo equals q4.WipNO into s

8
AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs

@ -177,6 +177,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
public string PartsBakeRemarks { get; set; } public string PartsBakeRemarks { get; set; }
/// <summary>
/// PCB是否需要烘烤(Y/N)
/// </summary>
[Column("IS_PCB_BAKE")]
[DataMember]
[Display(Name = "PCB是否需要烘烤")]
public string ISPcbBake { get; set; }
/// <summary> /// <summary>
/// PCB烘烤 /// PCB烘烤
/// </summary> /// </summary>

Loading…
Cancel
Save