From 1dcd4ddb19f8740b835a93707b8d535e03288781 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 13:35:42 +0800
Subject: [PATCH] feat(TaskService): 注入ITask_HtyService和IStockInfo_HtyService

---
 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs |  366 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 257 insertions(+), 109 deletions(-)

diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 967a4e2..ae80dca 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -12,6 +12,7 @@
 using WIDESEA_Core.Core;
 using WIDESEA_Core.Helper;
 using WIDESEA_DTO.GradingMachine;
+using WIDESEA_DTO.MES;
 using WIDESEA_DTO.Stock;
 using WIDESEA_DTO.Task;
 using WIDESEA_IBasicService;
@@ -29,6 +30,9 @@
         private readonly HttpClientHelper _httpClientHelper;
         private readonly IConfiguration _configuration;
         private readonly RoundRobinService _roundRobinService;
+        private readonly IMesService _mesService;
+        private readonly ITask_HtyService _task_HtyService;
+        private readonly IStockInfo_HtyService _stockInfo_HtyService;
 
         public IRepository<Dt_Task> Repository => BaseDal;
 
@@ -48,7 +52,10 @@
             ILocationInfoService locationInfoService,
             HttpClientHelper httpClientHelper,
             IConfiguration configuration,
-            RoundRobinService roundRobinService) : base(BaseDal)
+            RoundRobinService roundRobinService,
+            IMesService mesService,
+            ITask_HtyService task_HtyService,
+            IStockInfo_HtyService stockInfo_HtyService) : base(BaseDal)
         {
             _mapper = mapper;
             _stockInfoService = stockInfoService;
@@ -56,6 +63,9 @@
             _httpClientHelper = httpClientHelper;
             _configuration = configuration;
             _roundRobinService = roundRobinService;
+            _mesService = mesService;
+            _task_HtyService = task_HtyService;
+            _stockInfo_HtyService = stockInfo_HtyService;
         }
 
         #region WCS閫昏緫澶勭悊
@@ -67,7 +77,7 @@
         {
             try
             {
-                WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+                WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
                 if (content.Status)
                 {
                     return content;
@@ -172,18 +182,23 @@
                 var locationInfo = await _locationInfoService.GetLocationInfo(task.Roadway);
                 if (locationInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
 
-                locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
-                task.CurrentAddress = task.SourceAddress;
-                task.NextAddress = locationInfo.LocationCode;
-                task.TargetAddress = locationInfo.LocationCode;
-                task.TaskStatus = TaskInStatusEnum.Line_InFinish.GetHashCode();
+                return await ExecuteWithinTransactionAsync(async () =>
+                {
+                    locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
+                    task.CurrentAddress = task.SourceAddress;
+                    task.NextAddress = locationInfo.LocationCode;
+                    task.TargetAddress = locationInfo.LocationCode;
+                    task.TaskStatus = TaskInStatusEnum.Line_InFinish.GetHashCode();
 
-                var updateResult = await BaseDal.UpdateDataAsync(task);
-                var locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+                    var updateTaskResult = await BaseDal.UpdateDataAsync(task);
+                    var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+                    if (!updateTaskResult || !updateLocationResult)
+                    {
+                        return WebResponseContent.Instance.Error("浠诲姟鏇存柊澶辫触");
+                    }
 
-                return WebResponseContent.Instance.OK(
-                    updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触",
-                    locationInfo.LocationCode);
+                    return WebResponseContent.Instance.OK("浠诲姟鏇存柊鎴愬姛", locationInfo.LocationCode);
+                });
             }
             catch (Exception ex)
             {
@@ -205,23 +220,42 @@
                 if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
 
                 var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
-                stockInfo.LocationCode = location.LocationCode;
-                stockInfo.LocationId = location.Id;
-                stockInfo.OutboundDate = task.Roadway switch
+                if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+                return await ExecuteWithinTransactionAsync(async () =>
                 {
-                    var r when r.Contains("GW") => DateTime.Now.AddHours(2),
-                    var r when r.Contains("CW") => DateTime.Now.AddHours(1),
-                    _ => DateTime.Now
-                };
-                stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
+                    WebResponseContent content = new WebResponseContent();
+                    stockInfo.LocationCode = location.LocationCode;
+                    stockInfo.LocationId = location.Id;
+                    stockInfo.OutboundDate = task.Roadway switch
+                    {
+                        var r when r.Contains("GW") => DateTime.Now.AddHours(2),
+                        var r when r.Contains("CW") => DateTime.Now.AddHours(1),
+                        _ => DateTime.Now
+                    };
+                    stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
 
-                location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+                    location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
 
-                var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
-                var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
-                if (!updateLocationResult || !updateStockResult)
-                    return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
-                return await CompleteTaskAsync(task);
+                    var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+                    var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+                    if (!updateLocationResult || !updateStockResult)
+                        return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+                    // 璋冪敤MES鎵樼洏杩涚珯
+                    var inboundRequest = new InboundInContainerRequest
+                    {
+                        EquipmentCode = "STK-GROUP-001",
+                        ResourceCode = "STK-GROUP-001",
+                        LocalTime = DateTime.Now,
+                        ContainerCode = taskDto.PalletCode
+                    };
+                    var inboundResult = _mesService.InboundInContainer(inboundRequest);
+                    if (inboundResult == null || inboundResult.Data == null || !inboundResult.Data.IsSuccess)
+                    {
+                        return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES杩涚珯澶辫触: {inboundResult?.Data?.Msg ?? inboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
+                    }
+                    return await CompleteTaskAsync(task);
+                });
             }
             catch (Exception ex)
             {
@@ -242,18 +276,40 @@
                 var location = await _locationInfoService.GetLocationInfo(task.Roadway, task.SourceAddress);
                 if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
 
-                var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode); 
-                stockInfo.LocationId = 0;
-                stockInfo.LocationCode = null;
-                stockInfo.OutboundDate = DateTime.Now;
+                var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+                if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
 
-                location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+                WebResponseContent content = new WebResponseContent();
+                return await ExecuteWithinTransactionAsync(async () =>
+                {
+                    stockInfo.LocationId = 0;
+                    stockInfo.LocationCode = null;
+                    stockInfo.OutboundDate = DateTime.Now;
 
-                var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
-                var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
-                if (!updateLocationResult || !updateStockResult)
-                    return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
-                return await CompleteTaskAsync(task);
+                    location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+
+                    var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+                    var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+                    if (!updateLocationResult || !updateStockResult)
+                        return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+                    // 璋冪敤MES鎵樼洏鍑虹珯
+                    var outboundRequest = new OutboundInContainerRequest
+                    {
+                        EquipmentCode = "STK-GROUP-001",
+                        ResourceCode = "STK-GROUP-001",
+                        LocalTime = DateTime.Now,
+                        ContainerCode = taskDto.PalletCode,
+                        ParamList = new List<ParamItem>()
+                    };
+                    var outboundResult = _mesService.OutboundInContainer(outboundRequest);
+                    if (outboundResult == null || outboundResult.Data == null || !outboundResult.Data.IsSuccess)
+                    {
+                        return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES鍑虹珯澶辫触: {outboundResult?.Data?.Msg ?? outboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
+                    }
+
+                    return await CompleteTaskAsync(task);
+                });
             }
             catch (Exception ex)
             {
@@ -282,21 +338,24 @@
                 var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
                 if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
 
-                stockInfo.LocationCode = targetLocation.LocationCode;
-                stockInfo.LocationId = targetLocation.Id;
-                stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
+                return await ExecuteWithinTransactionAsync(async () =>
+                {
+                    stockInfo.LocationCode = targetLocation.LocationCode;
+                    stockInfo.LocationId = targetLocation.Id;
+                    stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode();
 
-                sourceLocation.LocationStatus = LocationStatusEnum.Free.GetHashCode();
-                targetLocation.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+                    sourceLocation.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+                    targetLocation.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
 
-                var updateSourceResult = await _locationInfoService.UpdateLocationInfoAsync(sourceLocation);
-                var updateTargetResult = await _locationInfoService.UpdateLocationInfoAsync(targetLocation);
-                var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+                    var updateSourceResult = await _locationInfoService.UpdateLocationInfoAsync(sourceLocation);
+                    var updateTargetResult = await _locationInfoService.UpdateLocationInfoAsync(targetLocation);
+                    var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
 
-                if (!updateSourceResult || !updateTargetResult || !updateStockResult)
-                    return WebResponseContent.Instance.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
+                    if (!updateSourceResult || !updateTargetResult || !updateStockResult)
+                        return WebResponseContent.Instance.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
 
-                return await CompleteTaskAsync(task);
+                    return await CompleteTaskAsync(task);
+                });
             }
             catch (Exception ex)
             {
@@ -313,7 +372,7 @@
         {
             try
             {
-                WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+                WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
                 if (content.Status)
                 {
                     return content;
@@ -328,6 +387,47 @@
             catch (Exception ex)
             {
                 return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 绌烘墭鐩樺叆搴撳畬鎴�
+        /// </summary>
+        public async Task<WebResponseContent> InboundFinishTaskTrayAsync(CreateTaskDto taskDto)
+        {
+            try
+            {
+                var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
+                if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+
+                var location = await _locationInfoService.GetLocationInfo(task.Roadway, task.TargetAddress);
+                if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
+
+                var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+                if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+                return await ExecuteWithinTransactionAsync(async () =>
+                {
+                    stockInfo.LocationCode = location.LocationCode;
+                    stockInfo.LocationId = location.Id;
+                    stockInfo.StockStatus = StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode();
+
+                    location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+
+                    var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+                    var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+                    if (!updateLocationResult || !updateStockResult)
+                        return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+                    var deleteResult = await BaseDal.DeleteDataAsync(task);
+                    if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+                    return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+                });
+            }
+            catch (Exception ex)
+            {
+                return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
             }
         }
 
@@ -363,12 +463,55 @@
                 };
                 var taskDtos = task.Adapt<WMSTaskDTO>();
 
-                BaseDal.AddData(task);
-                return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+                var addResult = await BaseDal.AddDataAsync(task) > 0;
+                if (!addResult)
+                    return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
+                return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", taskDtos);
             }
             catch (Exception ex)
             {
                 return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// 绌烘墭鐩樺嚭搴撳畬鎴�
+        /// </summary>
+        public async Task<WebResponseContent> OutboundFinishTaskTrayAsync(CreateTaskDto taskDto)
+        {
+            try
+            {
+                var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
+                if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+
+                var location = await _locationInfoService.GetLocationInfo(task.Roadway, task.SourceAddress);
+                if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
+
+                var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+                if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+                return await ExecuteWithinTransactionAsync(async () =>
+                {
+                    stockInfo.LocationId = 0;
+                    stockInfo.LocationCode = null;
+                    stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.GetHashCode();
+
+                    location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+
+                    var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+                    var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+                    if (!updateLocationResult || !updateStockResult)
+                        return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+                    var deleteResult = await BaseDal.DeleteDataAsync(task);
+                    if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+                    return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+                });
+            }
+            catch (Exception ex)
+            {
+                return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
             }
         }
 
@@ -403,15 +546,15 @@
         /// </summary>
         /// <param name="palletCode"></param>
         /// <returns></returns>
-        private async Task<WebResponseContent> GetTasksByPalletCodeAsync(string palletCode)
+        private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
         {
             try
             {
-                var tasks = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
-                if (tasks == null)
+                var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+                if (task == null)
                     return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
-                var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
-                return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+                var taskDto = _mapper.Map<WMSTaskDTO>(task);
+                return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDto);
             }
             catch (Exception ex)
             {
@@ -549,45 +692,54 @@
                     taskList.Add(task);
                 }
 
-                var addResult = await BaseDal.AddDataAsync(taskList) > 0;
-                if (!addResult)
+                var transactionResult = await ExecuteWithinTransactionAsync(async () =>
                 {
-                    return WebResponseContent.Instance.Error($"鎵归噺鍒涘缓浠诲姟澶辫触锛屽叡 {taskList.Count} 涓换鍔�");
-                }
-
-                // 浠诲姟鍒涘缓鎴愬姛鍚庯紝鍚屾閿佸畾搴撳瓨鍜岃揣浣嶇姸鎬侊紝閬垮厤閲嶅鍒嗛厤
-                var stocksToUpdate = stocksToProcess
-                    .Select(s =>
+                    var addResult = await BaseDal.AddDataAsync(taskList) > 0;
+                    if (!addResult)
                     {
-                        s.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.GetHashCode();
-                        return s;
-                    })
-                    .ToList();
-
-                var updateStockResult = await _stockInfoService.Repository.UpdateDataAsync(stocksToUpdate);
-                if (!updateStockResult)
-                {
-                    return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓鎴愬姛锛屼絾搴撳瓨鐘舵�佹洿鏂板け璐ワ紝鍏� {stocksToUpdate.Count} 鏉�");
-                }
-
-                var locationsToUpdate = stocksToProcess
-                    .Where(s => s.LocationDetails != null)
-                    .GroupBy(s => s.LocationDetails.Id)
-                    .Select(g =>
-                    {
-                        var location = g.First().LocationDetails;
-                        location.LocationStatus = LocationStatusEnum.InStockLock.GetHashCode();
-                        return location;
-                    })
-                    .ToList();
-
-                if (locationsToUpdate.Any())
-                {
-                    var updateLocationResult = await _locationInfoService.Repository.UpdateDataAsync(locationsToUpdate);
-                    if (!updateLocationResult)
-                    {
-                        return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓鎴愬姛锛屼絾璐т綅鐘舵�佹洿鏂板け璐ワ紝鍏� {locationsToUpdate.Count} 鏉�");
+                        return WebResponseContent.Instance.Error($"鎵归噺鍒涘缓浠诲姟澶辫触锛屽叡 {taskList.Count} 涓换鍔�");
                     }
+
+                    // 浠诲姟鍒涘缓鎴愬姛鍚庯紝鍚屾閿佸畾搴撳瓨鍜岃揣浣嶇姸鎬侊紝閬垮厤閲嶅鍒嗛厤
+                    var stocksToUpdate = stocksToProcess
+                        .Select(s =>
+                        {
+                            s.StockStatus = StockStatusEmun.鍑哄簱閿佸畾.GetHashCode();
+                            return s;
+                        })
+                        .ToList();
+
+                    var updateStockResult = await _stockInfoService.Repository.UpdateDataAsync(stocksToUpdate);
+                    if (!updateStockResult)
+                    {
+                        return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓鎴愬姛锛屼絾搴撳瓨鐘舵�佹洿鏂板け璐ワ紝鍏� {stocksToUpdate.Count} 鏉�");
+                    }
+
+                    var locationsToUpdate = stocksToProcess
+                        .Where(s => s.LocationDetails != null)
+                        .GroupBy(s => s.LocationDetails.Id)
+                        .Select(g =>
+                        {
+                            var location = g.First().LocationDetails;
+                            location.LocationStatus = LocationStatusEnum.InStockLock.GetHashCode();
+                            return location;
+                        })
+                        .ToList();
+
+                    if (locationsToUpdate.Any())
+                    {
+                        var updateLocationResult = await _locationInfoService.Repository.UpdateDataAsync(locationsToUpdate);
+                        if (!updateLocationResult)
+                        {
+                            return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓鎴愬姛锛屼絾璐т綅鐘舵�佹洿鏂板け璐ワ紝鍏� {locationsToUpdate.Count} 鏉�");
+                        }
+                    }
+
+                    return WebResponseContent.Instance.OK();
+                });
+                if (!transactionResult.Status)
+                {
+                    return transactionResult;
                 }
 
                 // 6. 閫氱煡 WCS锛堝紓姝ワ紝涓嶅奖鍝嶄富娴佺▼锛�
@@ -708,7 +860,7 @@
                     TaskNum = await BaseDal.GetTaskNo(),
                     PalletCode = palletCode,
                     PalletType = stockInfo?.PalletType ?? 0,
-                    Roadway = stockInfo?.LocationDetails?.RoadwayNo ?? "ROBOT",
+                    Roadway = stock.Roadway,
                     TaskType = taskType.GetHashCode(),
                     TaskStatus = TaskRobotStatusEnum.RobotNew.GetHashCode(),
                     SourceAddress = sourceLineNo,
@@ -752,30 +904,26 @@
             try
             {
                 var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
+
+                int locationStatus;
                 if (stockInfo == null)
                 {
                     var location = await _locationInfoService.GetLocationInfoAsync(input.LocationCode);
-
-                    OutputDto outPutDto = new OutputDto()
-                    {
-                        LocationCode = input.LocationCode,
-                        PalletCode = input.PalletCode,
-                        IsNormalProcedure = 1,
-                        LocationStatus = location.LocationStatus
-                    };
-                    content.OK(data: outPutDto);
+                    locationStatus = location?.LocationStatus ?? 0;
                 }
                 else
                 {
-                    OutputDto outPutDto = new OutputDto()
-                    {
-                        LocationCode = input.LocationCode,
-                        PalletCode = input.PalletCode,
-                        IsNormalProcedure = 1,
-                        LocationStatus = stockInfo.LocationDetails.LocationStatus
-                    };
-                    content.OK(data: outPutDto);
+                    locationStatus = stockInfo.LocationDetails?.LocationStatus ?? 0;
                 }
+
+                OutputDto outPutDto = new OutputDto()
+                {
+                    LocationCode = input.LocationCode,
+                    PalletCode = input.PalletCode,
+                    IsNormalProcedure = 1,
+                    LocationStatus = locationStatus
+                };
+                return content.OK(data: outPutDto);
             }
             catch (Exception ex)
             {

--
Gitblit v1.9.3