From a34059e688e947a2ea079a0646872f1a21089940 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 22 九月 2025 14:47:00 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
index 79c9e39..cb20a0a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
@@ -3,6 +3,7 @@
using MoYu.Localization;
using Newtonsoft.Json;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -50,6 +51,14 @@
var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
Dt_Task? Relocationtask = null;
+
+ //濡傛煡璇㈢Щ搴撲换鍔℃椂瀛樺湪鍐呬晶鍑哄簱浠诲姟鍒欑洿鎺ユ墽琛屽唴渚у嚭搴撲换鍔�
+ var currentExistOutTask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup);
+ if (currentExistOutTask != null )
+ {
+ return currentExistOutTask;
+ }
+
if (task.TaskNum != taskNum)
{
@@ -224,9 +233,21 @@
WebResponseContent content = new WebResponseContent();
Dt_Task_Hty dt_Task_Hty = _taskHtyRepository.QueryFirst(x => x.task_CZInfo == czCode && x.CreateDate >= DateTime.Now.AddMinutes(-30));
if (dt_Task_Hty == null) return null;
- if (dt_Task_Hty.Towhereabouts == null && dt_Task_Hty.Towhereabouts == "") return null;
- return dt_Task_Hty.Towhereabouts;
+ if (dt_Task_Hty.Towhereabouts == "2032" || dt_Task_Hty.Towhereabouts == "2042")
+ {
+ return dt_Task_Hty.Towhereabouts;
+
+ }else if(dt_Task_Hty.TargetAddress == "2032" || dt_Task_Hty.TargetAddress == "2042")
+ {
+ return dt_Task_Hty.TargetAddress;
+ }
+ else
+ {
+ return null;
+ }
+
+
}
// 妫�鏌ュ綋鍓嶆墭鐩樻槸鍚﹀瓨鍦ㄤ换鍔�
@@ -285,6 +306,10 @@
task.wheels_mttype = taskDTO.wheels_mttype;
task.WheelsNewOrOld = taskDTO.WheelsNewOrOld;
task.WheelsLX = taskDTO.WheelsLX;
+ if(taskDTO.axle_czh !=null && taskDTO.axle_czh != "")
+ {
+ task.axle_czh = taskDTO.axle_czh;
+ }
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
--
Gitblit v1.9.3