Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

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

@@ -4765,6 +4765,11 @@ namespace Business.ResourceExamineManagement
             foreach (var item in curQtyDtls)
             {
                 DateTime endPoint = Convert.ToDateTime(date + " " + item.RestTimePoint);
+                //休息时间段开始时间不在工作时间内，不考虑
+                if (endPoint < dayStartPoint || endPoint > dayEndPoint)
+                {
+                    continue;
+                }
                 dto.EndPoint = endPoint;
                 span = dto.EndPoint - dto.StartPoint;
                 dto.WorkMinutes = (decimal)span.TotalMinutes;
@@ -4784,6 +4789,11 @@ namespace Business.ResourceExamineManagement
             var curOccupyTimes = resourceOccupancyTimes.Where(p => p.Resource == prodLine && p.StartTime.GetValueOrDefault().Date == startTime.Date).OrderBy(p=>p.StartTime).ToList();
             foreach (var item in curOccupyTimes)
             {
+                //如果加班开始时间在工作时间内，则不考虑
+                if (item.StartTime.GetValueOrDefault() < dayEndPoint)
+                {
+                    continue;
+                }
                 level++;
                 dto = new LineWorkPointDto();
                 dto.Level = level;