From fa05563039f5ef0b56470dfabb0b476ecc33bf04 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 10 十二月 2025 14:39:51 +0800
Subject: [PATCH] 优化四向车任务反馈逻辑
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index b54ef36..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;
@@ -41,7 +42,7 @@
AGV(mod); // AGV璋冨害
break;
case PLCTypeEnum.ShuttleCar: //绌挎杞�
- //if (mod.PlcIdIP == "10.26.254.25")
+ //if (mod.PlcIdIP == "10.26.254.28")
//{
// break;
//}
@@ -192,6 +193,30 @@
}
if (carTask != null && carTask.Status != TaskStatusEnum.Complete)
{
+ //鏌ユ壘璇ヤ换鍔＄殑涓婁竴鏉″瓙浠诲姟瀹屾垚鏃堕棿鍜屽綋鍓嶆椂闂撮棿闅旓紝濡傛灉闂撮殧鏃堕棿澶煭璇存槑鏈夐棶棰橈紝绛�3绉掑悗鍐嶆墽琛�
+ 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)
+ {
+ if (carTaskAfter.Status != TaskStatusEnum.Complete || carTaskAfter.UpdateTime == null)
+ {
+ 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;
carTask.UpdateTime = DateTime.Now;
_db.Updateable(carTask).ExecuteCommand();
@@ -218,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