From d7ac8c36a700ef83e59df6ac7594f1fb74a03154 Mon Sep 17 00:00:00 2001 From: wenjy Date: Mon, 13 Mar 2023 20:38:33 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=86=B7=E5=8E=8B=E4=B8=8B?= =?UTF-8?q?=E6=96=99=E8=AE=B0=E5=BD=95=E6=9C=80=E5=90=8E=E4=B8=80=E5=8D=B7?= =?UTF-8?q?ea=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MaterialTraceability.Business/Impl/LYSignalReadBusiness.cs | 5 ++++- MaterialTraceabilityUI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MaterialTraceability.Business/Impl/LYSignalReadBusiness.cs b/MaterialTraceability.Business/Impl/LYSignalReadBusiness.cs index 7dfc275..ee97760 100644 --- a/MaterialTraceability.Business/Impl/LYSignalReadBusiness.cs +++ b/MaterialTraceability.Business/Impl/LYSignalReadBusiness.cs @@ -720,6 +720,8 @@ namespace MaterialTraceability.Business.Impl { i = i + 1; } + + x.bindEaValue = mesEaValue.ToString(); } else { @@ -742,11 +744,12 @@ namespace MaterialTraceability.Business.Impl { i = i + 1; } + + x.bindEaValue = realEaValue.ToString(); } x.bindSfc = GetBindSfcByMes(x.bindRfid); - x.bindEaValue = realEaValue.ToString(); LogRefreshEvent?.Invoke(LogType.MesLog, String.Format("RFID：{0}绑定的膜卷号：{1}", x.bindRfid, x.bindSfc)); diff --git a/MaterialTraceabilityUI/Properties/AssemblyInfo.cs b/MaterialTraceabilityUI/Properties/AssemblyInfo.cs index b6831c6..92e537e 100644 --- a/MaterialTraceabilityUI/Properties/AssemblyInfo.cs +++ b/MaterialTraceabilityUI/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ using System.Windows; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.5.4")] +[assembly: AssemblyVersion("1.0.5.5")] [assembly: AssemblyFileVersion("1.0.0.0")]