From 6d9829c889a826d39cbc911ef5d01825edd1bffc Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:33:29 +0800
Subject: [PATCH] 添加设备交互日志

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index f667a95..884c120 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -646,12 +646,17 @@
             {
                 if (!string.IsNullOrEmpty(SourceAddress) && SourceAddress != "")
                 {
-                    Dt_Task? task = BaseDal.QueryFirst(x => x.SourceAddress == SourceAddress && (x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() || x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()));
+                    Dt_Task? task = BaseDal.QueryFirst(x => x.SourceAddress == SourceAddress &&
+                    x.ShuttleCarCode == ShuttleCarCode &&
+                    (x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() ||
+                    x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()));
                     if (task != null) return;
                 }
                 if (!string.IsNullOrEmpty(TargetAddress) && TargetAddress != "")
                 {
-                    Dt_Task? task = BaseDal.QueryFirst(x => x.TargetAddress == TargetAddress && (x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() || x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()));
+                    Dt_Task? task = BaseDal.QueryFirst(x => x.TargetAddress == TargetAddress &&
+                    (x.TaskType == TaskOtherTypeEnum.RelocationCar.ObjToInt() ||
+                    x.TaskType == TaskOtherTypeEnum.RelocationCarCharging.ObjToInt()));
                     if (task != null) return;
                 }
                 #region 鍒涘缓鍫嗗灈鏈虹Щ杞︿换鍔�

--
Gitblit v1.9.3