From 2e71194b56261ca9f60c0763d0ecc838065e7d7f Mon Sep 17 00:00:00 2001 From: Ray Date: Wed, 27 Apr 2022 14:19:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E9=81=8E=E7=AB=99Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BLL/BarCodeCheckController.cs | 4 ++-- AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs index 880dcd45..e74d58d9 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs @@ -1725,8 +1725,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES // 判斷是否符合區間 if (barcodeItemKPDto.inputKP[i].Length == 12) { - if (!(Convert.ToInt32(wipMAC.Value.StartNO, 16) <= Convert.ToInt32(barcodeItemKPDto.inputKP[i].Substring(7, 6), 16) - && Convert.ToInt32(barcodeItemKPDto.inputKP[i].Substring(7, 6), 16) <= Convert.ToInt32(wipMAC.Value.EndNO, 16))) + if (!(Convert.ToInt32(wipMAC.Value.StartNO, 16) <= Convert.ToInt32(barcodeItemKPDto.inputKP[i].Substring(6, 6), 16) + && Convert.ToInt32(barcodeItemKPDto.inputKP[i].Substring(6, 6), 16) <= Convert.ToInt32(wipMAC.Value.EndNO, 16))) { CheckMsg += "組件序號【" + barcodeItemKPDto.inputKP[i] + "】 與工單設定MAC區間不符合
"; } diff --git a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs index 37b57185..239c40c9 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs @@ -125,6 +125,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// 建立者姓名 /// [DataMember] + [NotMapped] public virtual string UserName { get; set; } } }