From fabdda26eadedae408eaf66dcd5f49144077070e Mon Sep 17 00:00:00 2001 From: Marvin Date: Thu, 6 Oct 2022 20:50:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=9C=A8=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=88=86=E5=B8=83=E5=9B=BE=201.1.=E4=BF=AE=E6=94=B9FQC?= =?UTF-8?q?=E7=9A=84=E8=BF=87=E7=AB=99=E8=B5=84=E6=96=99=E7=BA=BF=E5=88=AB?= =?UTF-8?q?=E8=B5=84=E6=96=99=E7=94=A8join,=E5=9B=A0=E4=B8=BAFQC=E7=BA=BF?= =?UTF-8?q?=E5=88=AB=E7=BC=96=E5=8F=B7-1=201.2.=E4=BF=AE=E6=AD=A3=E7=AB=99?= =?UTF-8?q?=E5=88=AB>>=E6=8E=92=E7=89=88=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/QRSController.cs | 2 +- .../Controllers/AMES/BarcodeStationController.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index 277b1ee9..66ab600d 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -121,7 +121,7 @@ namespace AMESCoreStudio.Web.Controllers rate = 100; } - if (j == rule_sation.Count - 2) + if (j == rule_sation.Count - 1) { if (rate <= 90) { diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs index 03fdb1ec..3e1b2b17 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs @@ -110,7 +110,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES ResultModel result = new ResultModel(); var q = from q1 in _context.BarcodeStation join q2 in _context.BarcodeInfoes on q1.BarcodeID equals q2.BarcodeID - join q3 in _context.LineInfoes on q1.LineId equals q3.LineID + join q3 in _context.LineInfoes on q1.LineId equals q3.LineID into line_data + from x in line_data.DefaultIfEmpty() join q4 in _context.UserInfoes on q1.CreateUserID equals q4.UserID select new { @@ -118,7 +119,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES q1.WipID, q1.StationID, q2.BarcodeNo, - q3.LineDesc, + x.LineDesc, q1.RuleStatus, q1.Systype, q1.InputDate,