wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
周科达
2023-09-22 16:58:41 +08:00
parent 0afd486af2
commit 11c2262fe6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -388,8 +388,8 @@ namespace Tnb.ProductionMgr
reported_work_qty = a.reported_work_qty, reported_work_qty = a.reported_work_qty,
complete_rate = a.reported_work_qty==null?0:SqlFunc.ToDecimal(a.reported_work_qty*100)/SqlFunc.ToDecimal(a.plan_qty), complete_rate = a.reported_work_qty==null?0:SqlFunc.ToDecimal(a.reported_work_qty*100)/SqlFunc.ToDecimal(a.plan_qty),
children = SqlFunc.Subqueryable<PrdMoTask>() children = SqlFunc.Subqueryable<PrdMoTask>()
.LeftJoin<DictionaryDataEntity>((x,y)=>x.mo_task_code==y.EnCode && y.DictionaryTypeId==DictConst.PrdTaskStatusTypeId) .LeftJoin<DictionaryDataEntity>((x,y)=>x.mo_task_status==y.EnCode && y.DictionaryTypeId==DictConst.PrdTaskStatusTypeId)
.Where(x=>x.mo_id==a.id) .Where(x=>x.mo_id==a.id && !SqlFunc.IsNullOrEmpty(x.parent_id))
.OrderByDesc((x,y)=>x.create_time) .OrderByDesc((x,y)=>x.create_time)
.ToList((x,y)=>new PrdMoStatisticsDetailOutput() .ToList((x,y)=>new PrdMoStatisticsDetailOutput()
{ {

4
ProductionMgr/Tnb.ProductionMgr/PrdPackReportService.cs
View File

@@ -365,7 +365,7 @@ namespace Tnb.ProductionMgr
.LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => e.DictionaryTypeId == DictConst.PrdTaskStatusTypeId && a.mo_task_status == e.EnCode) .LeftJoin<DictionaryDataEntity>((a, b, c, d, e) => e.DictionaryTypeId == DictConst.PrdTaskStatusTypeId && a.mo_task_status == e.EnCode)
.LeftJoin<EqpEquipment>((a,b,c,d,e,f)=>a.eqp_id==f.id) .LeftJoin<EqpEquipment>((a,b,c,d,e,f)=>a.eqp_id==f.id)
.LeftJoin<ToolMolds>((a,b,c,d,e,f,g)=>a.mold_id==g.id) .LeftJoin<ToolMolds>((a,b,c,d,e,f,g)=>a.mold_id==g.id)
.Where((a, b) => a.workstation_id == input.stationId && a.mo_task_status != DictConst.ToBeScheduledEncode ) .Where((a, b) => a.workstation_id == input.stationId && (a.mo_task_status == DictConst.ToBeStartedEnCode || a.mo_task_status == DictConst.MoStatusPauseCode || a.mo_task_status == DictConst.ComplatedEnCode || a.mo_task_status == DictConst.InProgressEnCode) )
.Select((a, b, c, d, e,f,g) => new PADPackageTaskPageOutput .Select((a, b, c, d, e,f,g) => new PADPackageTaskPageOutput
{ {
id = a.id, id = a.id,
@@ -399,7 +399,7 @@ namespace Tnb.ProductionMgr
}) })
.MergeTable() .MergeTable()
.OrderByDescending((a) => a.create_time) .OrderByDescending((a) => a.create_time)
.ToPagedListAsync(input.currentPage, input.pageSize); .ToPagedListAsync(input.currentPage, int.MaxValue);
return PageResult<PADPackageTaskPageOutput>.SqlSugarPageResult(result); return PageResult<PADPackageTaskPageOutput>.SqlSugarPageResult(result);