From aa76e0acd1337d82ddef1d5a34b245c988ecfc13 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期五, 30 五月 2025 18:25:25 +0800
Subject: [PATCH] 修改问题

---
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 76f93ee..6eeb443 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -332,7 +332,7 @@
 
 
 
-                        Thread.Sleep(3000);
+                        Thread.Sleep(5000);
                     }
                     catch (OperationCanceledException)
                     {
@@ -357,7 +357,7 @@
         {
             while (true)
             {
-                Console.WriteLine("寮�鍚洓鍚戣溅浠诲姟鑷垎閰�");
+                //Console.WriteLine("寮�鍚洓鍚戣溅浠诲姟鑷垎閰�");
                 //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
                 if (cts.Token.IsCancellationRequested)
                 {
@@ -433,7 +433,8 @@
 
                             var gongwei = carcon.conveyorRuKu[endLocate];
                             //鍒ゆ柇浠诲姟
-                            var convarTask = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.StartLocate == gongwei && m.Type == PLCTypeEnum.ConveyorLine);
+                            var convarTask = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.StartLocate == gongwei
+                            && m.Type == PLCTypeEnum.ConveyorLine && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing));
                             if (convarTask != null)
                             {
                                 continue;//鏀捐揣宸ヤ綅鏈変换鍔�

--
Gitblit v1.8.0