diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 26c67426..c8ee9a33 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1865,6 +1865,9 @@ namespace AMESCoreStudio.Web.Controllers
             model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
 
             IResultModel result;
+            // 登入UserID
+            var UserID = GetLogInUserID();
+
             // Checkbox轉換
             model.wipInfo.ECNCheck = model.wipInfo.ECNCheck == "on" ? "Y" : "N";
             model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "on" ? "Y" : "N";
@@ -1940,6 +1943,7 @@ namespace AMESCoreStudio.Web.Controllers
                 }
             }
 
+           
             result = await _pcsApi.PutWipInfo(JsonConvert.SerializeObject(model.wipInfo));
             if (result.Success)
             {
@@ -2426,7 +2430,7 @@ namespace AMESCoreStudio.Web.Controllers
             return Json(new Result() { success = true, msg = "" });
         }
         #endregion
-         
+
         #region PCS005 工單資料查詢
         public async Task<IActionResult> PCS005()
         {
@@ -3645,7 +3649,8 @@ namespace AMESCoreStudio.Web.Controllers
                         line = model.LineID,
                         unitNo = model.UnitNO,
                         inputItems = keyParts,
-                        outfits = outfit
+                        outfits = outfit,
+                        userID = GetLogInUserID()
                     };
 
                     var barcode_result = await _pcsApi.PassIngByCheck(JsonConvert.SerializeObject(x));
@@ -4509,6 +4514,10 @@ namespace AMESCoreStudio.Web.Controllers
             return View(model);
         }
 
+        /// <summary>
+        /// 登入UserID
+        /// </summary>
+        /// <returns></returns>
         public int GetLogInUserID()
         {
             int user_id = 0;
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 5fdc2237..605f0071 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -580,6 +580,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     StatusID = 1,
                     SysType = "S",
                     StatusNo = StatusNo,
+                    CreateUserID = barCodeCheckDto.userID
                 };
                 return await barcodeInfoesController.PostBarcodeInfoes(barcodeInfo);
             }
@@ -615,7 +616,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 RuleStationID = barCodeCheckDto.ruleStationID,
                 RuleStatus = barCodeCheckDto.ruleStatus, //F 不良 
                 InputDate = DateTime.Now,
-                LineId = barCodeCheckDto.line
+                LineId = barCodeCheckDto.line,
+                CreateUserID = barCodeCheckDto.userID
             };
             return await barcodeStationController.PostBarcodeStation(barcodeStation);
         }
@@ -641,7 +643,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     ItemNo = KeyPartsItem[i].inputType,
                     PartNo = KeyPartsItem[i].inputData,
                     SysType = "S",
-                    CreateUserID = 0,
+                    CreateUserID = barCodeCheckDto.userID,
                     CreateDate = DateTime.Now,
                     UpdateDate = DateTime.Now
                 };
@@ -672,9 +674,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     WipNo = barCodeCheckDto.wipNo,
                     OutfitNo = item.inputData,
                     StationID = barCodeCheckDto.station,
-                    CreateUserID = 0,
+                    CreateUserID = barCodeCheckDto.userID,
                     CreateDate = DateTime.Now,
-                    UpdateUserID = 0,
+                    UpdateUserID = barCodeCheckDto.userID,
                     UpdateDate = DateTime.Now
                 };
                 result = await barcodeOutfitController.PostBarcodeOutfit(barcodeOutfit);
@@ -752,6 +754,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         item.FinishTime = DateTime.Now;
                         item.OutUserID = 1;
                         item.UpdateDate = DateTime.Now;
+                        item.UpdateUserID = model.userID;
                         result = await burnInfoeController.PutBurnInfo(item);
                     }
                 }
@@ -766,7 +769,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         StartTime = DateTime.Now,
                         ScheduleFinishTime = DateTime.Now.AddMinutes((double)PlanHour),
                         InUserID = 0,
-                        Status = 0
+                        Status = 0,
+                        CreateUserID = model.userID,
+                        UpdateUserID = model.userID
                     };
                     result = await burnInfoeController.PostBurnInfo(burnInfo);
                 }
@@ -800,7 +805,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     ProgramNo = "N/A",
                     MachineNo = "N/A",
                     StationId = barCodeCheckDto.station,
-                    WipId = barCodeCheckDto.wipID
+                    WipId = barCodeCheckDto.wipID,
+                    CreateUserID = barCodeCheckDto.userID,
+                    UpdateUserID = barCodeCheckDto.userID
                 };
                 result = await ngInfoController.PostNgInfo(ngInfo);
 
@@ -814,6 +821,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         NgID = result.Data.FirstOrDefault().NgID,
                         LocationNo = NGNo.oldInputData ?? "N/A",
                         NgNo = NGNo.inputData,
+                        CreateUserID = barCodeCheckDto.userID,
+                        UpdateUserID = barCodeCheckDto.userID
                     };
                     result_NgComponent = await ngComponentsController.PostNgComponent(ngComponent);
 
@@ -847,7 +856,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 barcodeWip = new BarcodeWip
                 {
                     BarcodeID = barCodeCheckDto.barcodeID,
-                    WipID = barCodeCheckDto.wipID
+                    WipID = barCodeCheckDto.wipID,
+                    CreateUserID = barCodeCheckDto.userID
                 };
 
                 return await barcodeWipController.PostBarcodeWip(barcodeWip);
@@ -893,7 +903,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     RuleStatus = barCodeCheckDto.ruleStatus,
                     RuleStationID = barCodeCheckDto.ruleStationID,
                     FirstCnt = 1,
-                    PassCnt = 1
+                    PassCnt = 1,
+                    CreateUserID = barCodeCheckDto.userID
                 };
                 resut = await wipStationController.PostWipStation(wipStation);
             }
@@ -954,7 +965,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     RuleStationID = barCodeCheckDto.ruleStationID,
                     ClassID = ClassID,
                     FirstCnt = 1,
-                    PassCnt = 1
+                    PassCnt = 1,
+                    CreateUserID = barCodeCheckDto.userID
                 };
                 resut = await wipClassController.PostWipClass(wipClass);
             }
@@ -1017,7 +1029,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     RuleStationID = barCodeCheckDto.ruleStationID,
                     SegmentID = SegmentID,
                     FirstCnt = 1,
-                    PassCnt = 1
+                    PassCnt = 1,
+                    CreateUserID = barCodeCheckDto.userID
                 };
                 resut = await wipTimeController.PostWipTime(wipTime);
             }
diff --git a/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs b/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs
index 5d994238..eb2a3fd7 100644
--- a/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs
@@ -102,6 +102,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         public string extNo { get; set; } = string.Empty;
 
+        /// <summary>
+        /// UserID
+        /// </summary>
+        [DataMember]
+        public int userID { get; set; } = 0;
+
 
         /// <summary>
         /// 紀錄組件或不良代碼