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

Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

Browse Source 
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
This commit is contained in:
赵正易
2024-03-19 20:49:02 +08:00
parent c6093a01ac a3d7b47a88
commit be26bfedce
42 changed files with 2489 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,8 @@ namespace ZR.Service.mes.qc
/// <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)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsFirst>()
//XXX:修改查询日期查询的字段
@@ -65,6 +67,8 @@ namespace ZR.Service.mes.qc
/// <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)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsAgain>()
//XXX:修改查询日期查询的字段
@@ -98,6 +102,8 @@ namespace ZR.Service.mes.qc
/// <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)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsFinal>()
//XXX:修改查询日期查询的字段
@@ -132,6 +138,8 @@ namespace ZR.Service.mes.qc
/// <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)
{
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0;
var predicate = Expressionable.Create<QcQualityStatisticsTotal>()
//XXX:修改查询日期查询的字段