|
|
@@ -3638,13 +3638,10 @@ namespace Business.ResourceExamineManagement
|
|
|
List<long> itemIds = pretreatments.Select(p => p.item_id.GetValueOrDefault()).ToList();
|
|
|
icitemlist.AddRange(_ic_item.GetListAsync(p => itemIds.Contains(p.mysql_id) && !p.IsDeleted).Result);
|
|
|
#region 1、数据准备
|
|
|
- //1.1、获取产能检查相关数据
|
|
|
- //产品物料编码
|
|
|
- List<string> itemnums = pretreatments.Where(p => p.level == 1).Select(p => p.item_number).Distinct().ToList();
|
|
|
//产线明细
|
|
|
- prodLines = _prodLineDetail.Select(p => itemnums.Contains(p.Part)).ToList();
|
|
|
+ prodLines = _prodLineDetail.Select(p => p.Domain== param.factoryId.ToString()).ToList();
|
|
|
//标准工序
|
|
|
- routingOps = _routingOpDetail.Select(p => itemnums.Contains(p.RoutingCode)).ToList();
|
|
|
+ routingOps = _routingOpDetail.Select(p => p.Domain == param.factoryId.ToString()).ToList();
|
|
|
List<string> lines = prodLines.Select(p => p.Line).Distinct().ToList();
|
|
|
//工作日历
|
|
|
calendarWorks = _shopCalendarWorkCtr.Select(p => lines.Contains(p.ProdLine)).ToList();
|