diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index def62b9d..ff3ce5f7 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -149,6 +149,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return resultModel; #endregion + + #region 判斷序號區間 + + resultModel = await CheckBarCodeByWipNo(wipNo: barCodeCheckDto.wipNo, barcode: barCodeCheckDto.barcode); + if (!resultModel.Success) + return resultModel; + + #endregion + #region 判斷序號狀態 resultModel = (ResultModel)await GetCheckBarCodeStation(wipno: barCodeCheckDto.wipNo, barcode: barCodeCheckDto.barcode); if (!resultModel.Success) @@ -1371,7 +1380,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES /// 內部序號 /// 工單號碼 [HttpGet("CheckBarCodeByWipNo")] - public IResultModel CheckBarCodeByWipNo(string barcode, string wipNo) + public async Task> CheckBarCodeByWipNo(string barcode, string wipNo) { ResultModel resultModel = new ResultModel { Success = false }; if (barcode.Length <= 4) @@ -1381,7 +1390,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES } // 內部序號扣除流水號 查詢 - IQueryable q = _context.WipBarcodes.Where(w => w.WipNO == wipNo); + var q = await _context.WipBarcodes.Where(w => w.WipNO == wipNo).ToListAsync(); if (!q.Any()) { resultModel.Msg = "找不到工單號碼【" + wipNo + "】 綁定條碼區間";