Browse Source

1. 調整FQC抽驗 顯示備註bug

PTD
Ray 2 years ago
parent
commit
10765cf81e
  1. 4
      AMESCoreStudio.Web/Views/FQC/FQC008.cshtml
  2. 6
      AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
  3. 7
      AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs

4
AMESCoreStudio.Web/Views/FQC/FQC008.cshtml

@ -236,8 +236,8 @@
templet: '<div>{{ layui.util.toDateString(d.endTime, "yyyy/MM/dd") }}</div>'
},
{
field: 'qaMeno',
title: '備註'
field: 'qaMemo',
title: '判定備註'
},
{
title: '操作',

6
AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@ -136,7 +136,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
ProTypeName = q1.ProType,
CreateDate = q1.CreateDate,
EndTime = q3.EndTime,
SpecialNo = q3.SpecialPo
SpecialNo = q3.SpecialPo,
QaMemo = q3.QaMeno
};
//q1.Status == "P" ? "允收" : q1.Status == "R" ? "批退" : "未驗收完成",
//IQueryable <FqcInhouseDetail> q1 = _context.FqcInhouseDetails;
@ -205,7 +206,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
ProTypeName = s.ProTypeName,
CreateDate = s.CreateDate,
EndTime = s.EndTime,
SpecialNo = s.SpecialNo
SpecialNo = s.SpecialNo,
QaMemo = s.QaMemo
}).Distinct().ToListAsync();
// 紀錄筆數

7
AMESCoreStudio.WebApi/DTO/AMES/FqcInhouseMasterDto.cs

@ -82,6 +82,13 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
[Display(Name = "抽驗狀態")]
public string StatusName { get; set; } = "A";
/// <summary>
/// 判定備註
/// </summary>
[DataMember]
[Display(Name = "判定備註")]
public string QaMemo { get; set; }
/// <summary>
/// 抽驗狀態 P-PASS(允收);R-REJECT(批退); A-初始狀態 ; P1-特採允收
/// </summary>

Loading…
Cancel
Save