From cf83e0828b286b61b69a15005e6247d8b03f4cd8 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期日, 16 十一月 2025 19:14:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 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 5077d26..10dd9ce 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"
@@ -43,15 +43,11 @@
public async Task<IActionResult> ContainerArrivalReport([FromBody] ContainerArrivalRequest request)
{
//杩欓噷瑕佸垽鏂嚭搴撶殑鏃跺�欙紝鏂欑浼氬埌鎵爜澶勩�備篃浼氳姹傝繖涓帴鍙ｃ��
-
+ _logger.LogInformation(" ESSController ContainerArrivalReport : CallId={CallId},ContainerCode={ContainerCode},SlotCode={SlotCode}", request.CallId, request.ContainerCode, request.SlotCode);
var response = new ApiResponse<ContainerArrivalResponseData>
{
- Code = 0,
- Msg = "",
- Data = new ContainerArrivalResponseData
- {
- direction = "100" // 绀轰緥鍊硷細鍙牴鎹疄闄呮儏鍐佃繑鍥炴柟鍚戞垨鍏朵粬淇℃伅
- }
+ Code = 1
+
};
// 鐢熸垚璇锋眰鐨勫敮涓�鏍囪瘑锛堝熀浜巆allId + 鏃堕棿鎴筹級
@@ -62,29 +58,29 @@
{
_logger.LogWarning("妫�娴嬪埌閲嶅璇锋眰锛屽凡蹇界暐: CallId={CallId}", request.CallId);
response.Code = 1;
- response.Msg = "error";
- response.Data.direction = "0";
- return Ok(response);
+ response.Msg = null;
+ response.Data = null;
+ return Ok(response);
}
-
+
await _semaphore.WaitAsync();
try
- {
+ {
if (_memoryCache.TryGetValue(requestKey, out bool _))
{
_logger.LogWarning("鍙岄噸妫�鏌ユ娴嬪埌閲嶅璇锋眰锛屽凡蹇界暐: CallId={CallId}", request.CallId);
response.Code = 1;
- response.Msg = "error";
- response.Data.direction = "0";
+ response.Msg = null;
+ response.Data = null;
return Ok(response);
}
-
+
var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
-
+
var cacheOptions = new MemoryCacheEntryOptions
{
- AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(1)
+ AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(20)
};
_memoryCache.Set(requestKey, true, cacheOptions);
if (result.Status)
@@ -95,7 +91,7 @@
Msg = "",
Data = new ContainerArrivalResponseData
{
- direction = "100"
+ direction = "100"
}
};
return Ok(response);
@@ -103,10 +99,12 @@
else
{
response.Code = 1;
- response.Msg = "error";
- response.Data.direction = "0";
+ response.Msg = null;
+ response.Data = null;
+ _logger.LogError(" ESSController ContainerArrivalReport Error: Message={Message}", result.Message);
+
return Ok(response);
- }
+ }
}
catch (Exception ex)
{
--
Gitblit v1.9.3