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

本地时间修正

Browse Source
This commit is contained in:
qianhao.xu
2024-03-19 20:41:57 +08:00
parent beb48faf65
commit a3d7b47a88
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
View File

@@ -298,11 +298,12 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC
} }
// 更改工单状态为完成态 // 生成质量统计报表
[HttpGet("generateQualityStatisticsTable")] [HttpGet("generateQualityStatisticsTable")]
public IActionResult GenerateQualityStatisticsTable(string workorderID,string team, DateTime firstQuality_time) public IActionResult GenerateQualityStatisticsTable(string workorderID,string team, DateTime firstQuality_time)
{ {
int result = fQCService.GenerateQualityStatisticsTable(workorderID, team, firstQuality_time);
int result = fQCService.GenerateQualityStatisticsTable(workorderID, team, firstQuality_time.ToLocalTime());
return SUCCESS(result); return SUCCESS(result);
} }

2
ZR.Service/mes/qc/FirstFQCService.cs
View File

@@ -132,7 +132,7 @@ namespace ZR.Service.mes.qc
public int WriteProcessFlow_first(string workorderID, DateTime time) public int WriteProcessFlow_first(string workorderID, DateTime time)
{ {
ProWorkordertimeStep step = new ProWorkordertimeStep(); ProWorkordertimeStep step = new ProWorkordertimeStep();
step.FirstInspectTime = time; step.FirstInspectTime = time.ToLocalTime();
step.CreatedTime = DateTime.Now; step.CreatedTime = DateTime.Now;
step.WorkoderId = workorderID; step.WorkoderId = workorderID;

8
ZR.Service/mes/qc/QCStatisticsService.cs
View File

@@ -31,6 +31,8 @@ namespace ZR.Service.mes.qc
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public (List<QcQualityStatisticsFirst>, int) GetQualityStatisticsTable_first(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public (List<QcQualityStatisticsFirst>, int) GetQualityStatisticsTable_first(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0; int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsFirst>() var predicate = Expressionable.Create<QcQualityStatisticsFirst>()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime) .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
@@ -65,6 +67,8 @@ namespace ZR.Service.mes.qc
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public (List<QcQualityStatisticsAgain>, int) GetQualityStatisticsTable_again(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public (List<QcQualityStatisticsAgain>, int) GetQualityStatisticsTable_again(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0; int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsAgain>() var predicate = Expressionable.Create<QcQualityStatisticsAgain>()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime) .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
@@ -97,6 +101,8 @@ namespace ZR.Service.mes.qc
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public (List<QcQualityStatisticsFinal>, int) GetQualityStatisticsTable_final(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public (List<QcQualityStatisticsFinal>, int) GetQualityStatisticsTable_final(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0; int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsFinal>() var predicate = Expressionable.Create<QcQualityStatisticsFinal>()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime) .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
@@ -130,6 +136,8 @@ namespace ZR.Service.mes.qc
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public (List<QcQualityStatisticsTotal>, int) GetQualityStatisticsTable_total(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize) public (List<QcQualityStatisticsTotal>, int) GetQualityStatisticsTable_total(DateTime starttime, DateTime endTime, string workorderid, string partnumber, string product_description, string team, int pageNum, int pageSize)
{ {
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0; int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsTotal>() var predicate = Expressionable.Create<QcQualityStatisticsTotal>()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime) .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)