1. FAC加入檢視細項功能

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 });
             }

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

AMESCoreStudio.Web/Views/FQC/FQC007V.cshtml

@@ -4,8 +4,9 @@
 
 <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>
@@ -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']);
+    //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>
 }

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 = ""
                     });
                 }