From 0651c95f6fc468e64d0a35bad48d01aaa4885af2 Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Fri, 17 Jun 2022 01:27:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=20FAC=E5=8A=A0=E5=85=A5=E6=AA=A2=E8=A6=96?=
 =?UTF-8?q?=E7=B4=B0=E9=A0=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/FQCController.cs  | 11 ++++++++++-
 AMESCoreStudio.Web/Views/FQC/FQC007.cshtml       |  5 +++--
 AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml      | 16 ++++++++++------
 .../AMES/FqcInhouseDetailController.cs           |  3 ++-
 4 files changed, 25 insertions(+), 10 deletions(-)

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<IActionResult> FQC007V(string inhouseNo, int seqID, string boxNo)
+        {
+            ViewBag.inhouseNo = inhouseNo;
+            ViewBag.seqID = seqID;
+            ViewBag.boxNo = boxNo;
+            return View();
+        }
+
+
         public async Task<IActionResult> 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 @@
 
 <div class="layui-card">
     <div class="layui-card-body">
-        <input id="wip_id" name="wip_id" value="@ViewBag.WIP_ID" type="hidden" />
-        <input id="rule_station_id" name="rule_station_id" value="@ViewBag.RULE_STATION_ID" type="hidden" />
+        <input id="inhouseNo" name="inhouseNo" value="@ViewBag.inhouseNo" type="hidden" />
+        <input id="seqID" name="seqID" value="@ViewBag.seqID" type="hidden" />
+        <input id="boxNo" name="boxNo" value="@ViewBag.boxNo" type="hidden" />
         <table class="layui-hide" id="test" lay-filter="test"></table>
     </div>
 </div>
 
 @section Scripts{
-<script type="text/javascript">
+    <script type="text/javascript">
         //监听表单提交事件
         hg.form.onsubmit('querysubmit', function (data) {
             table && table.reload(data);
@@ -20,14 +21,17 @@
             {
                 field: 'boxNo',
                 title: '箱號',
+                width: 200,
                 sort: true
             },
             {
                 field: 'barcodeNo',
+                width: 200,
                 title: '內部條碼'
             },
             {
                 field: 'extraBarcodeNo',
+                width: 200,
                 title: '外部條碼'
             },
             {
@@ -50,7 +54,7 @@
         ];
 
     //基本数据表格
-    var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V?inhouseNo=QWO0002A1001&seqID=1&boxNo=BOX_20220216001', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
-    //var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V?inhouseNo=QWO0002A1001' + wip_id.value + '&seqID=' + rule_station_id.value + '&seqID=' +, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
-</script>
+    //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']);
+    </script>
 }
\ 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 = ""
                     });
                 }