From bf7b0b70148cafb89c4567a10ad692ea5805c973 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 08 九月 2025 13:04:47 +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 b578805..b54ef36 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -41,10 +41,10 @@
                     AGV(mod);                                       // AGV璋冨害
                     break;
                 case PLCTypeEnum.ShuttleCar: //绌挎杞�
-                    if (mod.PlcIdIP == "10.26.254.25")
-                    {
-                        break;
-                    }
+                    //if (mod.PlcIdIP == "10.26.254.25")
+                    //{
+                    //    break;
+                    //}
                     ShuttleCar(mod);
                     break;
                 case PLCTypeEnum.RobotPalletizer:
@@ -213,7 +213,7 @@
                             //carTaskNext = _db.Queryable<WcsCarTasks>().Where(m => m.IsDelete == false && m.TaskNo == carTask.TaskNo && m.CarNo == modDevice.PlcIdIP && m.Status <= TaskStatusEnum.Doing && m.CarTaskNo != valueTaskStr).OrderBy(m => m.CreateTime).First();
                             if (carTaskNext != null)
                             {
-                                if (carTaskNext.CarTaskNo < valueTaskStr)
+                                if (carTaskNext.CarTaskNo != null && carTaskNext.CarTaskNo < valueTaskStr)
                                 {
                                     carTaskNext.Status = TaskStatusEnum.Complete;
                                     carTaskNext.UpdateTime = DateTime.Now;

--
Gitblit v1.8.0