From a37f12ec535976f8d38bc58a77cd12cab3988a2f Mon Sep 17 00:00:00 2001 From: Marvin Date: Mon, 20 Feb 2023 14:55:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E9=94=81?= =?UTF-8?q?=E5=AE=9APostWipLockByItemNo=EF=BC=8C=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E7=8A=B6=E6=80=81E&C=E7=9A=84=E6=89=80=E6=9C=89=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=202.=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95KeyParts?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=A4=E6=96=AD?= =?UTF-8?q?MB=E5=BC=80=E5=A4=B4=E4=B8=94=E9=9D=9EMB=5FMAC=E5=BC=80?= =?UTF-8?q?=E5=A4=B4=E6=89=8D=E5=8E=BB=E6=98=B6=E4=BA=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8A=93MAC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs | 2 +- AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index f9785462..18fc7fdc 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -476,7 +476,7 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no); try { - if (kp_no == "MB") + if (kp_no.StartsWith("MB") && !kp_no.StartsWith("MB_MAC")) { ESUNContext _esun_context = new ESUNContext(); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs index b11a7a0f..548ac3a4 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipLockController.cs @@ -199,7 +199,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES a.StatusNO, b.ItemNO }; - q = q.Where(w => w.StatusNO.Equals("A")); + q = q.Where(w => !w.StatusNO.Equals("E")&& !w.StatusNO.Equals("C")); if (itemNo != null) {