From b8b95d0afbe626d39915d3751aa781a0d4a5612d Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Wed, 22 Feb 2023 14:24:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BB=B4=E4=BF=AE=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=EF=BC=8C=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=9A=84=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E6=97=B6=E9=97=B4=E5=8A=A01=EF=BC=88=E5=90=AB?=
 =?UTF-8?q?=E5=BD=93=E5=A4=A9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AMES/BarcodeQngInfoesController.cs   |  4 ++--
 .../Controllers/AMES/NgRepairsController.cs          | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
index 87eaee6b..fad80fd3 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeQngInfoesController.cs
@@ -169,7 +169,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 if (dateStart != "" && dateEnd != "")
                 {
-                    q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd));
+                    q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd).AddDays(1));
                 }
             }
             if (unitNo != null)
@@ -271,7 +271,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 if (dateStart != "" && dateEnd != "")
                 {
-                    q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd));
+                    q = q.Where(w => w.ScrapDate >= DateTime.Parse(dateStart) && w.ScrapDate <= DateTime.Parse(dateEnd).AddDays(1));
                 }
             }
             if (unitNo != null)
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
index d734ce14..7256adfd 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
@@ -156,7 +156,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 if (dateStart != "" && 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));
                 }
             }
 
@@ -495,7 +495,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 if (dateStart != "" && 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));
                 }
             }
 
@@ -1120,7 +1120,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
             {
                 if (dateStart != "" && 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));
                 }
             }
 
@@ -1261,7 +1261,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
             {
                 if (dateStart != "" && 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));
                 }
             }
 
@@ -1403,7 +1403,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
             {
                 if (dateStart != "" && 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));
                 }
             }
 
@@ -1545,7 +1545,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
             {
                 if (dateStart != "" && 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));
                 }
             }