From 7e31bc1b261fe8794ea352bbb0a228c1764d81dc Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Fri, 17 Feb 2023 14:24:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=9B=B4=E9=80=9A=E7=8E=87?=
 =?UTF-8?q?=201.1.=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=8A=95=E4=BA=A7?=
 =?UTF-8?q?=201.2.=E6=97=A5=E6=9C=9F=E5=8C=BA=E9=97=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=B0=86=E7=BB=93=E6=9D=9F=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=8A=A0=E4=B8=8A1=E5=A4=A9=E3=80=82=201.3.=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E7=9B=B4=E9=80=9A=E7=8E=87=E7=9A=84=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/QRSController.cs              | 4 ++--
 AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index d36e57e4..dd2b2c38 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -1060,7 +1060,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                     if (rate > 0)
                     {
-                        sum_rate = sum_rate * rate;
+                        sum_rate = sum_rate * (rate / 100.0);
                     }
                 }
 
@@ -1147,7 +1147,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                             if (rate > 0)
                             {
-                                sum_rate = sum_rate * rate;
+                                sum_rate = sum_rate * (rate / 100.0);
                             }
                             rateDataList = rateDataList + "<td width='60'>" + inputQty + "</td><td width='60'>" + okQty + "</td><td width='60'>" + ngQty + "</td><td width='60'>" + rate.ToString("0.00") + "%</td>";
                         }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index b6dc82d7..6d20ff26 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -1213,6 +1213,8 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
                         q4.UnitName
                     };
 
+            q = q.Where(w => w.CompleteQTY > 0);
+
             if (unitNo != "*")
             {
                 q = q.Where(w => w.UnitNO == unitNo);
@@ -1227,7 +1229,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
             }
             if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "")
             {
-                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd));
+                q = q.Where(w => w.CreateDate >= DateTime.Parse(dateStart) && w.CreateDate <= DateTime.Parse(dateEnd).AddDays(1));
             }
 
             //紀錄筆數