From 6cf884fcafe6fa25e0a0eef35014bd7766d30bb6 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 19 十一月 2025 19:44:41 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ESSController.cs | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 10dd9ce..56269a8 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"
@@ -76,24 +76,28 @@
return Ok(response);
}
- var result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
+ WebResponseContent result = await _taskService.RequestInboundTask(request.ContainerCode, request.SlotCode);
var cacheOptions = new MemoryCacheEntryOptions
{
AbsoluteExpirationRelativeToNow = TimeSpan.FromSeconds(20)
};
_memoryCache.Set(requestKey, true, cacheOptions);
- if (result.Status)
+ response = new ApiResponse<ContainerArrivalResponseData>
{
- response = new ApiResponse<ContainerArrivalResponseData>
+ Code = 0,
+ Msg = "",
+ Data = new ContainerArrivalResponseData
{
- Code = 0,
- Msg = "",
- Data = new ContainerArrivalResponseData
- {
- direction = "100"
- }
- };
+ direction = "100"
+ }
+ };
+ if (result != null && result.Message != null && result.Message.Contains("璇ユ墭鐩樺凡鐢熸垚浠诲姟"))
+ {
+ return Ok(response);
+ }
+ if (result.Status)
+ {
return Ok(response);
}
else
--
Gitblit v1.9.3