|
|
@@ -903,7 +903,8 @@ namespace Business.ResourceExamineManagement
|
|
|
List<WorkOrdRoutingDto> routingDtos = new List<WorkOrdRoutingDto>();
|
|
|
//当前工单计划开始时间(默认加两天)
|
|
|
DateTime planStart = workOrd.OrdDate.GetValueOrDefault().AddDays(2);
|
|
|
-
|
|
|
+ //数据对比LIST
|
|
|
+ List<WorkOrdRoutingDto> routingDtos1 = new List<WorkOrdRoutingDto>();
|
|
|
var firsts = woRuntings.Where(x => x.WorkOrd == workOrd.WorkOrd && x.MilestoneOp).ToList();
|
|
|
if (firsts.Count == 0)
|
|
|
{
|
|
|
@@ -927,8 +928,12 @@ namespace Business.ResourceExamineManagement
|
|
|
routingDtos.Add(dto);
|
|
|
}
|
|
|
}
|
|
|
+ var opData = routingDtos.GroupBy(x => x.Op).ToList();
|
|
|
//多生产线优先级处理
|
|
|
- //var
|
|
|
+ //foreach (var item in opData)
|
|
|
+ //{
|
|
|
+ // var routingDataList = routingDtos.Where(x=>x.Op== item.Key).ToList();
|
|
|
+ //}
|
|
|
//var Lines = routingDtos.GroupBy(x => x.Line);
|
|
|
//递归处理其他层级工序
|
|
|
//RecursionProc(woRuntings, firsts, 1, routingDtos, prodLines);
|