diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs index 9997ec34..6a8b8d20 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -2023,18 +2023,22 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL TimeSpan ts = end.Subtract(str); var WorkTime = (double)Math.Abs(Math.Round(ts.TotalMinutes, 2)); - // 中午休息時間 - if (str < Convert.ToDateTime("12:20:00") && Convert.ToDateTime("12:40:00") < end) + // 中午休息時間 12:00 ~ 13:00 + if (str < Convert.ToDateTime("12:10:00") && Convert.ToDateTime("12:20:00") < end) WorkTime -= 60; - // 早上休息時間 - if (str < Convert.ToDateTime("09:52:00") && Convert.ToDateTime("09:53:00") < end) + // 早上休息時間 10:00 ~ 10:10 + if (str < Convert.ToDateTime("10:02:00") && Convert.ToDateTime("10:04:00") < end) WorkTime -= 10; - // 下午休息時間 - if (str < Convert.ToDateTime("14:52:00") && Convert.ToDateTime("14:53:00") < end) + // 下午休息時間 15:00 ~ 15:10 + if (str < Convert.ToDateTime("15:02:00") && Convert.ToDateTime("15:04:00") < end) WorkTime -= 10; + // 加班休息時間 17:15 ~ 17:45 + if (str < Convert.ToDateTime("17:20:00") && Convert.ToDateTime("17:30:00") < end) + WorkTime -= 30; + // 計算效率 var standardWorkTimes = await _context.StandardWorkTimes.Where(w => w.UnitNo == result.unitNo && w.ItemNo == result.product).FirstOrDefaultAsync();