From 11d7bf6a617eac3c5ca11a270af8d8cff3776a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Tue, 13 Aug 2024 09:00:56 +0800
Subject: [PATCH] 1

---
 src/Khd.Core.EntityFramework/DefaultDbContext.cs | 2 ++
 src/Khd.Core.Wcs/MainCentralControl.cs           | 1 +
 src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs       | 1 -
 src/Khd.Core.Wcs/Wcs/SystemTimer.cs              | 9 +++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Khd.Core.EntityFramework/DefaultDbContext.cs b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
index 09d0122..ee34aeb 100644
--- a/src/Khd.Core.EntityFramework/DefaultDbContext.cs
+++ b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
@@ -79,5 +79,7 @@ namespace Khd.Core.EntityFramework
         public DbSet<MesBaseBarcodeInfo> MesBaseBarcodeInfo { get; set; }
 
         public DbSet<PlcPoint> PlcPoint { get; set; }
+
+
     }
 }
\ No newline at end of file
diff --git a/src/Khd.Core.Wcs/MainCentralControl.cs b/src/Khd.Core.Wcs/MainCentralControl.cs
index d424b42..9895e88 100644
--- a/src/Khd.Core.Wcs/MainCentralControl.cs
+++ b/src/Khd.Core.Wcs/MainCentralControl.cs
@@ -64,6 +64,7 @@ namespace Khd.Core.Wcs
                 //创建定时器
                 SystemTimer systemTimer = new SystemTimer(_host);
                 systemTimer.Start();
+
                 //创建任务
                 CreateTaskByRecord createTaskByRecord = new(_host);
                 createTaskByRecord.StartPoint();
diff --git a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
index dd7e472..ac8fb16 100644
--- a/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
+++ b/src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
@@ -10,7 +10,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using SixLabors.ImageSharp;
 using System.Data;
-using System.Linq;
 using Z.EntityFramework.Plus;
 
 namespace Khd.Core.Wcs.Wcs
diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
index 54b65b8..6bf51c4 100644
--- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
+++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
@@ -193,11 +193,13 @@ namespace Khd.Core.Wcs.Wcs
         private void PlcHearBeat220Logic()
         {
             BasePlcpoint HeartBeat30 = StaticData.BasePlcpointList.First(t => t.plcpointNo == "putTray");
+            int errorCount = 0;
             while (true)
             {
                 try
                 {
                     StaticData.PlcDic[2].Read(HeartBeat30.plcpointAddress);
+                    errorCount = 0;
                 }
                 catch
                 {
@@ -208,6 +210,7 @@ namespace Khd.Core.Wcs.Wcs
                     }
                     catch (Exception ex2)
                     {
+                        errorCount++;
                         _logger.Error("Plc短线重连失败" + ex2.Message);
                     }
                 }
@@ -222,12 +225,14 @@ namespace Khd.Core.Wcs.Wcs
         {
             BasePlcpoint HeartBeat30 = StaticData.BasePlcpointList.First(t => t.plcpointNo == "HeartBeat30");
             bool heartBeatCount = false;
+            int errorCount = 0;
             while (true)
             {
                 try
                 {
                     heartBeatCount = !heartBeatCount;
                     StaticData.PlcDic[0].WriteToPoint(HeartBeat30.plcpointAddress, heartBeatCount, HeartBeat30.plcpointLength?.ToString());
+                    errorCount = 0;
                 }
                 catch
                 {
@@ -238,6 +243,7 @@ namespace Khd.Core.Wcs.Wcs
                     }
                     catch (Exception ex2)
                     {
+                        errorCount++;
                         _logger.Error("Plc短线重连失败" + ex2.Message);
                     }
                 }
@@ -252,12 +258,14 @@ namespace Khd.Core.Wcs.Wcs
         {
             BasePlcpoint HeartBeat31 = StaticData.BasePlcpointList.First(t => t.plcpointNo == "CTUHeart");
             bool heartBeatCount = false;
+            int errorCount = 0;
             while (true)
             {
                 try
                 {
                     heartBeatCount = !heartBeatCount;
                     StaticData.PlcDic[1].WriteToPoint(HeartBeat31.plcpointAddress, heartBeatCount, HeartBeat31.plcpointLength?.ToString());
+                    errorCount = 0;
                 }
                 catch (Exception ex)
                 {
@@ -270,6 +278,7 @@ namespace Khd.Core.Wcs.Wcs
                         }
                         catch (Exception ex2)
                         {
+                            errorCount++;
                             _logger.Error("Plc短线重连失败" + ex2.Message);
                         }
                     }