From e4921e003cc293fea714bdaf74dc6a6b6b750295 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 25 四月 2026 16:20:51 +0800
Subject: [PATCH] Merge branch 'xiaoyang' into dev

---
 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCS/TaskService_Outbound.cs |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCS/TaskService_Outbound.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCS/TaskService_Outbound.cs
index cac934b..8c1d4b2 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCS/TaskService_Outbound.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCS/TaskService_Outbound.cs
@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using WIDESEA_Common.Constants;
 using WIDESEA_Common.LocationEnum;
 using WIDESEA_Common.StockEnum;
@@ -60,7 +59,6 @@
         /// </summary>
         public async Task<WebResponseContent> OutboundFinishTaskAsync(CreateTaskDto taskDto)
         {
-            var stopwatch = Stopwatch.StartNew();
             try
             {
                 var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
@@ -87,9 +85,24 @@
                 WebResponseContent content = new WebResponseContent();
                 return await _unitOfWorkManage.BeginTranAsync(async () =>
                 {
+                    if (task.TaskType == (int)TaskOutboundTypeEnum.OutEmpty)
+                    {
+                        location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+
+                        var updateResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+                        var deleteResult = _stockInfoService.DeleteData(stockInfo).Status;
+                        if (!updateResult && !deleteResult)
+                            return content.Error("浠诲姟瀹屾垚澶辫触");
+
+                        var completeResult1 = await CompleteTaskAsync(task, "鍑哄簱瀹屾垚");
+                        return content.OK();
+
+                    }
+
                     stockInfo.LocationId = 0;
                     stockInfo.LocationCode = string.Empty;
                     stockInfo.OutboundDate = DateTime.Now;
+                    stockInfo.StockStatus = (int)StockStatusEmun.鍑哄簱瀹屾垚;
 
                     location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
 
@@ -139,14 +152,26 @@
                         ContainerCode = taskDto.PalletCode
                     };
                     string palletCode = taskDto.PalletCode;
+                    string requestJson = outboundRequest.ToJson();
 
                     // Fire-and-forget: 寮傛鎵цMES鍑虹珯锛屼笉闃诲涓讳笟鍔￠�昏緫
-                    _ = Task.Run(() => MesUploadAsync(palletCode, MesUploadStatusEnum.鍑虹珯涓婁紶鎴愬姛, async () =>
-                    {
-                        return await Task.FromResult(string.IsNullOrWhiteSpace(token)
-                            ? _mesService.OutboundInContainer(outboundRequest)
-                            : _mesService.OutboundInContainer(outboundRequest, token));
-                    }));
+                    _mesUploadHelper.FireAndForget(
+                        palletCode,
+                        MesUploadStatusEnum.鍑虹珯涓婁紶鎴愬姛,
+                        "OutboundInContainer",
+                        requestJson,
+                        () =>
+                        {
+                            var result = string.IsNullOrWhiteSpace(token)
+                                ? _mesService.OutboundInContainer(outboundRequest)
+                                : _mesService.OutboundInContainer(outboundRequest, token);
+                            return (
+                                result?.Data?.IsSuccess ?? false,
+                                Newtonsoft.Json.JsonConvert.SerializeObject(result),
+                                result?.Data?.Msg ?? result?.ErrorMessage ?? "鏈煡閿欒",
+                                _mesService.BuildConfig(token ?? string.Empty).ToJson()
+                            );
+                        });
 
                     var completeResult = await CompleteTaskAsync(task, "鍑哄簱瀹屾垚");
                     if (!completeResult.Status)

--
Gitblit v1.9.3