From fa6dce9b9457126d7fcc94a297f88d7b7a2120bc Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期四, 11 十二月 2025 14:04:59 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 23b3907..775d866 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -198,7 +198,7 @@
&& m.CarNo == modDevice.PlcIdIP && m.TaskNo == carTask.TaskNo);
if (carTaskAfter != null)
{
- if (carTaskAfter.Status != TaskStatusEnum.Complete || carTaskAfter.UpdateTime == null)
+ if (carTaskAfter.UpdateTime == null)//carTaskAfter.Status != TaskStatusEnum.Complete ||
{
Log.Error($"鍥涘悜杞︾浜屾潯瀛愪换鍔″弽棣堝畬鎴愭椂闂村紓甯�:{carTaskAfter.TaskNo}");
Thread.Sleep(3000);
@@ -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