日计划调整

MicroServices/Business/Business.Application/ResourceExamineManagement/ProductionScheduleAppService.cs

@@ -623,43 +623,6 @@ namespace Business.ResourceExamineManagement
                         var ins2 = scheduleMasters.Where(p => wscWorkords.Contains(p.WorkOrd) && p.WorkDate >= scheTime.Date).ToList();
                         _scheduleResultOpMaster.Insert(scheduleMasters.Where(p => wscWorkords.Contains(p.WorkOrd) && p.WorkDate >= scheTime.Date).ToList());
                     }
-
-                    ////获取计划日期在当前日期之前且报工数量为0的日计划
-                    //List<PeriodSequenceDet> oldSequenceDets = _periodSequenceDet.Select(p => p.Domain == domain && p.PlanDate < scheTime.Date && p.CompQty == 0).ToList();
-                    //List<ScheduleResultOpMaster> oldSchedules = new List<ScheduleResultOpMaster>();
-                    //if (oldSequenceDets.Any())
-                    //{
-                    //    var oldWorkords = oldSequenceDets.Select(p => p.WorkOrds).ToList();
-                    //    var oldDate = oldSequenceDets.Select(p => p.PlanDate).ToList();
-                    //    var oldOps = oldSequenceDets.Select(p => p.Op).ToList();
-
-                    //    //更新计划日期为当前日期
-                    //    foreach (var oldItem in oldSequenceDets)
-                    //    {
-                    //        var curSche = _scheduleResultOpMaster.Select(p => p.Domain == domain && p.WorkOrd == oldItem.WorkOrds && p.WorkDate == oldItem.PlanDate && p.Op == oldItem.Op).FirstOrDefault();
-                    //        if (curSche != null)
-                    //        {
-                    //            oldSchedules.Add(curSche);
-                    //        }
-                    //        oldItem.PlanDate = scheTime.Date;
-                    //    }
-                    //    string strScheTime = scheTime.Date.ToString("yyyy-MM-dd");
-                    //    foreach (var oldItem in oldSchedules)
-                    //    {
-                    //        oldItem.WorkDate = scheTime.Date;
-                    //        oldItem.WorkStartTime = Convert.ToDateTime(oldItem.WorkStartTime.ToString("yyyy-MM-dd HH:mm:ss").Replace(oldItem.WorkStartTime.ToString("yyyy-MM-dd"), strScheTime));
-                    //        oldItem.WorkEndTime = Convert.ToDateTime(oldItem.WorkEndTime.ToString("yyyy-MM-dd HH:mm:ss").Replace(oldItem.WorkEndTime.ToString("yyyy-MM-dd"), strScheTime));
-                    //    }
-                    //}
-                    ////更新过期日计划的计划开工日期
-                    //if (oldSequenceDets.Any())
-                    //{
-                    //    _periodSequenceDet.Update(oldSequenceDets);
-                    //}
-                    //if (oldSchedules.Any())
-                    //{
-                    //    _scheduleResultOpMaster.Update(oldSchedules);
-                    //}
                     scope.Complete();
                 }
                 catch (Exception ex)
@@ -3980,7 +3943,7 @@ namespace Business.ResourceExamineManagement
                 //工单生产时长(分钟)
                 decimal sumTimes = item.LbrVar;
                 //工单的排产开始时间
-                DateTime workStartTime = item.OrdDate;
+                DateTime workStartTime = scheTime;
                 //当前产线的工作日历
                 var mLCalendars = calendars.Where(p => p.ProdLine == item.ProdLine || string.IsNullOrEmpty(p.ProdLine)).ToList();
                 //当前产线的休息时间设置