From 53b7c238d58d8fadd694cfd447f8f6810a8e0b6f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期三, 10 十二月 2025 14:47:09 +0800
Subject: [PATCH] 更改数据库连接
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index f48c058..23b3907 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -8,6 +8,7 @@
using Elastic.Clients.Elasticsearch.Snapshot;
using Furion.Logging;
using IoTClient;
+using MessagePack;
using NewLife.Reflection;
using Newtonsoft.Json;
using Org.BouncyCastle.Ocsp;
@@ -193,18 +194,27 @@
if (carTask != null && carTask.Status != TaskStatusEnum.Complete)
{
//鏌ユ壘璇ヤ换鍔＄殑涓婁竴鏉″瓙浠诲姟瀹屾垚鏃堕棿鍜屽綋鍓嶆椂闂撮棿闅旓紝濡傛灉闂撮殧鏃堕棿澶煭璇存槑鏈夐棶棰橈紝绛�3绉掑悗鍐嶆墽琛�
- var carTaskAfter = _db.Queryable<WcsCarTasks>().First(m => m.IsDelete == false && m.Status == TaskStatusEnum.Complete && m.CarTaskNo != valueTaskStr
+ var carTaskAfter = _db.Queryable<WcsCarTasks>().First(m => m.IsDelete == false && m.CarTaskNo == valueTaskStr - 1
&& m.CarNo == modDevice.PlcIdIP && m.TaskNo == carTask.TaskNo);
- if (carTaskAfter != null && carTaskAfter.UpdateTime != null)
+ if (carTaskAfter != null)
{
- TimeSpan difference = DateTime.Now - Convert.ToDateTime(carTaskAfter.UpdateTime);
- double seconds = difference.TotalSeconds;
- if (seconds < 3)
+ if (carTaskAfter.Status != TaskStatusEnum.Complete || carTaskAfter.UpdateTime == null)
{
- Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskNext.TaskNo}");
+ Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskAfter.TaskNo}");
Thread.Sleep(3000);
break;
}
+ else
+ {
+ TimeSpan difference = DateTime.Now - Convert.ToDateTime(carTaskAfter.UpdateTime);
+ double seconds = difference.TotalSeconds;
+ if (seconds < 3)
+ {
+ Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskAfter.TaskNo}");
+ Thread.Sleep(3000);
+ break;
+ }
+ }
}
carTask.Status = TaskStatusEnum.Complete;
@@ -233,9 +243,9 @@
carTaskNext.Status = TaskStatusEnum.Complete;
carTaskNext.UpdateTime = DateTime.Now;
_db.Updateable(carTaskNext).ExecuteCommand();
-
- carTaskNext = null;
+
Log.Error($"鍥涘悜杞︾涓�鏉″瓙浠诲姟娌¤嚜鍔ㄥ畬鎴�:{carTaskNext.TaskNo}");
+ carTaskNext = null;
}
}
//鎬讳换鍔′笅娌℃湁鍏朵粬鏈墽琛屽皬杞︾殑浠诲姟 鍙樻洿鎬讳换鍔′俊鎭�
--
Gitblit v1.8.0