From 99b3bd88af5abd7335fd6d6549ec0ffabe1afdb7 Mon Sep 17 00:00:00 2001
From: Sai <Sai@hotmail.com>
Date: Mon, 4 Sep 2023 23:51:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E9=81=8E=E7=AB=99=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E6=A2=9D=E7=A2=BC=E5=8D=80=E9=96=93=E5=88=A4=E6=96=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BLL/BarCodeCheckController.cs       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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<string>)await GetCheckBarCodeStation(wipno: barCodeCheckDto.wipNo, barcode: barCodeCheckDto.barcode);
                 if (!resultModel.Success)
@@ -1371,7 +1380,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="barcode">內部序號</param>
         /// <param name="wipNo">工單號碼</param>
         [HttpGet("CheckBarCodeByWipNo")]
-        public IResultModel CheckBarCodeByWipNo(string barcode, string wipNo)
+        public async Task<ResultModel<string>> CheckBarCodeByWipNo(string barcode, string wipNo)
         {
             ResultModel<string> resultModel = new ResultModel<string> { Success = false };
             if (barcode.Length <= 4)
@@ -1381,7 +1390,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             }
 
             // 內部序號扣除流水號 查詢
-            IQueryable<WipBarcode> 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 + "】 綁定條碼區間";