diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
index 5e1dbeaf..9f11ca44 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
@@ -176,26 +176,29 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     burnIn = true;
                 #endregion
 
-                #region KeyParts 判斷
                 StationsesController stationsesController = new StationsesController(_context);
                 var station = await stationsesController.GetStations(barCodeCheckDto.stationID);
-                if (barCodeCheckDto.inputItems.Where(w => !w.inputType.Contains("NG")).Any())
-                {
 
-                    var barcodeItemKPDto = new BarcodeItemKPDto
+                #region KeyParts 判斷
+                // 不是維修跑KeyParts判斷
+                if (barCodeCheckDto.barcodeType != "S")
+                {
+                    if (barCodeCheckDto.inputItems.Where(w => !w.inputType.Contains("NG")).Any())
                     {
-                        WipNo = barCodeCheckDto.wipNo,
-                        barcode = barCodeCheckDto.barcode,
-                        unitNo = barCodeCheckDto.unitNo,
-                        ststionUnitNo = station.Value.Where(w => w.StationID == barCodeCheckDto.stationID).FirstOrDefault().UnitNo,
-                        inputKP = barCodeCheckDto.inputItems.Where(w => !w.inputType.Contains("NG")).ToList()
-                    };
 
-                    var resultKeyParts = await CheckBarCodeKPAsync(barcodeItemKPDto);
-                    if (!resultKeyParts.Success)
-                        return (ResultModel<string>)resultKeyParts;
-                    //else
-                    //    barCodeCheckDto.extNo = resultKeyParts.Msg;
+                        var barcodeItemKPDto = new BarcodeItemKPDto
+                        {
+                            WipNo = barCodeCheckDto.wipNo,
+                            barcode = barCodeCheckDto.barcode,
+                            unitNo = barCodeCheckDto.unitNo,
+                            ststionUnitNo = station.Value.Where(w => w.StationID == barCodeCheckDto.stationID).FirstOrDefault().UnitNo,
+                            inputKP = barCodeCheckDto.inputItems.Where(w => !w.inputType.Contains("NG")).ToList()
+                        };
+
+                        var resultKeyParts = await CheckBarCodeKPAsync(barcodeItemKPDto);
+                        if (!resultKeyParts.Success)
+                            return (ResultModel<string>)resultKeyParts;
+                    }
                 }
                 #endregion
 
@@ -342,13 +345,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                 ItemNo = barCodeItem.ItemNo,
                                 PartNoOld = KPs.oldInputData,
                                 ChangeType = "RP",
-                                KpItemNo = KPs.inputData
+                                KpItemNo = KPs.inputData,
+                                CreateUserID = barCodeCheckDto.userID
                             });
                         }
                     }
 
                     if (!string.IsNullOrWhiteSpace(resultModel.Msg))
                         return resultModel;
+
+                    // 將InputItem清空
+                    barCodeCheckDto.inputItems = new List<BarCodeCheckDto.inputItem>();
                 }
 
                 //var NextStopCloseStation = await CheckNextStopCloseStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.station);
@@ -1879,8 +1886,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         if (!string.IsNullOrWhiteSpace(barcodeKPDtoItem.inputType))
                         {
                             wipKpsItem = wipKps.Where(w => w.KpNo == barcodeKPDtoItem.inputType).FirstOrDefault();
-                        }
 
+                            if (wipKpsItem != null)
+                            {
+                                wipKpsItem = wipKps[x + i];
+                            }
+                        }
 
                         #region 比對序號長度是否正確
                         if (!string.IsNullOrWhiteSpace(wipKpsItem.Length.ToString()))
diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs
index e205d5ef..45b7fd72 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeItemChang.cs
@@ -83,7 +83,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [DataMember]
         [Required(ErrorMessage = "{0},不能空白")]
         [Display(Name = "建立者")]
-        public int CreateUserID { get; set; } 
+        public int CreateUserID { get; set; }
 
         /// <summary>
         /// 建立時間
@@ -91,7 +91,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("CREATE_DATE")]
         [DataMember]
         [Display(Name = "建立時間")]
-        public DateTime CreateDate { get; set; } 
+        public DateTime CreateDate { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 修改時間
@@ -99,7 +99,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("UPDATE_DATE")]
         [DataMember]
         [Display(Name = "修改時間")]
-        public DateTime UpdateDate { get; set; } 
+        public DateTime UpdateDate { get; set; } = DateTime.Now;
 
     }
 }