From 8e773ae28e9e4766871cbd4012d536c405c1c424 Mon Sep 17 00:00:00 2001 From: Marvin Date: Thu, 20 Apr 2023 01:43:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=9B=B4=E9=80=9A=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/QRSController.cs | 2 +- AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs index e23812e0..b38e9dcf 100644 --- a/AMESCoreStudio.Web/Controllers/QRSController.cs +++ b/AMESCoreStudio.Web/Controllers/QRSController.cs @@ -1154,7 +1154,7 @@ namespace AMESCoreStudio.Web.Controllers [HttpPost] - public async Task GetYieldData4QRS014SAsync(string id) + public async Task GetYieldData4QRS014BSAsync(string id) { string[] param = id.Split('_'); diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs index 46aa1c8e..949ca28a 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs @@ -1564,7 +1564,8 @@ FROM [SFIS].[dbo].[ZPDKeyPart] B WHERE B.[IsActive] = 1 AND B.[ProductSN] = (S { q = q.Where(w => w.WipNO == wipNO); } - if (dateType == "WipDate") + + if (dateType == "WipDate" || dateType == null) { if (dateStart != null && dateStart != "" && dateEnd != null && dateEnd != "") {