diff --git a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
index 0649afb6..fe61054f 100644
--- a/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/qc/FQC/FirstFQCController.cs
@@ -298,11 +298,12 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.IQC
}
- // 更改工单状态为完成态
+ // 生成质量统计报表
[HttpGet("generateQualityStatisticsTable")]
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);
}
diff --git a/ZR.Service/mes/qc/FirstFQCService.cs b/ZR.Service/mes/qc/FirstFQCService.cs
index d62b60e7..bed1cdf2 100644
--- a/ZR.Service/mes/qc/FirstFQCService.cs
+++ b/ZR.Service/mes/qc/FirstFQCService.cs
@@ -132,7 +132,7 @@ namespace ZR.Service.mes.qc
public int WriteProcessFlow_first(string workorderID, DateTime time)
{
ProWorkordertimeStep step = new ProWorkordertimeStep();
- step.FirstInspectTime = time;
+ step.FirstInspectTime = time.ToLocalTime();
step.CreatedTime = DateTime.Now;
step.WorkoderId = workorderID;
diff --git a/ZR.Service/mes/qc/QCStatisticsService.cs b/ZR.Service/mes/qc/QCStatisticsService.cs
index 8a59de61..2dfb866e 100644
--- a/ZR.Service/mes/qc/QCStatisticsService.cs
+++ b/ZR.Service/mes/qc/QCStatisticsService.cs
@@ -31,6 +31,8 @@ namespace ZR.Service.mes.qc
///
public (List, 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;
var predicate = Expressionable.Create()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
@@ -65,6 +67,8 @@ namespace ZR.Service.mes.qc
///
public (List, 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;
var predicate = Expressionable.Create()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
@@ -97,6 +101,8 @@ namespace ZR.Service.mes.qc
///
public (List, 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;
var predicate = Expressionable.Create()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)
@@ -130,6 +136,8 @@ namespace ZR.Service.mes.qc
///
public (List, 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;
var predicate = Expressionable.Create()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime)