diff --git a/AMESCoreStudio.Web/Controllers/FQCController.cs b/AMESCoreStudio.Web/Controllers/FQCController.cs index 3e936ef3..cf9c206d 100644 --- a/AMESCoreStudio.Web/Controllers/FQCController.cs +++ b/AMESCoreStudio.Web/Controllers/FQCController.cs @@ -1161,11 +1161,20 @@ namespace AMESCoreStudio.Web.Controllers #region FQC細項資料 [HttpGet] + public async Task FQC007V(string inhouseNo, int seqID, string boxNo) + { + ViewBag.inhouseNo = inhouseNo; + ViewBag.seqID = seqID; + ViewBag.boxNo = boxNo; + return View(); + } + + public async Task GetFQC007V(string inhouseNo, int seqID, string boxNo) { var result = await _fqcApi.FQC007V(inhouseNo, seqID, boxNo); - if (result.DataTotal > 0) + if (result.Data.Count() > 0) { return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal }); } diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml index b5f56945..5bf6a154 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007.cshtml @@ -415,8 +415,9 @@ }); //通过行tool檢視,lay-event="detail" function detail(obj) { - alert(obj); - hg.open('FQC細項資料', '/FQC/FQC007V/' + obj, '', '', true); + let InhouseNo = $("#hInhouseNo").val().trim(); + let SeqID = $("#hSeqID").val().trim(); + hg.open('FQC細項資料', '/FQC/FQC007V?inhouseNo=' + InhouseNo + '&seqID=' + SeqID+ '&boxNo=' + obj, '700', '400'); } //UserName diff --git a/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml b/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml index 90551109..90592e16 100644 --- a/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml +++ b/AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml @@ -4,14 +4,15 @@
- - + + +
@section Scripts{ - + //var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V/', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V?inhouseNo=@ViewBag.inhouseNo&seqID=@ViewBag.seqID&boxNo=@ViewBag.boxNo', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); + } \ No newline at end of file diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs index 060c6b83..f236eb03 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs @@ -77,7 +77,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { BarcodeNo = item.BarcodeNo, ExtraBarcodeNo = item.ExtraBarcodeNo, - BoxNo = item.BoxNo + BoxNo = item.BoxNo, + StatusNo = "" }); }