From 0a6d98a1f29bf4a719cace8b5fe63203a473e00f Mon Sep 17 00:00:00 2001
From: Sai <Sai@Sai.com.tw>
Date: Tue, 20 Feb 2024 10:45:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E8=AA=BF=E6=95=B4=E7=9C=8B=E6=9D=BF?=
 =?UTF-8?q?=E4=BC=91=E6=81=AF=E6=99=82=E9=96=93=20=E6=97=A9=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=91=E6=81=AF=E6=99=82=E9=96=93=2010:00=20~=2010:10?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E5=8D=88=E4=BC=91=E6=81=AF=E6=99=82=E9=96=93?=
 =?UTF-8?q?=2015:00=20~=2015:10=EF=BC=8C=E5=8A=A0=E7=8F=AD=E4=BC=91?=
 =?UTF-8?q?=E6=81=AF=E6=99=82=E9=96=93=2017:15=20~=2017:45?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BLL/RPTController.cs             | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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();