diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
index bc197247..530f4ce1 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
@@ -337,32 +337,28 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         data.barcodeType = "M";
                         // 生產單位_簡碼
                         data.factoryUnit_UnitCode = _context.FactoryUnits.Where(w => w.UnitNo == WipInfo.UnitNO).FirstOrDefault().UnitCode ?? "";
-                        foreach (var item in InhouseDetail)
+                        foreach (var item in InhouseDetail.Select(s => s.SerialNo).Distinct())
                         {
-                            // 用箱號抽驗
-                            if (item.SerialType == "B")
+                            var BarcodeNo = await _context.BarcodeInfoes.Where(w => w.BoxNo == item).ToListAsync();
+                            foreach (var barcode in BarcodeNo)
                             {
-                                var BarcodeNo = await _context.BarcodeInfoes.Where(w => w.BoxNo == item.SerialNo).ToListAsync();
-                                foreach (var barcode in BarcodeNo)
+                                data.unitNo = WipInfo.UnitNO;
+                                data.wipID = barcode.WipID;
+                                data.barcode = barcode.BarcodeNo;
+                                data.barcodeID = barcode.BarcodeID;
+                                data.extNo = barcode.ExtraBarcodeNo;
+                                data.flowRule = WipInfo.FlowRuleID;
+                                data.wipNo = WipInfo.WipNO;
+
+                                var result_CUTableMsg = await CU_Tables(data);
+                                if (string.IsNullOrWhiteSpace(result_CUTableMsg))
                                 {
-                                    data.unitNo = WipInfo.UnitNO;
-                                    data.wipID = barcode.WipID;
-                                    data.barcode = barcode.BarcodeNo;
-                                    data.barcodeID = barcode.BarcodeID;
-                                    data.extNo = barcode.ExtraBarcodeNo;
-                                    data.flowRule = WipInfo.FlowRuleID;
-                                    data.wipNo = WipInfo.WipNO;
-
-                                    var result_CUTableMsg = await CU_Tables(data);
-                                    if (string.IsNullOrWhiteSpace(result_CUTableMsg))
-                                    {
-                                        resultModel.Success = true;
-                                        resultModel.Msg = "FQC過站完成";
-                                    }
-                                    else
-                                    {
-                                        resultModel.Msg = result_CUTableMsg;
-                                    }
+                                    resultModel.Success = true;
+                                    resultModel.Msg = "FQC過站完成";
+                                }
+                                else
+                                {
+                                    resultModel.Msg = result_CUTableMsg;
                                 }
                             }
                         }