From b511ce686d438b202b73fc4f3b2d1abd5cf72dc4 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 29 十一月 2025 09:51:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs"
index fac8d08..6cfedd4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs"
@@ -46,8 +46,9 @@
_logger.LogInformation(" ESSController ContainerArrivalReport : CallId={CallId},ContainerCode={ContainerCode},SlotCode={SlotCode}", request.CallId, request.ContainerCode, request.SlotCode);
var response = new ApiResponse<ContainerArrivalResponseData>
{
- Code = 1
-
+ Code = 1,
+ Data = null,
+
};
// 鐢熸垚璇锋眰鐨勫敮涓�鏍囪瘑锛堝熀浜巆allId + 鏃堕棿鎴筹級
@@ -76,7 +77,12 @@
return Ok(response);
}
- var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
+ WebResponseContent result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
+ if (result != null && !string.IsNullOrEmpty(result.Message))
+ {
+ _logger.LogError(" ESSController ContainerArrivalReport RequestInboundTask: Message={Message}", result?.Message);
+ }
+
var cacheOptions = new MemoryCacheEntryOptions
{
@@ -87,17 +93,23 @@
{
Code = 0,
Msg = "",
- Data = new ContainerArrivalResponseData
+ Data = null,
+ };
+ if (result != null && !string.IsNullOrEmpty( result.Message ) && result.Message.Contains("璇ユ墭鐩樺凡鐢熸垚浠诲姟"))
+ {
+
+ response.Data = new ContainerArrivalResponseData
{
direction = "100"
- }
- };
- if (result != null && result.Message.Contains("璇ユ墭鐩樺凡鐢熸垚浠诲姟"))
- {
+ };
return Ok(response);
}
- if (result.Status)
- {
+ if (result != null && result.Status)
+ {
+ response.Data = new ContainerArrivalResponseData
+ {
+ direction = "100"
+ };
return Ok(response);
}
else
@@ -217,7 +229,7 @@
_logger.LogInformation("浠诲姟瀹屾垚: TaskCode={TaskCode}, Container={Container}, Robot={Robot}",
request.TaskCode, request.ContainerCode, request.RobotCode);
- _taskService.TaskCompleted(request.TaskCode);
+ await _taskService.TaskCompleted(request.TaskCode);
// 鏍规嵁涓嶅悓鐨勪换鍔＄被鍨嬭繘琛岀壒娈婂鐞�
if (request.Weight.HasValue)
{
--
Gitblit v1.9.3