修正報工作業站別有 "/" 問題

修改標工 修改人員 問題

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

AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs

@@ -856,8 +856,9 @@ namespace AMESCoreStudio.Web
         /// 根據Name獲取指定報工站別基本資料查詢資料
         /// </summary>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/WorkingStations/Name/{id}")]
+        [WebApiClient.Attributes.HttpGet("api/WorkingStations/Name")]
-        ITask<List<WorkingStation>> GetWorkingStationbyName(string id);
+         ITask<List<WorkingStation>> GetWorkingStationbyName(string id);
+
 
         /// <summary>
         /// 根據Name獲取指定報工生產單位基本資料查詢資料

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" />
 

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;

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}")]
+        [HttpGet("Name")]
-        public async Task<ActionResult<IEnumerable<WorkingStation>>> GetWorkingStationbyName(string id)
+        public async Task<ActionResult<IEnumerable<WorkingStation>>> GetWorkingStationbyName([FromQuery] string id)
         {
 
             IQueryable<WorkingStation> q = _context.WorkingStations;