1.修改前判維修輸入,取消條碼查詢,自動帶出全部未維修資料

AMESCoreStudio.Web/Controllers/REPController.cs

@@ -254,6 +254,22 @@ namespace AMESCoreStudio.Web.Controllers
             return View(model);
         }
 
+        [ResponseCache(Duration = 0)]
+        [HttpGet]
+        public async Task<IActionResult> GetNgInfoByStatus(int id, int page = 0, int limit = 10)
+        {
+            var result = await _repApi.GetNgInfoByStatus(id, page, limit);
+
+            var result_total = await _repApi.GetNgInfoByStatus(id, 0, limit);
+
+            if (result.Count > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result, count = result_total.Count });
+            }
+
+            return Json(new Table() { count = 0, data = null });
+        }
+
         [ResponseCache(Duration = 0)]
         [HttpGet]
         public async Task<IActionResult> GetNgInfoByBarcode(string barcodeNo)

AMESCoreStudio.Web/HttpApis/AMES/IREP.cs

@@ -29,6 +29,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/NgInfo/Barcode/{no}")]
         ITask<List<NgInfo>> GetNgInfoByBarcode(string no);
 
+        /// <summary>
+        /// 根據維修狀態獲取指定不良資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgInfo/Status/{id}")]
+        ITask<List<NgInfo>> GetNgInfoByStatus(int id, int page = 0, int limit = 10);
+
         /// <summary>
         /// 根據NG_ID獲取指定不良零件資料
         /// </summary>

AMESCoreStudio.Web/Views/REP/REP001.cshtml

@@ -29,6 +29,7 @@
 
 
 <div class="layui-card">
+    <!--
     <div class="layui-card-header">
         <div class="layui-form">
             <div class="layui-form-item">
@@ -47,6 +48,7 @@
             </div>
         </div>
     </div>
+    -->
     <div class="layui-card-body">
         <table class="layui-hide" id="test" lay-filter="test"></table>
     </div>
@@ -75,9 +77,22 @@
                 title: '測試不良ID'
             },
             {
-                field: 'typeNo',
+                field: 'barcode',
-                width: 120,
+                title: '條碼',
-                title: '測試種類代碼'
+                width: 200,
+                sort: true,
+                templet: function (d) {
+                    return d.barcode['barcodeNo'];
+                }
+            },
+            {
+                field: 'wip',
+                title: '工單號碼',
+                width: 200,
+                sort: true,
+                templet: function (d) {
+                    return d.wip['wipNO'];
+                }
             },
             {
                 field: 'station',
@@ -125,7 +140,7 @@
         }
 
         //基本数据表格
-        var table = hg.table.datatable('test', '測試不良資料', '/REP/GetNgInfoByBarcode', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('test', '測試不良資料', '/REP/GetNgInfoByStatus/0', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
 
     </script>
 }

AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs

@@ -86,6 +86,48 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return ngInfo;
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        [HttpGet("Status/{id}")]
+        public async Task<ActionResult<IEnumerable<NgInfo>>> GetNgInfoByStatus(int id, int page = 0, int limit = 10)
+        {
+            IQueryable<NgInfo> q = _context.NgInfos;
+
+            q = q.Where(p => p.Status.Equals(id));
+
+            if (page > 0)
+            {
+                q = q.OrderBy(p => p.CreateDate).Skip((page - 1) * limit).Take(limit);
+            }
+            else
+            {
+                q = q.OrderBy(p => p.CreateDate);
+            }
+
+            var ngInfo = await q.ToListAsync();
+
+            foreach (var data in ngInfo)
+            {
+                data.Barcode = _context.BarcodeInfoes.Find(data.BarcodeID);
+                data.Wip = _context.WipInfos.Find(data.WipId);
+                data.Station = _context.Stationses.Find(data.StationId);
+                //data.User = _context.UserInfoes.Find(data.OperatorID);
+                //data.OperatorName = _context.UserInfoes.Find(data.OperatorID).UserName;
+            }
+
+            if (ngInfo == null)
+            {
+                return NotFound();
+            }
+
+            return ngInfo;
+        }
+
         /// <summary>
         /// 
         /// </summary>