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; } } }