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

bug

Browse Source
This commit is contained in:
周科达
2024-08-23 14:47:25 +08:00
parent 4ac3e9582c
commit 39fac9920c
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ProductionMgr/Tnb.ProductionMgr/BiService.cs
View File

@@ -81,12 +81,14 @@ namespace Tnb.ProductionMgr
.LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.id) .LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.id)
.LeftJoin<UserEntity>((a,b,c,d)=>a.create_id==d.Id) .LeftJoin<UserEntity>((a,b,c,d)=>a.create_id==d.Id)
.LeftJoin<OrganizeEntity>((a,b,c,d,e)=>b.workline_id==e.Id) .LeftJoin<OrganizeEntity>((a,b,c,d,e)=>b.workline_id==e.Id)
.LeftJoin<EqpEquipment>((a,b,c,d,e,f)=>b.eqp_id==f.id)
.Where((a,b,c)=>(b.mo_task_status==DictConst.MoStatusPauseCode || b.mo_task_status==DictConst.InProgressEnCode) && c.category_id.Contains("ZSJ")) .Where((a,b,c)=>(b.mo_task_status==DictConst.MoStatusPauseCode || b.mo_task_status==DictConst.InProgressEnCode) && c.category_id.Contains("ZSJ"))
.Select((a,b,c,d,e)=>new ReportRecordOutput .Select((a,b,c,d,e,f)=>new ReportRecordOutput
{ {
mo_task_code = b.mo_task_code, mo_task_code = b.mo_task_code,
material_name = c.name, material_name = c.name,
workline_name = e.FullName, // workline_name = e.FullName,
workline_name = f.name,
report_type = "合格", report_type = "合格",
qty = a.reported_qty.Value, qty = a.reported_qty.Value,
repoter_name = d.RealName, repoter_name = d.RealName,
@@ -100,12 +102,14 @@ namespace Tnb.ProductionMgr
.LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.id) .LeftJoin<BasMaterial>((a,b,c)=>a.material_id==c.id)
.LeftJoin<UserEntity>((a,b,c,d)=>a.create_id==d.Id) .LeftJoin<UserEntity>((a,b,c,d)=>a.create_id==d.Id)
.LeftJoin<OrganizeEntity>((a,b,c,d,e)=>b.workline_id==e.Id) .LeftJoin<OrganizeEntity>((a,b,c,d,e)=>b.workline_id==e.Id)
.LeftJoin<EqpEquipment>((a,b,c,d,e,f)=>b.eqp_id==f.id)
.Where((a,b,c)=>(b.mo_task_status==DictConst.MoStatusPauseCode || b.mo_task_status==DictConst.InProgressEnCode) && c.category_id.Contains("ZSJ")) .Where((a,b,c)=>(b.mo_task_status==DictConst.MoStatusPauseCode || b.mo_task_status==DictConst.InProgressEnCode) && c.category_id.Contains("ZSJ"))
.Select((a,b,c,d,e)=>new ReportRecordOutput .Select((a,b,c,d,e,f)=>new ReportRecordOutput
{ {
mo_task_code = b.mo_task_code, mo_task_code = b.mo_task_code,
material_name = c.name, material_name = c.name,
workline_name = e.FullName, // workline_name = e.FullName,
workline_name = f.name,
report_type = "不合格", report_type = "不合格",
qty = a.scrap_qty, qty = a.scrap_qty,
repoter_name = d.RealName, repoter_name = d.RealName,

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

@@ -565,7 +565,7 @@ namespace Tnb.ProductionMgr
}else if (item.schedule_type==1) }else if (item.schedule_type==1)
{ {
BasStandardTime basStandardTime = await _db.Queryable<BasStandardTime>().Where(x=>x.process_id==item.process_id && x.enabled==1).FirstAsync(); BasStandardTime basStandardTime = await _db.Queryable<BasStandardTime>().Where(x=>x.process_id==item.process_id && x.enabled==1).FirstAsync();
item.standard_time = basStandardTime.standard_time; item.standard_time = basStandardTime?.standard_time ?? "";
} }
} }
} }