From f16c35ca03a6fd9b3f999963cef51466a279c9fc Mon Sep 17 00:00:00 2001
From: "xiaowei.song" <xiaowei.song@doan-tech.com>
Date: Tue, 11 Jun 2024 17:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs | 4 ++--
 ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs | 4 ++--
 ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs   | 4 ++--
 ZR.Service/mes/ql/PLBatchService.cs                       | 5 ++++-
 ZR.Service/mes/ql/PLRawMaterialService.cs                 | 5 ++++-
 ZR.Service/mes/ql/PLTestService.cs                        | 5 ++++-
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs b/ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
index 68cc4ce6..dd8aeb9b 100644
--- a/ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
@@ -40,8 +40,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
         [HttpGet("gettestlist")]
         public IActionResult GetTestlist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
         {
-            starttime = starttime.AddHours(8);
-            endTime = endTime.AddHours(8);
+            //starttime = starttime.AddHours(8);
+            //endTime = endTime.AddHours(8);
 
             // 时间要增加，8个小时
             (List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, pageNum, pageSize);
diff --git a/ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs b/ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
index 0bfb97a5..d45e9a5b 100644
--- a/ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
@@ -41,8 +41,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
         public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
         {
 
-            starttime = starttime.AddHours(8);
-            endTime = endTime.AddHours(8);
+            //starttime = starttime.AddHours(8);
+            //endTime = endTime.AddHours(8);
             // 时间要增加，8个小时
             (List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, pageNum, pageSize);
 
diff --git a/ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs b/ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
index 19bb486b..a43766c8 100644
--- a/ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
@@ -41,8 +41,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
         [HttpGet("getrawmateriallist")]
         public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
         {
-            starttime = starttime.AddHours(8);
-            endTime = endTime.AddHours(8);
+            //starttime = starttime.AddHours(8);
+            //endTime = endTime.AddHours(8);
 
             // 时间要增加，8个小时
             (List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, pageNum, pageSize);
diff --git a/ZR.Service/mes/ql/PLBatchService.cs b/ZR.Service/mes/ql/PLBatchService.cs
index 4d9ed2be..fe52e528 100644
--- a/ZR.Service/mes/ql/PLBatchService.cs
+++ b/ZR.Service/mes/ql/PLBatchService.cs
@@ -76,7 +76,10 @@ namespace ZR.Service.mes.ql
         public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
         {
             int totalNum = 0;
-            List<PLBatch> data = Context.Queryable<PLBatch>().Where(it => it.Id > 0).OrderBy(it => it.Id).ToPageList(pageNum, pageSize, ref totalNum);
+            List<PLBatch> data = Context.Queryable<PLBatch>()
+                .Where(it => it.CreatedTime > starttime.ToLocalTime() && it.CreatedTime <= endTime.ToLocalTime())
+                .OrderBy(it => it.Id)
+                .ToPageList(pageNum, pageSize, ref totalNum);
             return (data, totalNum);
         }
 
diff --git a/ZR.Service/mes/ql/PLRawMaterialService.cs b/ZR.Service/mes/ql/PLRawMaterialService.cs
index c3e3c4a8..02be8d4c 100644
--- a/ZR.Service/mes/ql/PLRawMaterialService.cs
+++ b/ZR.Service/mes/ql/PLRawMaterialService.cs
@@ -101,7 +101,10 @@ namespace ZR.Service.mes.ql
             //return (data, totalNum);
 
             int totalNum = 0;
-            List<PLRawMaterial> data = Context.Queryable<PLRawMaterial>().Where(it => it.Id > 0).OrderBy(it => it.Id).ToPageList(pageNum, pageSize, ref totalNum);
+            List<PLRawMaterial> data = Context.Queryable<PLRawMaterial>()
+                                .Where(it => it.CreatedTime > starttime.ToLocalTime() && it.CreatedTime<= endTime.ToLocalTime())
+                                .OrderBy(it => it.Id)
+                                .ToPageList(pageNum, pageSize, ref totalNum);
             return (data, totalNum);
             //return (Context.Queryable<PLRawMaterial>().Where(it => it.Id > 0).ToList(),100);
         }
diff --git a/ZR.Service/mes/ql/PLTestService.cs b/ZR.Service/mes/ql/PLTestService.cs
index 2267558a..7e0aaf70 100644
--- a/ZR.Service/mes/ql/PLTestService.cs
+++ b/ZR.Service/mes/ql/PLTestService.cs
@@ -76,7 +76,10 @@ namespace ZR.Service.mes.ql
         public  (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
         {
             int totalNum = 0;
-            List<PLTest> data = Context.Queryable<PLTest>().Where(it => it.Id > 0).OrderBy(it => it.Id).ToPageList(pageNum, pageSize, ref totalNum);
+            List<PLTest> data = Context.Queryable<PLTest>()
+                .Where(it => it.CreatedTime > starttime.ToLocalTime() && it.CreatedTime <= endTime.ToLocalTime())
+                .OrderBy(it => it.Id)
+                .ToPageList(pageNum, pageSize, ref totalNum);
             return (data, totalNum);
         }