From 3125d3383981c70a5cdf0f96bbb480861751f397 Mon Sep 17 00:00:00 2001 From: Sai Date: Thu, 27 Jul 2023 22:31:43 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=A3=9C=E6=AA=94=E6=A1=88=E4=B8=8A?= =?UTF-8?q?=E5=82=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BLL/BarCodeCheckController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index cb134bb..815e59e 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -383,13 +383,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES // 已記錄組件數量 // var BarCodeItems = _context.BarcodeItems.Where(w => w.BarcodeID == barCodeCheckDto.barcodeID); 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 Stations = _context.Stationses.Where(w => w.UnitNo == barCodeCheckDto.unitNo); var BarCodeItemsQty = BarCodeItems.Where(w => Stations.Any(s => s.StationID == w.StationID)).Count(); // WipKp DB 設定綁定組件數量 + 製程判斷 var wipKpQty = _context.WipKps.Where(w => w.WipNo == barCodeCheckDto.wipNo - && w.UnitNo == station.Value.FirstOrDefault().UnitNo + && w.UnitNo == barCodeCheckDto.unitNo ).Count(); if (wipKpQty != inputKPQty + BarCodeItemsQty) @@ -1958,7 +1958,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES #region 確認是否有設定key Parts資料 WipKpsController wipKpsController = new WipKpsController(_context); var wipKps = (await wipKpsController.GetWipKpByWipNo(barcodeItemKPDto.wipNo)).Value.ToList(); - wipKps = wipKps.Where(w => w.UnitNo == barcodeItemKPDto.ststionUnitNo).OrderBy(o => o.KpSeq).ToList(); + wipKps = wipKps.Where(w => w.UnitNo == barcodeItemKPDto.unitNo).OrderBy(o => o.KpSeq).ToList(); if (wipKps.Count != 0) { #region 判斷內部序號是否有過站紀錄 @@ -1974,7 +1974,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES BarcodeItemsController barcodeItemsController = new BarcodeItemsController(_context); var BarCodeItems = (await barcodeItemsController.GetBarcodeItemByBarCodeID(BarCodeID)).Value.ToList(); // BarCodeItems = BarCodeItems.Where(w => w.S.UnitNo == barcodeItemKPDto.ststionUnitNo).ToList(); - BarCodeItems = BarCodeItems.Where(w => w.S.UnitNo == barcodeItemKPDto.ststionUnitNo && w.WipID == wipinfo.Value.FirstOrDefault().WipID).ToList(); + BarCodeItems = BarCodeItems.Where(w => w.S.UnitNo == barcodeItemKPDto.unitNo && w.WipID == wipinfo.Value.FirstOrDefault().WipID).ToList(); #endregion // 計算過站時刷的組件數量與已經存BarCodeItems