From 8ee46c39b1eb1e1a46dbd32b62b70808b65e4a0c Mon Sep 17 00:00:00 2001 From: Yiru Date: Wed, 23 Aug 2023 14:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E8=B2=A8=E5=BA=8F?= =?UTF-8?q?=E8=99=9F=E9=87=8D=E5=8F=96=E5=88=A4=E6=96=B7=E5=AE=8C=E5=B7=A5?= =?UTF-8?q?=E9=82=8F=E8=BC=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/PCSController.cs | 2 +- .../Controllers/AMES/WipBarcodeOthersController.cs | 3 ++- AMESCoreStudio.WebApi/DTO/AMES/WipBarcodeOtherDto.cs | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs index 066001b0..7b9cdeb0 100644 --- a/AMESCoreStudio.Web/Controllers/PCSController.cs +++ b/AMESCoreStudio.Web/Controllers/PCSController.cs @@ -9085,7 +9085,7 @@ namespace AMESCoreStudio.Web.Controllers { var SerialRule = await _pcsApi.GetSerialRuleDetail(SerialRuleDetailID); var result = await _pcsApi.GetWipBarcodeOtherByItemNo(WipNo: wipNo, ItemNo: SerialRule.Select(s=>s.ItemNo).FirstOrDefault()); - result.Data = result.Data.Where(w => w.PlanQTY != w.CompleteQTY); + result.Data = result.Data.Where(w => w.Wip_Status_NO != "E"); //判斷工單已開線 foreach (var item in result.Data) { diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs index 0676b24f..1c552c20 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeOthersController.cs @@ -143,7 +143,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES Rule = D.Rule, ItemRule = D.ItemNo, WipScheduleDate = W.WipScheduleDate, - SerialRuleDetailID = O.SerialRuleDetailID + SerialRuleDetailID = O.SerialRuleDetailID, + Wip_Status_NO = W.StatusNO }; diff --git a/AMESCoreStudio.WebApi/DTO/AMES/WipBarcodeOtherDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/WipBarcodeOtherDto.cs index 536a025f..9c9474b3 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/WipBarcodeOtherDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/WipBarcodeOtherDto.cs @@ -88,6 +88,10 @@ namespace AMESCoreStudio.WebApi.Models.AMES public string FactoryNo { get; set; } public int? SerialRuleDetailID { get; set; } + /// + /// WipInfo Status_NO + /// + public string Wip_Status_NO { get; set; } } }