From 64f76b029d9e089744544c571a17cb7f2f0355e1 Mon Sep 17 00:00:00 2001
From: yiru <yiru@aten.com.tw>
Date: Wed, 1 Oct 2025 13:50:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A0=B1=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=A5=AD=E7=AB=99=E5=88=A5=E6=9C=89=20"/"=20=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=A8=99=E5=B7=A5=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=BA=E5=93=A1=20=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/WHSController.cs              |  3 ++-
 AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs      |  5 +++--
 AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml   |  2 +-
 .../AMES/WorkingStandardWorkTimeController.cs | 19 +++++++++++++++++++
 .../AMES/WorkingStationsController.cs         |  4 ++--
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs
index 046e555..996e05a 100644
--- a/AMESCoreStudio.Web/Controllers/WHSController.cs
+++ b/AMESCoreStudio.Web/Controllers/WHSController.cs
@@ -3486,7 +3486,8 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<IActionResult> WHS025UAsync(int id)
         {
             await GetWorkingUnit(""); //報工生產單位
-
+            var tt = Request.Cookies["UserID"];
+            ViewBag.UserID = tt;
             GetSideListByWH025();
           
             var result = await _whsApi.GetWorkingStandardWorkTime(id);
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs
index bb2d93f..84acc38 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs
@@ -856,8 +856,9 @@ namespace AMESCoreStudio.Web
         /// 根據Name獲取指定報工站別基本資料查詢資料
         /// </summary>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/WorkingStations/Name/{id}")]
-        ITask<List<WorkingStation>> GetWorkingStationbyName(string id);
+        [WebApiClient.Attributes.HttpGet("api/WorkingStations/Name")]
+         ITask<List<WorkingStation>> GetWorkingStationbyName(string id);
+
 
         /// <summary>
         /// 根據Name獲取指定報工生產單位基本資料查詢資料
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml
index ab57411..744459b 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS025U.cshtml
@@ -17,7 +17,7 @@
             <input type="hidden" asp-for="WorkingStandardID" />
             <input type="hidden" asp-for="WorkingUnitID" />
             <input type="hidden" asp-for="CreateUserID" />
-            <input type="hidden" asp-for="UpdateUserID" value="0" />
+            <input type="hidden" asp-for="UpdateUserID" value="@ViewBag.UserID" />
             <input type="hidden" asp-for="CreateDate" />
             <input type="hidden" asp-for="UpdateDate" value="@System.DateTime.Now" />
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStandardWorkTimeController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStandardWorkTimeController.cs
index d26ec8b..3ed4049 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStandardWorkTimeController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStandardWorkTimeController.cs
@@ -302,6 +302,25 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 var helper = new Helper(_context);
 
+                // 先檢查是否有重複資料
+                bool exists = await _context.WorkingStandardWorkTimes.AnyAsync(x =>
+                    x.ItemNo == model.ItemNo &&
+                    x.WorkingUnitID == model.WorkingUnitID &&
+                    x.WorkingLineID == model.WorkingLineID &&
+                    x.WorkingStationID == model.WorkingStationID &&
+                    x.Side == model.Side
+                );
+
+                if (exists)
+                {
+                    result.Success = false;
+                    result.Msg = "資料已存在";
+                    return result;
+                }
+
+
+
+
                 //  先取得主 ID
                 model.WorkingStandardID = await helper.GetIDKey("WorkingST_ID");
                 model.CreateDate = DateTime.Now;
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs
index 2e7b754..684e777 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingStationsController.cs
@@ -90,8 +90,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [HttpGet("Name/{id}")]
-        public async Task<ActionResult<IEnumerable<WorkingStation>>> GetWorkingStationbyName(string id)
+        [HttpGet("Name")]
+        public async Task<ActionResult<IEnumerable<WorkingStation>>> GetWorkingStationbyName([FromQuery] string id)
         {
 
             IQueryable<WorkingStation> q = _context.WorkingStations;