Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

补充时间范围查询

Browse Source
This commit is contained in:
xiaowei.song
2024-06-11 17:27:02 +08:00
parent 95103397b1
commit f16c35ca03
6 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/mes/ql/PainLab02Controller.cs
View File

@@ -40,8 +40,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
[HttpGet("gettestlist")] [HttpGet("gettestlist")]
public IActionResult GetTestlist(DateTime starttime, DateTime endTime, int pageNum, int pageSize) public IActionResult GetTestlist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
{ {
starttime = starttime.AddHours(8); //starttime = starttime.AddHours(8);
endTime = endTime.AddHours(8); //endTime = endTime.AddHours(8);
// 时间要增加，8个小时 // 时间要增加，8个小时
(List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, pageNum, pageSize); (List<PLTest>, int) lst = plTestService.GetPLTestTable(starttime, endTime, pageNum, pageSize);

4
ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
View File

@@ -41,8 +41,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, int pageNum, int pageSize) public IActionResult GetBatchlist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
{ {
starttime = starttime.AddHours(8); //starttime = starttime.AddHours(8);
endTime = endTime.AddHours(8); //endTime = endTime.AddHours(8);
// 时间要增加，8个小时 // 时间要增加，8个小时
(List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, pageNum, pageSize); (List<PLBatch>, int) lst = plBatchService.GetPLBatchTable(starttime, endTime, pageNum, pageSize);

4
ZR.Admin.WebApi/Controllers/mes/ql/PainLabController.cs
View File

@@ -41,8 +41,8 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
[HttpGet("getrawmateriallist")] [HttpGet("getrawmateriallist")]
public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, int pageNum, int pageSize) public IActionResult GetRawMateriallist(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
{ {
starttime = starttime.AddHours(8); //starttime = starttime.AddHours(8);
endTime = endTime.AddHours(8); //endTime = endTime.AddHours(8);
// 时间要增加，8个小时 // 时间要增加，8个小时
(List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, pageNum, pageSize); (List<PLRawMaterial>, int) lst = plRawMaterialService.GetRawMaterialTable(starttime, endTime, pageNum, pageSize);

5
ZR.Service/mes/ql/PLBatchService.cs
View File

@@ -76,7 +76,10 @@ namespace ZR.Service.mes.ql
public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize) public (List<PLBatch>, int) GetPLBatchTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
{ {
int totalNum = 0; 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); return (data, totalNum);
} }

5
ZR.Service/mes/ql/PLRawMaterialService.cs
View File

@@ -101,7 +101,10 @@ namespace ZR.Service.mes.ql
//return (data, totalNum); //return (data, totalNum);
int totalNum = 0; 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 (data, totalNum);
//return (Context.Queryable<PLRawMaterial>().Where(it => it.Id > 0).ToList(),100); //return (Context.Queryable<PLRawMaterial>().Where(it => it.Id > 0).ToList(),100);
} }

5
ZR.Service/mes/ql/PLTestService.cs
View File

@@ -76,7 +76,10 @@ namespace ZR.Service.mes.ql
public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize) public (List<PLTest>, int) GetPLTestTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
{ {
int totalNum = 0; 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); return (data, totalNum);
} }