1.修改良率查詢QRS010

1.1.增加良率圖表(柱狀圖+折線圖)

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -465,10 +465,40 @@ namespace AMESCoreStudio.Web.Controllers
             return View();
         }
 
-        public async Task<IActionResult> QRS010QueryAsync(string unitNo, string lineID, string stationID, string wipNO, string itemNO, string mfgTypeNo, string dateStart, string dateEnd, int page = 0, int limit = 10)
+        public async Task<IActionResult> QRS010QueryAsync(string unitNo, string lineID, string stationID, string mfgTypeNo, string wipNO, string itemNO,  string dateStart, string dateEnd, int page = 0, int limit = 10)
         {
 
-            var result = await _pcsApi.GetYieldData4QRS010(unitNo, lineID, stationID, wipNO, itemNO, mfgTypeNo, dateStart, dateEnd, page, limit);
+            var result = await _pcsApi.GetYieldData4QRS010(unitNo, lineID, stationID, mfgTypeNo, wipNO, itemNO, dateStart, dateEnd, page, limit);
+
+            if (result.DataTotal > 0)
+            {
+                return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
+            }
+            return Json(new Table() { count = 0, data = null });
+        }
+
+        public IActionResult QRS010A(string id)
+        {
+            ViewData["ParamList"] = id;
+            return View();
+        }
+
+        [HttpPost]
+        public async Task<JsonResult> GetYieldData4QRS010Async(string id)
+        {
+            string[] param = id.Split('_');
+
+            var result = await _pcsApi.GetYieldData4QRS010(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], 0, 10);
+
+            return Json(result.Data);
+        }
+
+        public async Task<IActionResult> GetYieldData4QRS010ListAsync(string id)
+        {
+
+            string[] param = id.Split('_');
+
+            var result = await _pcsApi.GetYieldData4QRS010(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], 0, 10);
 
             if (result.DataTotal > 0)
             {

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -831,7 +831,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipClass/GetYieldData4QRS010")]
-        ITask<ResultModel<dynamic>> GetYieldData4QRS010(string unitNo, string lineID, string stationID, string wipNo, string itemNo, string mfgTypeNo, string dateStart, string dateEnd, int page, int limit);
+        ITask<ResultModel<dynamic>> GetYieldData4QRS010(string unitNo, string lineID, string stationID, string mfgTypeNo, string wipNo, string itemNo, string dateStart, string dateEnd, int page, int limit);
 
         #endregion
 

AMESCoreStudio.Web/Views/QRS/QRS010.cshtml

@@ -230,18 +230,12 @@
                 , theme: 'grid'
             });
 
-            form.on('select(productType)', function (data)
+            form.on('select(mfgtype)', function (data)
             {
-                $("#productTypeNo").val(data.value);
+                $("#mfgTypeNo").val(data.value);
 
             });
 
-            form.on('select(testType)', function (data) {
-                $("#testTypeNo").val(data.value);
-
-            });
-
-
             form.on('select(unit)', function (data) {
                 $("#unitNo").val(data.value);
 
@@ -264,7 +258,8 @@
 
         $('#btnChart1').click(function ()
         {
-            var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value;
+            var param = unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + mfgTypeNo.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value;
+            //alert(param);
             hg.open('良率統計圖表', '/QRS/QRS010A/' + param, 800, 600);
         });
 

AMESCoreStudio.Web/Views/QRS/QRS010A.cshtml

@@ -0,0 +1,172 @@
+@{ ViewData["Title"] = "QRS010A";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<script src="~/Highcharts-7.1.2/highcharts.js"></script>
+<script src="~/Highcharts-7.1.2/modules/exporting.js"></script>
+<script src="~/Highcharts-7.1.2/modules/export-data.js"></script>
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+
+    .text-error {
+        color: #dc3545 !important;
+    }
+
+    .my-read-only-class {
+        cursor: not-allowed;
+    }
+</style>
+
+<div class="layui-card">
+    <div class="col-sm-12">
+        <form enctype="multipart/form-data" class="layui-form" method="post">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <div id="divChart" style="width: 600px; height: 400px; margin: 0 auto"></div>
+                    <input type="hidden" id="param_list" value="@ViewData["ParamList"]" />
+                    <table class="layui-hide" id="query" lay-filter="query"></table>
+                </div>
+            </div>
+        </form>
+    </div>
+
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        
+        //alert(param_list.value);
+
+        $.ajax({
+            type: "Post",
+            url: '/QRS/GetYieldData4QRS010?id=' + param_list.value,
+            contentType: "application/json; charset=utf-8",
+            dataType: 'json',
+            success: function (response) {
+                var idx = 0;
+                var xAxisData = new Array();
+                var yieldData = new Array();
+                $.each(response, function (i, item) {
+                    yieldData[idx] = item["yield"];
+                    xAxisData[idx] = item["wipNO"] + " - " + item["lineDesc"] + " - " + item["stationDesc"];
+                    idx = idx + 1;
+                });
+
+                Highcharts.chart('divChart', {
+                    title: {
+                        text: '良率圖表'
+                    },
+                    subtitle: {
+                        text: ''
+                    },
+                    xAxis: {
+                        categories: xAxisData
+                    },
+                    yAxis: {
+                        title: {
+                            text: '良率'
+                        }
+                    },
+                    plotOptions: {
+                        line: {
+                            dataLabels: {
+                                enabled: true
+                            },
+                            enableMouseTracking: false
+                        }
+                    },
+                    series: [{
+                        type: 'column',
+                        name: '工單-線別-站別',
+                        data: yieldData
+                    },
+                    {
+                        type: 'line',
+                        name: '工單-線別-站別',
+                        data: yieldData
+                    }]
+                });
+            },
+            error: function () {
+                alert("查無良率資料!");
+                $("#divChart").empty();
+            }
+        });
+
+        var tableCols = [[
+            {
+                field: 'wipNO',
+                width: 160,
+                title: '工單號碼',
+                sort: true
+            },
+            {
+                field: 'itemNO',
+                title: '料號',
+                width: 200,
+                sort: true
+            },
+            {
+                field: 'planQTY',
+                width: 120,
+                title: '計畫數量',
+                sort: true
+            },
+            {
+                field: 'modelNO',
+                title: '機種',
+                sort: true
+            },
+            {
+                field: 'lineDesc',
+                width: 100,
+                title: '線別',
+                sort: true
+            },
+            {
+                field: 'stationDesc',
+                width: 120,
+                title: '站別',
+                sort: true
+            },
+            {
+                field: 'ruleStatus',
+                title: '過站狀態',
+                width: 100,
+                sort: true
+            },
+            {
+                field: 'firstCnt',
+                title: '首次過站數量',
+                width: 160,
+                sort: true
+            },
+            {
+                field: 'passCnt',
+                title: '總共過站數量',
+                width: 160,
+                sort: true
+            },
+            {
+                field: 'yield',
+                title: '良率',
+                width: 120,
+                sort: true
+            }]
+        ];
+
+        //基本数据表格
+        //var table = hg.table.datatable('query', '良率查詢', '/QRS/GetYieldData4QRS010List/' + param_list.value, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    });
+
+</script>
+
+
+}
+

AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

@@ -373,12 +373,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 ErrorCode = x.Key.ReasonNo,
                 ErrorQty = x.Count()
-            }).ToList();
+            });
 
             //紀錄筆數
             result.DataTotal = g.Count();
 
-            result.Data = g;
+            result.Data = await g.ToListAsync();
 
             if (result == null)
             {
@@ -504,12 +504,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 RMACode = x.Key.RepairNo,
                 RMAQty = x.Count()
-            }).ToList();
+            });
 
             //紀錄筆數
             result.DataTotal = g.Count();
 
-            result.Data = g;
+            result.Data = await g.ToListAsync();
 
             if (result == null)
             {
@@ -636,12 +636,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 LocationNo = x.Key.LocationNo,
                 LocationQty = x.Count()
-            }).ToList();
+            });
 
             //紀錄筆數
             result.DataTotal = g.Count();
 
-            result.Data = g;
+            result.Data = await g.ToListAsync();
 
             if (result == null)
             {
@@ -768,12 +768,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 RRDesc = x.Key.RRDesc,
                 RRDescQty = x.Count()
-            }).ToList();
+            });
 
             //紀錄筆數
             result.DataTotal = g.Count();
 
-            result.Data = g;
+            result.Data = await g.ToListAsync();
 
             if (result == null)
             {

AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs

@@ -207,6 +207,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     q = q.Where(w => w.StationID == int.Parse(stationID));
                 }
             }
+
             if (wipNo != null)
             {
                 if (wipNo != "")