diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index cf9c206d..3f0b0f05 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -31,7 +31,7 @@ namespace AMESCoreStudio.Web.Controllers public readonly IFQC _fqcApi; private readonly IWebHostEnvironment _env; public readonly IPCS _pcsApi; - public FQCController(ILogger logger, IFQC fqcApi, IWebHostEnvironment env , IPCS pcsApi) + public FQCController(ILogger logger, IFQC fqcApi, IWebHostEnvironment env, IPCS pcsApi) { _logger = logger; _fqcApi = fqcApi; @@ -1009,7 +1009,8 @@ namespace AMESCoreStudio.Web.Controllers result = await _fqcApi.PutFqcResultMaster(JsonConvert.SerializeObject(fqcResultMaster)); if (result.Success) { - var result_FQC = await _fqcApi.PassingByFQC(model.InhouseNo, model.SeqID, GetLogInUserID()); + if (model.QaResult == "P") + await _fqcApi.PassingByFQC(model.InhouseNo, model.SeqID, GetLogInUserID()); var _msg = "新增成功!"; return RedirectToAction("WindowReload", "Home", new { msg = _msg }); @@ -1193,12 +1194,12 @@ namespace AMESCoreStudio.Web.Controllers } public async Task FQC008QueryAsync(string barcodeNo, string wipNo - , string boxNo, string inhouseNo, string date_str, string date_end ,string factoryID + , string boxNo, string inhouseNo, string date_str, string date_end, string factoryID , string status, int page = 0, int limit = 10) { IResultModel result = await _fqcApi.GetFqcInhouseMasterQuery(barcodeNo: barcodeNo, wipNo: wipNo , boxNo: boxNo, inhouseNo: inhouseNo, date_str: date_str, date_end: date_end - , status: status, page: page, limit: limit , factoryID: factoryID); + , status: status, page: page, limit: limit, factoryID: factoryID); await GetFactoryInfo(); if (result.Data.Count() != 0) diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml index 5bf6a154..a2b3f5d3 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml @@ -417,7 +417,7 @@ function detail(obj) { let InhouseNo = $("#hInhouseNo").val().trim(); let SeqID = $("#hSeqID").val().trim(); - hg.open('FQC細項資料', '/FQC/FQC007V?inhouseNo=' + InhouseNo + '&seqID=' + SeqID+ '&boxNo=' + obj, '700', '400'); + hg.open('FQC細項資料', '/FQC/FQC007V?inhouseNo=' + InhouseNo + '&seqID=' + SeqID+ '&boxNo=' + obj, '900', '500'); } //UserName diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml index 90592e16..bbf19d35 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml @@ -2,14 +2,12 @@ Layout = "~/Views/Shared/_AMESLayout.cshtml"; } -
-
@section Scripts{ } \ No newline at end of file