提交源码

MaterialTraceability.Business/Impl/ABSignalReadBusiness.cs

@@ -429,7 +429,7 @@ namespace MaterialTraceability.Business.Impl
                 }
                 downRecord.eaValue = (int)float.Parse(upMaterialEaValue);
                 LogRefreshEvent?.Invoke(LogType.RfidLog, "收卷位物料EA：" + upMaterialEaValue);
-                if (!SpiltAccount(position, shaftInfo, downRecord.eaValue, shaftInfo.bindSfc, new ProUpRecord(), downRecord).Result)
+                if (!SpiltAccount(position, shaftInfo, upMaterialEaValue, shaftInfo.bindSfc, new ProUpRecord(), downRecord).Result)
                 {
                     LogHelper.Info(logStr + "完工MES账目数量异常");
 
@@ -599,7 +599,7 @@ namespace MaterialTraceability.Business.Impl
         /// <param name="shaftInfos"></param>
         /// <param name="eaValue"></param>
         /// <param name="upMaterialSfc"></param>
-        private async Task<bool> SpiltAccount(int position, ProShaftInfo shaftInfos, int eaValue, string upMaterialSfc, ProUpRecord upRecord, ProDownRecord downRecord)
+        private async Task<bool> SpiltAccount(int position, ProShaftInfo shaftInfos, string eaValue, string upMaterialSfc, ProUpRecord upRecord, ProDownRecord downRecord)
         {
             LogHelper.Info("自动完工MES账目数量");
             LogRefreshEvent?.Invoke(LogType.MesLog, "自动完工MES账目数量：" + eaValue);

MaterialTraceability.Business/PlcBusiness.cs

@@ -214,8 +214,6 @@ namespace MaterialTraceability.Business
 
                     //收卷结束信号-1A气胀轴
                     if (plcInstance.readInt32ByAddress(appConfig.AbAddress.收卷结束) == 1)
-                    {
-                        lock (string.Empty)
                     {
                         if (isReadFlag(ref AB_lastReadTime_SJEndSinal))
                         {
@@ -223,7 +221,6 @@ namespace MaterialTraceability.Business
                             SignalRefreshEvent?.Invoke(4, 1);
                         }
                     }
-                    }
 
 
                     //异常下料-1A