1.修改良率

AMESCoreStudio.Web/Views/QRS/QRS010.cshtml

@@ -244,6 +244,7 @@
                 $.ajax({
                     url: '@Url.Action("QRS010Query", "QRS")',
                     dataType: 'json',
+                    data: { "unitNo": $("#unit").val(),"lineID": $("#line").val(),"stationID": $("#station").val(),"mfgTypeNo": $("#mfgtype").val(),"wipNO": $("#wipNO").val(),"itemNO": $("#itemNO").val(),"dateStart": $("#dateStart").val(),"dateEnd": $("#dateEnd").val(),"custType": $("#custType").val() },
                     success(res) {
                         var data = res.data;
                         data = excel.filterExportData(data, [

AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs

@@ -254,7 +254,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             q = q.OrderBy(w => w.WipID + w.StationID);
 
 
-            var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName,x.TestType, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
+            var g = q.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.TestType, x.RuleStatus, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
             {
                 WipID = y.Key.WipID,
                 WipNO = y.Key.WipNO,
@@ -268,7 +268,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 ModelNO = y.Key.ModelNO,
                 FirstCnt = y.Sum(x => x.FirstCnt),
                 PassCnt = y.Sum(x => x.PassCnt),
-                Yield = (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100)
+                Yield = y.Sum(x => x.PassCnt) != 0 ? (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100) : 0
             });
 
             var g1 = g.GroupBy(x => new { x.WipID, x.WipNO, x.PlanQTY, x.StationID, x.StationName, x.TestType, x.ItemNO, x.LineDesc, x.ModelNO }).Select(y => new
@@ -284,7 +284,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 ModelNO = y.Key.ModelNO,
                 FirstCnt = 0,
                 PassCnt = y.Sum(x => x.FirstCnt),
-                Yield = (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100)
+                Yield = y.Sum(x => x.PassCnt) != 0 ? (y.Sum(x => x.FirstCnt) / y.Sum(x => x.PassCnt) * 100) : 0
             });
 
             //紀錄筆數