|
|
@@ -191,8 +191,8 @@ namespace Business.Quartz
|
|
|
allResults.AddRange(dbSchedules);
|
|
|
foreach (var item in workOrds)
|
|
|
{
|
|
|
- //当前工单的排产计划开始时间:年-月-日
|
|
|
- DateTime planStart = item.OrdDate.GetValueOrDefault().Date;
|
|
|
+ ////当前工单的排产计划开始时间:年-月-日
|
|
|
+ //DateTime planStart = item.OrdDate.GetValueOrDefault().Date;
|
|
|
////当前工单对应的产线数据
|
|
|
//var curLines = prodLines.Where(p => p.Part == item.ItemNum).Select(m=>m.Line).Distinct().ToList();
|
|
|
////当前工单的对应的产线排产记录
|
|
|
@@ -815,8 +815,8 @@ namespace Business.Quartz
|
|
|
public List<WorkOrdRoutingDto> ProcPretreatment(WorkOrdMaster workOrd,List<WorkOrdRouting> woRuntings, List<ProdLineDetail> prodLines, List<ScheduleResultOpMaster> schedules)
|
|
|
{
|
|
|
List<WorkOrdRoutingDto> routingDtos = new List<WorkOrdRoutingDto>();
|
|
|
- //当前工单计划开始时间
|
|
|
- DateTime planStart = workOrd.OrdDate.GetValueOrDefault();
|
|
|
+ //当前工单计划开始时间(默认加两天)
|
|
|
+ DateTime planStart = workOrd.OrdDate.GetValueOrDefault().AddDays(2);
|
|
|
//取主工序(第一层级工序)
|
|
|
var firsts = woRuntings.Where(p =>p.ParentOp == 0).OrderByDescending(p => p.OP).ToList();
|
|
|
if (firsts.Count() == 0)
|