JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. FQC007 加入相關欄位 

2. 修正工單基本資料 顯示工時判斷
PTD
Ray 3 years ago
parent
f32a3ae961
commit
e58a9aab2c
8 changed files with 383 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      AMESCoreStudio.Web/Controllers/FQCController.cs
  2. 10
      AMESCoreStudio.Web/Controllers/PCSController.cs
  3. 204
      AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
  4. 15
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  5. 2
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  6. 17
      AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
  7. 102
      AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
  8. 59
      AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs

29
AMESCoreStudio.Web/Controllers/FQCController.cs
View File

@ -658,7 +658,7 @@ namespace AMESCoreStudio.Web.Controllers
}
[HttpPost]
public async Task<IActionResult> FQC007Async(FqcDto model)
public async Task<IActionResult> FQC007Async(FqcDto model, string action)
{
if (string.IsNullOrWhiteSpace(model.InhouseNo))
{
@ -670,6 +670,23 @@ namespace AMESCoreStudio.Web.Controllers
result = await _fqcApi.GetFqcQuery(model.InhouseNo, model.SeqID);
if (action == "儲存")
{
var result_FQCResultMaster = await _fqcApi.GetFqcResultMaster(model.FqcID);
if (result_FQCResultMaster != null)
{
result_FQCResultMaster.OS = model.OS;
result_FQCResultMaster.CPU = model.CPU;
result_FQCResultMaster.RAM = model.RAM;
result_FQCResultMaster.BIOS = model.BIOS;
result_FQCResultMaster.Supervisor = model.Supervisor;
result_FQCResultMaster.Proved = model.Proved;
result_FQCResultMaster.OutfitNo = model.OutfitNo;
await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(result_FQCResultMaster));
}
}
if (result.Data.Count() != 0)
{
model = result.Data.FirstOrDefault();
@ -701,6 +718,8 @@ namespace AMESCoreStudio.Web.Controllers
model.h_SeqID = "";
}
return View("FQC007", model);
}
@ -776,7 +795,9 @@ namespace AMESCoreStudio.Web.Controllers
BoxNo = result_BarCodeInfo.FirstOrDefault().BoxNo,
StatusNo = model.StatusNo,
NgMemo = model.NgMemo,
NgReasonNo = model.NgReasonNo
NgReasonNo = model.NgReasonNo,
CreateUserID = GetLogInUserID(),
UpdateUserID = GetLogInUserID()
};
if (string.IsNullOrWhiteSpace(FqcResultDetail.ExtraBarcodeNo))
@ -806,6 +827,7 @@ namespace AMESCoreStudio.Web.Controllers
FqcResultMaster = result_FqcResultMaster.FirstOrDefault();
FqcResultMaster.QaQty += 1;
FqcResultMaster.UpdateDate = DateTime.Now;
FqcResultMaster.UpdateUserID = GetLogInUserID();
}
else
{
@ -821,6 +843,7 @@ namespace AMESCoreStudio.Web.Controllers
FqcResultMaster.ModelNo = FirstFqc.ModelNo;
FqcResultMaster.StartTime = DateTime.Now;
FqcResultMaster.EndTime = DateTime.Now;
FqcResultMaster.CreateUserID = GetLogInUserID();
}
// 判斷是PASS || FAIL
@ -909,9 +932,11 @@ namespace AMESCoreStudio.Web.Controllers
fqcResultMaster.EndTime = DateTime.Now;
fqcResultMaster.UpdateDate = DateTime.Now;
fqcResultMaster.SpecialPo = model.SpecialPo;
fqcResultMaster.UpdateUserID = GetLogInUserID();
fqcInhouseMaster.Status = model.QaResult;
fqcInhouseMaster.UpdateDate = DateTime.Now;
fqcInhouseMaster.UpdateUserID = GetLogInUserID();
IResultModel result;
result = await _fqcApi.PutFqcInhouseMaster(JsonConvert.SerializeObject(fqcInhouseMaster));

10
AMESCoreStudio.Web/Controllers/PCSController.cs
View File

@ -1924,6 +1924,14 @@ namespace AMESCoreStudio.Web.Controllers
model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
// 取料號對應工時
var standardWorkTimes = await _pcsApi.GetStandardWorkTimeByItemNo(model.wipAtt.ItemNO);
standardWorkTimes = standardWorkTimes.Where(w => w.LineID == model.wipInfo.LineID &&
w.UnitNo == model.wipInfo.UnitNO).ToList();
if (standardWorkTimes.Count != 0)
model.itemNoCT1 = standardWorkTimes.Sum(m => m.CT).ToString();
}
await WipDataSelectAll(model.wipAtt.WipNO, model.wipAtt.ItemNO, model.wipInfo.UnitNO);
@ -2059,7 +2067,7 @@ namespace AMESCoreStudio.Web.Controllers
w.UnitNo == model.wipInfo.UnitNO).ToList();
if (standardWorkTimes.Count != 0)
model.itemNoCT1 = standardWorkTimes.FirstOrDefault().CT.ToString();
model.itemNoCT1 = standardWorkTimes.Sum(m => m.CT).ToString();
}

204
AMESCoreStudio.Web/Views/FQC/FQC007.cshtml
View File

@ -9,6 +9,7 @@
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="layui-card-header">
<div class="layui-form">
<input asp-for="FqcID" type="hidden" value="@Model.FqcID" />
<div class="layui-form-item ">
<div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
</div>
@ -40,7 +41,7 @@
<input type="hidden" id="hInhouseNo" value="@Model.h_InhouseNo" />
<input type="hidden" id="hSeqID" value="@Model.h_SeqID" />
<input type="hidden" id="hFqcID" value="@Model.FqcID" />
<div class="layui-col-xs2">
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">入庫單號：</label>
</div>
<div class="layui-col-xs2">
@ -50,149 +51,230 @@
</div>
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">抽樣點數：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">工單號碼：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.QcQty</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.WipNo</label>
</div>
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">抽驗PASS數量：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">料號：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.PassQty</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ItemNo</label>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">本批完成量：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">品名：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<input name="title" type="text" class="layui-input">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ModelNo</label>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">客戶類別：</label>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">允收點數：</label>
<input @(Model.CustomerMedical == "Y" ? "checked" : "") type="checkbox" title="醫療" disabled />
<input @(Model.CustomerVIP == "Y" ? "checked" : "") type="checkbox" title="VIP" disabled />
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">客戶名稱：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.AcQty</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.CustomerNo</label>
</div>
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">拒收點數：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">委外廠商：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ReQty</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.Werk</label>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">工單號碼：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">本批完成量：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.WipNo</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.InhouseQty</label>
</div>
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">料號：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">抽樣點數：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ItemNo</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.QcQty</label>
</div>
</div>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">允收點數：</label>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">品名：</label>
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.AcQty</label>
</div>
</div>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">拒收點數：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ModelNo</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ReQty</label>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">抽樣結果：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">抽驗PASS數量：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.StatusName</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.PassQty</label>
</div>
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">判定備註：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">不良品數量：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.QaMeno</label>
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.FailQty</label>
</div>
</div>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">料號屬性：</label>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">抽樣結果：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<input type="text" name="title1" class="layui-input">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.StatusName</label>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">檢驗儀器編號：</label>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">不良品數量：</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" asp-for="OutfitNo" />
</div>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">單位主管：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.FailQty</label>
</div>
<div class="layui-input-inline" style="width:100px;">
<input class="layui-input" type="text" asp-for="Supervisor" onchange="getUserName(this);" />
</div>
<div class="layui-input-inline">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.Supervisor_Name</label>
</div>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">檢驗者：</label>
</div>
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">手動批退備註：</label>
<div class="layui-input-inline" style="width:100px;">
<input class="layui-input" type="text" asp-for="UpdateUser" onchange="getUserName(this);" />
</div>
<div class="layui-input-inline">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.UpdateUser_Name</label>
</div>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">Proved By：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.ManualQaMeno</label>
</div>
<div class="layui-input-inline" style="width:100px;">
<input class="layui-input" type="text" asp-for="Proved" onchange="getUserName(this);" />
</div>
<div class="layui-input-inline">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.Proved_Name</label>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">OS：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-input-inline">
<input type="text" class="layui-input" asp-for="OS" />
</div>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">CPU test：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-input-inline">
<input type="text" class="layui-input" asp-for="CPU" />
</div>
<span>Hz</span>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">RAM test：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-input-inline">
<input type="text" class="layui-input" asp-for="RAM" />
</div>
<span>Mb</span>
</div>
<div class="layui-col-xs1">
<label class="layui-form-label-col" style="text-align:right;">BIOS Ver：</label>
</div>
<div class="layui-col-xs2">
<div class="layui-input-inline">
<input type="text" class="layui-input" asp-for="BIOS" />
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-col-xs2">
<label class="layui-form-label-col" style="text-align:right;">判定備註：</label>
</div>
<div class="layui-col-xs10">
<div class="layui-form-item">
<div class="layui-input-block" style="margin-left:auto;">
<label class="layui-form-label" style="text-align: left; width: 150px;">@Model.QaMeno</label>
</div>
</div>
</div>
</div>
<div class="layui-row">
@ -313,7 +395,15 @@
</div>
</div>
</div>
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="layui-form-item">
<div style="text-align:center">
<input type="submit" value="儲存" name="action" class="layui-btn" />
</div>
</div>
</div>
</form>
</div>
@ -327,6 +417,27 @@
});
//UserName
function getUserName(val) {
if (val.value.length != 0) {
$.ajax(
{
url: "@Url.Action("getUserName", "SYS")",
dataType: 'json',
data: { "userNo": val.value},
type: 'post',
success: function (result)
{
$(val).closest('div.layui-inline').find('input[id*=' + val.id + '_Name]').val(result.data);
},
error: function (result)
{
alert(result);
}
});
}
};
function edit() {
layui.use('layer', function () {
var layer = layui.layer;
@ -393,7 +504,6 @@
maxmin: true,
content: '/FQC/FQC007A?wipNo=@Model.WipNo&itemNo=@Model.ItemNo',
end: function () {
//hg.msg('新增成功');
window.location.reload();
}
});

15
AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
View File

@ -471,8 +471,8 @@
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipTape == "Y" ? "checked" : "") } type="checkbox" title="貼付膠帶" name="wipBoard.DipTape" />
<input @if (Model.wipBoard != null) { @(Model.wipBoard.DipSolderMask == "Y" ? "checked" : "") } type="checkbox" title="點防焊膠" name="wipBoard.SmdSolderMask" />
@*<input asp-for="wipBoard.DipCarrier" type="checkbox" title="CARRIER" />
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
<input asp-for="wipBoard.DipTape" type="checkbox" title="貼付膠帶" />
<input asp-for="wipBoard.SmdSolderMask" type="checkbox" title="點防焊膠" />*@
</div>
</div>
</div>
@ -663,6 +663,17 @@
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Engineer_Name" readonly="readonly" />
</div>
<div class="layui-input-inline" style="display: flex;align-items: center;height: 35px;">
@if (!string.IsNullOrWhiteSpace(Model.itemNoCT1))
{
<span style="color:red">標準工時:@Model.itemNoCT1 秒/個 </span>
}
else
{
<span style="color:red">*無維護工時</span>
}
</div>
</div>
</div>

2
AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
View File

@ -1098,7 +1098,7 @@
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="layui-form-item">
<div style="text-align:center">
<input type="submit" value="保存" class="layui-btn" />
<input type="submit" value="保存" name="action" class="layui-btn" />
</div>
</div>
</form>

17
AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs
View File

@ -188,6 +188,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
into cp
from q2 in cp.DefaultIfEmpty()
join q3 in _context.QcCriteria on q1.CritID equals q3.CritID
join q4 in _context.WipInfos on q1.WipNo equals q4.WipNO
join q5 in _context.FactoryInfos on q4.Werks equals q5.FactoryID.ToString()
select new FqcDto
{
InhouseNo = q1.InhouseNo,
@ -203,10 +205,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
FqcID = q2.WipNo == null ? 0 : q2.FqcID,
InhouseMemo = q2.InhouseMemo,
ManualQaMeno = q2.ManualQaMeno,
QaMeno = q2.QaMeno
QaMeno = q2.QaMeno,
CustomerNo = q4.CustomerNO,
CustomerMedical = q4.CustomerMedical,
CustomerVIP = q4.CustomerVIP,
Werk = q4.Werks+"-"+q5.FactoryNameCh,
BIOS = q2.BIOS,
CPU = q2.CPU,
OS = q2.OS,
RAM = q2.RAM,
OutfitNo = q2.OutfitNo,
Supervisor = q2.Supervisor,
Proved = q2.Proved
};
var query = await q.ToListAsync();
var query = await q.Distinct().ToListAsync();
var FqcDetail = new List<FqcDto.FqcDetailDto>();
if (query.Count() != 0)

102
AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs
View File

@ -150,6 +150,108 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
[Display(Name = "入庫單備註")]
public string InhouseMemo { get; set; }
/// <summary>
/// 客戶類別醫療(Y-是;N-否)
/// </summary>
[DataMember]
public string CustomerMedical { get; set; } = "N";
/// <summary>
/// 客戶類別VIP(Y-是;N-否)
/// </summary>
[DataMember]
public string CustomerVIP { get; set; } = "N";
/// <summary>
/// 客戶名稱
/// </summary>
[DataMember]
[Display(Name = "客戶名稱")]
public string CustomerNo { get; set; }
/// <summary>
/// 委外廠商
/// </summary>
[DataMember]
[Display(Name = "委外廠商")]
public string Werk { get; set; }
/// <summary>
/// OS
/// </summary>
[DataMember]
[Display(Name = "OS")]
[StringLength(20)]
public string OS { get; set; }
/// <summary>
/// CPU test
/// </summary>
[DataMember]
[Display(Name = "CPU test")]
public string CPU { get; set; }
/// <summary>
/// RAM test
/// </summary>
[DataMember]
[Display(Name = "RAM test")]
public string RAM { get; set; }
/// <summary>
/// BIOS
/// </summary>
[DataMember]
[Display(Name = "BIOS")]
public string BIOS { get; set; }
/// <summary>
/// 檢驗儀器編號
/// </summary>
[DataMember]
[Display(Name = "檢驗儀器編號")]
public string OutfitNo { get; set; }
/// <summary>
/// 單位主管
/// </summary>
[DataMember]
public string Supervisor { get; set; }
/// <summary>
/// 單位主管姓名 Engineer
/// </summary>
[NotMapped]
[DataMember]
public string Supervisor_Name { get; set; }
/// <summary>
/// Proved
/// </summary>
[DataMember]
public string Proved { get; set; }
/// <summary>
/// Proved姓名 Engineer
/// </summary>
[NotMapped]
[DataMember]
public string Proved_Name { get; set; }
/// <summary>
/// 檢驗者
/// </summary>
[DataMember]
public string UpdateUser { get; set; }
/// <summary>
/// 檢驗者姓名 Engineer
/// </summary>
[NotMapped]
[DataMember]
public string UpdateUser_Name { get; set; }
public List<FqcDetailDto> fqcDetails { get; set; }
/// <summary>

59
AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs
View File

@ -222,5 +222,64 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Column("UPDATE_DATE")]
[DataMember]
public DateTime? UpdateDate { get; set; } = DateTime.Now;
/// <summary>
/// OS
/// </summary>
[DataMember]
[Display(Name = "OS")]
[Column("OS")]
[StringLength(20)]
public string OS { get; set; }
/// <summary>
/// CPU test
/// </summary>
[DataMember]
[Display(Name = "CPU test")]
[Column("CPU")]
[StringLength(20)]
public string CPU { get; set; }
/// <summary>
/// RAM test
/// </summary>
[DataMember]
[Display(Name = "RAM test")]
[Column("RAM")]
[StringLength(20)]
public string RAM { get; set; }
/// <summary>
/// BIOS
/// </summary>
[DataMember]
[Display(Name = "BIOS")]
[Column("BIOS")]
[StringLength(20)]
public string BIOS { get; set; }
/// <summary>
/// 檢驗儀器編號
/// </summary>
[DataMember]
[Display(Name = "檢驗儀器編號")]
[Column("OUTFIT_NO")]
[StringLength(20)]
public string OutfitNo { get; set; }
/// <summary>
/// 單位主管
/// </summary>
[Column("SUPERVISOR")]
[DataMember]
public string Supervisor { get; set; }
/// <summary>
/// Proved
/// </summary>
[Column("PROVED")]
[DataMember]
public string Proved { get; set; }
}
}

Write Preview
Loading…
Cancel
Save