diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs index 633e35b6..b85301aa 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs @@ -57,13 +57,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES // GET: api/BarcodeStation/5 [HttpGet("Key")] public async Task> GetBarcodeStationByKey(int barcodeID, int wipID - , int ruleStationID, string ruleStatus) + , int ruleStationID) { var barcodeStation = await _context.BarcodeStation .Where(w => w.BarcodeID == barcodeID && w.WipID == wipID - && w.RuleStationID == ruleStationID - && w.RuleStatus == ruleStatus).FirstOrDefaultAsync(); + && w.RuleStationID == ruleStationID).FirstOrDefaultAsync(); //if (barcodeStation == null) diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index 605f0071..6fb3fff1 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -887,7 +887,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES { BarcodeStationController barcodeStationController = new BarcodeStationController(_context); var barcodeStation = await barcodeStationController.GetBarcodeStationByKey(barCodeCheckDto.barcodeID, - barCodeCheckDto.wipID, barCodeCheckDto.ruleStationID, barCodeCheckDto.ruleStatus); + barCodeCheckDto.wipID, barCodeCheckDto.ruleStationID); if (barcodeStation.Value == null) { wipStation.FirstCnt += 1; @@ -948,7 +948,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES wipClass = queryWipClass.Value.FirstOrDefault(); BarcodeStationController barcodeStationController = new BarcodeStationController(_context); var barcodeStation = await barcodeStationController.GetBarcodeStationByKey(barCodeCheckDto.barcodeID, - barCodeCheckDto.wipID, barCodeCheckDto.ruleStationID, barCodeCheckDto.ruleStatus); + barCodeCheckDto.wipID, barCodeCheckDto.ruleStationID); if (barcodeStation.Value == null) { wipClass.FirstCnt += 1; @@ -1012,7 +1012,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES wipTime = queryWipTime.Value.FirstOrDefault(); BarcodeStationController barcodeStationController = new BarcodeStationController(_context); var barcodeStation = await barcodeStationController.GetBarcodeStationByKey(barCodeCheckDto.barcodeID, - barCodeCheckDto.wipID, barCodeCheckDto.ruleStationID, barCodeCheckDto.ruleStatus); + barCodeCheckDto.wipID, barCodeCheckDto.ruleStationID); if (barcodeStation.Value == null) { wipTime.FirstCnt += 1;