diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
index ec0cae61..8493e95d 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
@@ -146,8 +146,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                             wipId = data.wipID,
                             barCode = data.barcodeID,
                             barCodeNo = data.barcode,
-                            unitNo = data.unitNo,
-                            ststionUnitNo = data.unitNo,
+                            unitNo = data.ststions_UnitNo,
+                            ststionUnitNo = data.ststions_UnitNo,
                             inputKP = data.inputItems.Where(w => !w.inputType.ToUpper().StartsWith("NG")).ToList()
                         };
 
@@ -224,12 +224,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
                     // 已記錄組件數量
                     var BarCodeItems = _context.BarcodeItems.Where(w => w.BarcodeID == data.barcodeID && w.WipID == data.wipID);
-                    var Stations = _context.Stationses.Where(w => w.UnitNo == data.unitNo);
+                    var Stations = _context.Stationses.Where(w => w.UnitNo == data.ststions_UnitNo);
                     var BarCodeItemsQty = BarCodeItems.Where(w => Stations.Any(s => s.StationID == w.StationID)).Count();
 
                     // WipKp DB 設定綁定組件數量 + 製程判斷
                     var wipKpQty = _context.WipKps.Where(w => w.WipNo == data.wipNo
-                                                           && w.UnitNo == data.unitNo
+                                                           && w.UnitNo == data.ststions_UnitNo
                                                            ).Count();
 
                     if (wipKpQty != inputKPQty + BarCodeItemsQty)
@@ -1750,18 +1750,16 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         private async Task<ResultModel<WipKp>> CheckBarCodeKeyPartsData([FromQuery] BarcodeItemKPDto data)
         {
             ResultModel<WipKp> resultModel = new ResultModel<WipKp> { Success = false };
-            // 更新WipKp字元長度
-            var UpdateWipKpLength = new List<WipKp>();
             try
             {
                 // 抓 工單key Parts資料
-                var wipKps = _context.WipKps.Where(w => w.WipNo == data.wipNo && w.UnitNo == data.unitNo)
+                var wipKps = _context.WipKps.Where(w => w.WipNo == data.wipNo && w.UnitNo == data.ststionUnitNo)
                                              .OrderBy(o => o.KpSeq).ToList();
                 if (wipKps.Count != 0)
                 {
                     // 取料號組件資料
                     var BarCodeItems = _context.BarcodeItems.Where(w => w.BarcodeID == data.barCode &&
-                                                                              w.S.UnitNo == data.unitNo &&
+                                                                              w.S.UnitNo == data.ststionUnitNo &&
                                                                               w.WipID == data.wipId).ToList();
 
                     // 當前組件數量+已存料號組件數量 > 工單綁定組件數量
@@ -1776,9 +1774,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                     var CheckMsg = string.Empty;
                     int x = BarCodeItems.Count;
 
-                    // 紀錄刷入KP不可重複序號，後續判斷刷入KP有重複
-                    var CheckInputKp = new List<BarCodeCheckDto.inputItem>();
-
                     for (int i = 0; i < data.inputKP.Count; i++)
                     {
                         // 按照順序
@@ -1805,23 +1800,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         return resultModel;
                     }
 
-                    // 刷入KP有重複
-                    var RepeatKp = CheckInputKp
-                        .GroupBy(g => g.inputData)
-                        .Where(group => group.Count() > 1)
-                        .Select(group => group.Key);
-
-                    if (RepeatKp.Count() != 0)
-                    {
-                        resultModel.Msg = $"刷入組件序號有重複【{string.Join('，', RepeatKp)}】</br>";
-                        return resultModel;
-                    }
-
                     #endregion
                 }
 
                 // 確認沒問題後
-                resultModel.Data = UpdateWipKpLength;
                 resultModel.Success = true;
                 return resultModel;
             }
@@ -2220,6 +2202,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 result.stations_TestType = Station.TestType;
                 result.stations_TypeNo = Station.TypeNo;
+                result.ststions_UnitNo = Station.UnitNo;
             }
 
             // 生產單位_簡碼
diff --git a/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs b/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs
index b95cbc29..83cf8da9 100644
--- a/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs
+++ b/AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs
@@ -178,6 +178,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         public bool burnIn { get; set; } = false;
 
+        /// <summary>
+        /// 工作站_製程
+        /// </summary>
+        [DataMember]
+        public string ststions_UnitNo { get; set; } = string.Empty;
+
         /// <summary>
         /// 工作站_測試類別
         /// </summary>
@@ -195,5 +201,7 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         [DataMember]
         public string factoryUnit_UnitCode { get; set; } = string.Empty;
+
+    
     }
 }