From 60f0db204b1ef475b8a14ab309e8eeac0db5e208 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 13 八月 2025 19:31:36 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 596d1b2..d4602d2 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -89,6 +89,12 @@
{
break;//鍑哄簱閿佸畾鎵撳紑鍒欎笉鎵ц鍑哄簱浠诲姟
}
+ //鍒ゆ柇璇ュ贩閬撴湁娌℃湁鍒拌揪鍙栬揣宸ヤ綅鐨勫叆搴撲换鍔★紝浼樺厛鎵ц鍏ュ簱浠诲姟鍐嶆墽琛岀Щ搴�/鍑哄簱浠诲姟
+ var taskIn = _db.Queryable<WcsTask>().First(s => s.Status == TaskStatusEnum.Doing && s.TaskType == TaskTypeEnum.In && s.EndRoadway == modDevice.StationNum && !string.IsNullOrEmpty(s.EndLocate));
+ if (taskIn != null)
+ {
+ break;
+ }
PlcTaskInfo taskInfo = new PlcTaskInfo();
if (modTask.TaskType == TaskTypeEnum.Move)
@@ -2210,14 +2216,7 @@
{
// 璺烘満闈炵┖闂茬瓑寰�
break;
- }
- //鍒ゆ柇璇ュ贩閬撴湁娌℃湁寰呮墽琛岀殑绉诲簱/鍑哄簱浠诲姟锛屼紭鍏堟墽琛岀Щ搴�/鍑哄簱浠诲姟鍐嶆墽琛屽叆搴撲换鍔�
- var taskOutMove = _db.Queryable<WcsTask>().First(s => s.Status == TaskStatusEnum.Wait && (s.TaskType == TaskTypeEnum.Out || s.TaskType == TaskTypeEnum.Move)
- && s.StartRoadway == modDevice.StationNum);
- if (taskOutMove != null)
- {
- break;
- }
+ }
// 缁橮LC鍐欏叆浠诲姟鏁版嵁
var listResult = new List<Result>();
--
Gitblit v1.8.0