From ce6cb08c94bc909d23cfee73f3f8bc98ca5a30ec Mon Sep 17 00:00:00 2001 From: Sai Date: Thu, 6 Jul 2023 09:40:25 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E9=81=8E=E7=AB=99?= =?UTF-8?q?=E6=88=90=E5=8A=9F=20=E5=B7=A5=E5=96=AE=E6=8A=95=E5=85=A5?= =?UTF-8?q?=E6=95=B8=E7=B4=AF=E5=8A=A0=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BLL/BarCodeCheckController.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index 76d3098..c07b458 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -360,7 +360,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return resultModel; } - // 將InputItem清空 barCodeCheckDto.inputItems = new List(); } @@ -381,7 +380,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES var BarCodeItems = _context.BarcodeItems.Where(w => w.BarcodeID == barCodeCheckDto.barcodeID && w.WipID == barCodeCheckDto.wipID); var Stations = _context.Stationses.Where(w => w.UnitNo == station.Value.FirstOrDefault().UnitNo); - var BarCodeItemsQty = BarCodeItems.Where(w => Stations.Any(s => s.StationID == w.StationID)).Count(); // WipKp DB 設定綁定組件數量 + 製程判斷 @@ -664,7 +662,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { BarcodeStationController barcodeStationController = new BarcodeStationController(_context); var CheckBarcodeStation = barcodeStationController.GetBarcodeStationByBarCodeID(barCodeCheckDto.barcodeID); - if (CheckBarcodeStation.Result.Value.Where(w => w.RuleStatus == "P").Count() == 1) + if (CheckBarcodeStation.Result.Value.Where(w => w.RuleStatus == "P" && w.WipID == barCodeCheckDto.wipID + && w.StationID == barCodeCheckDto.stationID).Count() == 1) { if (CheckNowFirstStation(barCodeCheckDto.wipNo, barCodeCheckDto.unitNo, barCodeCheckDto.stationID) == "Y") {