From c9a1df9c19a64844d05d120ff171f523d77e7823 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 25 四月 2026 22:15:36 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs | 37 ++-----------------------------------
1 files changed, 2 insertions(+), 35 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs
index da5c8c5..838bd20 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RobotJob/RobotTaskProcessor.cs
@@ -79,7 +79,7 @@
/// <summary>
/// 鏃ュ織璁板綍鍣�
/// </summary>
- private readonly ILogger _logger;
+ private readonly ILogger _logger;
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -146,7 +146,7 @@
/// <returns>鍒犻櫎鏄惁鎴愬姛</returns>
public bool? DeleteTask(int ID)
{
- return _robotTaskService.Repository.DeleteDataById(ID);
+ return _robotTaskService.DeleteRobotTask(ID);
}
/// <summary>
@@ -589,39 +589,6 @@
QuartzLogHelper.LogError(_logger, $"HandleInboundTaskAsync锛氭帴鏀禬MS浠诲姟澶辫触", state.RobotCrane?.DeviceName ?? "Unknown");
return false;
}
-
- // 瑙ｆ瀽杩斿洖鐨勪换鍔′俊鎭�
- //var taskInfos = JsonConvert.DeserializeObject<List<Dt_Task>>(content.Data.ToJson() ?? string.Empty) ?? new List<Dt_Task>();
- //var taskInfo = taskInfos.FirstOrDefault();
-
- //// 鑾峰彇婧愬湴鍧�
- //string sourceAddress = taskDTO.SourceAddress;
-
- //// 鏌ユ壘婧愬湴鍧�瀵瑰簲鐨勮緭閫佺嚎璁惧
- //IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceProDTOs.Any(d => d.DeviceChildCode == sourceAddress));
-
- //if (device != null)
- //{
- // // 灏嗚澶囪浆鎹负杈撻�佺嚎绫诲瀷
- // CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
-
- // // 璁剧疆杈撻�佺嚎鐨勭洰鏍囧湴鍧�
- // conveyorLine.SetValue(ConveyorLineDBNameNew.Target, taskInfo.NextAddress, sourceAddress);
-
- // // 璁剧疆杈撻�佺嚎鐨勪换鍔″彿
- // conveyorLine.SetValue(ConveyorLineDBNameNew.TaskNo, taskInfo.TaskNum, sourceAddress);
-
- // // 瑙﹀彂杈撻�佺嚎寮�濮嬫墽琛岋紙鍐欏叆 WCS_ACK = 1锛�
- // conveyorLine.SetValue(ConveyorLineDBNameNew.WCS_ACK, (short)1, sourceAddress);
-
- // // 鏇存柊浠诲姟鐘舵�佸埌涓嬩竴闃舵
- // if (_taskService.UpdateTaskStatusToNext(taskInfo).Status)
- // {
- // _logger.LogInformation("HandleInboundTaskAsync锛氬叆搴撲换鍔″鐞嗘垚鍔燂紝浠诲姟鍙�: {TaskNum}", taskInfo.TaskNum);
- // QuartzLogger.Info($"HandleInboundTaskAsync锛氬叆搴撲换鍔″鐞嗘垚鍔燂紝浠诲姟鍙�: {taskInfo.TaskNum}", state.RobotCrane?.DeviceName ?? "Unknown");
- // return true;
- // }
- //}
return true;
}
--
Gitblit v1.9.3