From d10c23015080b541e810abd2dcae1b6084e71449 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 11 十二月 2025 10:09:21 +0800
Subject: [PATCH] 修改给AGV下发空托盘收集任务逻辑
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 0ec179f..1bf1fa8 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -200,7 +200,7 @@
{
if (carTaskAfter.Status != TaskStatusEnum.Complete || carTaskAfter.UpdateTime == null)
{
- Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskNext.TaskNo}");
+ Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskAfter.TaskNo}");
Thread.Sleep(3000);
break;
}
@@ -210,7 +210,7 @@
double seconds = difference.TotalSeconds;
if (seconds < 3)
{
- Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskNext.TaskNo}");
+ Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskAfter.TaskNo}");
Thread.Sleep(3000);
break;
}
@@ -243,9 +243,9 @@
carTaskNext.Status = TaskStatusEnum.Complete;
carTaskNext.UpdateTime = DateTime.Now;
_db.Updateable(carTaskNext).ExecuteCommand();
-
- carTaskNext = null;
+
Log.Error($"鍥涘悜杞︾涓�鏉″瓙浠诲姟娌¤嚜鍔ㄥ畬鎴�:{carTaskNext.TaskNo}");
+ carTaskNext = null;
}
}
//鎬讳换鍔′笅娌℃湁鍏朵粬鏈墽琛屽皬杞︾殑浠诲姟 鍙樻洿鎬讳换鍔′俊鎭�
@@ -1450,11 +1450,11 @@
{
return;
}
-
-
- if (_db.Queryable<WcsTask>().Any(s => s.EndLocate == modTask.EndLocate && s.IsDelete == false && s.Status == TaskStatusEnum.Doing && s.Type == PLCTypeEnum.AGV ))
+
+ var conveyList1 = new List<string>() { "B100101", "B030101" };//绌烘墭鏀堕泦鍖哄偍浣�
+ if (_db.Queryable<WcsTask>().Any(s => s.EndLocate == modTask.EndLocate && s.IsDelete == false && s.Status == TaskStatusEnum.Doing && s.Type == PLCTypeEnum.AGV && !conveyList1.Contains(s.EndLocate)))
{
- return; // 鏈夌洰鐨勪綅缃竴鑷翠笖姝ｅ湪鎵ц鐨勪换鍔�
+ return; // 鏈夌洰鐨勪綅缃竴鑷翠笖姝ｅ湪鎵ц鐨勪换鍔�(涓嶅寘鍚┖鎵樻敹闆�)
}
//涓嬪彂AGV浠诲姟
--
Gitblit v1.8.0