From 5c6e99cb3b30e0b4127caa3b626c2b51ea038b61 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期日, 26 四月 2026 17:49:27 +0800
Subject: [PATCH] Merge branch 'dev' into xiaoyang
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
index c0cb8f1..023d460 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
@@ -19,6 +19,7 @@
public string AGV_OutTaskComplete = WIDESEA_Core.Helper.AppSettings.Configuration["AGV_OutTaskComplete"];
public string WCS_ReceiveTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_ReceiveTask"];
+ public string WCS_CancelTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_CancelTask"];
/// <summary>
/// 鏋佸嵎搴撳嚭鍏ュ簱鐢宠
@@ -316,7 +317,7 @@
InboundOrderRowNo = 1,
Creater = StockConstants.AGV_USER,
CreateDate = DateTime.Now,
- Remark = $"AGV鍏ュ簱浠诲姟鍒涘缓锛屼换鍔″彿锛歿dto.TaskId}"
+ Remark = $"鏋佸嵎搴揂GV鍏ュ簱浠诲姟鍒涘缓锛屼换鍔″彿锛歿dto.TaskId}"
};
// 鍒涘缓搴撳瓨涓昏褰�
@@ -328,7 +329,7 @@
StockStatus = (int)StockStatusEmun.鍏ュ簱纭,
Creater = StockConstants.AGV_USER,
CreateDate = DateTime.Now,
- Remark = $"AGV鍏ュ簱浠诲姟鍒涘缓锛屼换鍔″彿锛歿dto.TaskId}",
+ Remark = $"鏋佸嵎搴揂GV鍏ュ簱浠诲姟鍒涘缓锛屼换鍔″彿锛歿dto.TaskId}",
Details = new List<Dt_StockInfoDetail> { details }
};
@@ -611,6 +612,11 @@
private async Task<AGVResponse> CancelAgvInboundTask(Dt_Task task)
{
AGVResponse response = new AGVResponse();
+
+ var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, task.TaskNum.ToString());
+ if (httpResponse == null || httpResponse.Data == null || !httpResponse.Data.Status)
+ return response.Error(httpResponse?.Data?.Message ?? "涓嬪彂WCS鍙栨秷澶辫触");
+
task.TaskStatus = (int)TaskInStatusEnum.InCancel;
_unitOfWorkManage.BeginTran();
@@ -644,6 +650,10 @@
private async Task<AGVResponse> CancelAgvOutboundTaskAsync(Dt_Task task)
{
AGVResponse response = new AGVResponse();
+ var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, task.TaskNum.ToString());
+ if (httpResponse == null || httpResponse.Data == null || !httpResponse.Data.Status)
+ return response.Error(httpResponse?.Data?.Message ?? "涓嬪彂WCS澶辫触");
+
var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
if (stockInfo == null)
return response.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
--
Gitblit v1.9.3