From dcbd4934d063f471c01cbcf93574c2e2ac5f16b5 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 27 三月 2026 09:37:36 +0800
Subject: [PATCH] feat: 提交WCS与WMS代码调整

---
 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 459cfb8..81bbbf0 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,3 +1,4 @@
+using Mapster;
 using MapsterMapper;
 using Microsoft.Extensions.Configuration;
 using SqlSugar;
@@ -11,6 +12,7 @@
 using WIDESEA_Core.Core;
 using WIDESEA_Core.Helper;
 using WIDESEA_DTO.GradingMachine;
+using WIDESEA_DTO.Stock;
 using WIDESEA_DTO.Task;
 using WIDESEA_IBasicService;
 using WIDESEA_IStockService;
@@ -65,7 +67,7 @@
         {
             try
             {
-                WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+                WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
                 if (content.Status)
                 {
                     return content;
@@ -170,18 +172,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)
             {
@@ -203,23 +210,28 @@
                 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();
+                    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("浠诲姟瀹屾垚澶辫触");
+                    return await CompleteTaskAsync(task);
+                });
             }
             catch (Exception ex)
             {
@@ -240,18 +252,23 @@
                 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();
+                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("浠诲姟瀹屾垚澶辫触");
+                    return await CompleteTaskAsync(task);
+                });
             }
             catch (Exception ex)
             {
@@ -280,21 +297,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)
             {
@@ -311,7 +331,7 @@
         {
             try
             {
-                WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+                WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
                 if (content.Status)
                 {
                     return content;
@@ -339,7 +359,7 @@
             try
             {
 
-                var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
+                var stockInfo = await _stockInfoService.Repository.QueryDataNavFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
                 if (stockInfo == null)
                     return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
 
@@ -353,14 +373,18 @@
                     NextAddress = taskDto.TargetAddress,
                     TargetAddress = taskDto.TargetAddress,
                     Roadway = stockInfo.LocationDetails.RoadwayNo,
-                    TaskType = TaskTypeEnum.OutEmpty.GetHashCode(),
+                    TaskType = TaskOutboundTypeEnum.OutEmpty.GetHashCode(),
                     TaskStatus = TaskStatusEnum.New.GetHashCode(),
                     Grade = 1,
                     TaskNum = await BaseDal.GetTaskNo(),
                     Creater = "system",
                 };
-                var taskDtos = _mapper.Map<List<WMSTaskDTO>>(task);
-                return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+                var taskDtos = task.Adapt<WMSTaskDTO>();
+
+                var addResult = await BaseDal.AddDataAsync(task) > 0;
+                if (!addResult)
+                    return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
+                return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", taskDtos);
             }
             catch (Exception ex)
             {
@@ -399,15 +423,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)
             {
@@ -545,45 +569,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锛堝紓姝ワ紝涓嶅奖鍝嶄富娴佺▼锛�
@@ -611,6 +644,125 @@
             }
         }
 
+        /// <summary>
+        /// 鍒涘缓鏈烘鎵嬬粍鐩樹换鍔�
+        /// </summary>
+        public async Task<WebResponseContent> CreateRobotGroupPalletTaskAsync(StockDTO stock)
+        {
+            return await CreateRobotPalletTaskAsync(
+                stock,
+                "缁勭洏",
+                RobotTaskTypeEnum.GroupPallet,
+                s => string.IsNullOrWhiteSpace(s.TargetPalletNo) ? s.SourcePalletNo : s.TargetPalletNo,
+                requireStockWithoutLocation: false);
+        }
+
+        /// <summary>
+        /// 鍒涘缓鏈烘鎵嬫崲鐩樹换鍔�
+        /// </summary>
+        public async Task<WebResponseContent> CreateRobotChangePalletTaskAsync(StockDTO stock)
+        {
+            return await CreateRobotPalletTaskAsync(
+                stock,
+                "鎹㈢洏",
+                RobotTaskTypeEnum.ChangePallet,
+                s => s.SourcePalletNo,
+                requireStockWithoutLocation: true,
+                stockPalletCodeSelector: s => s.SourcePalletNo);
+        }
+
+        /// <summary>
+        /// 鍒涘缓鏈烘鎵嬫媶鐩樹换鍔�
+        /// </summary>
+        public async Task<WebResponseContent> CreateRobotSplitPalletTaskAsync(StockDTO stock)
+        {
+            return await CreateRobotPalletTaskAsync(
+                stock,
+                "鎷嗙洏",
+                RobotTaskTypeEnum.SplitPallet,
+                s => s.SourcePalletNo,
+                requireStockWithoutLocation: true,
+                stockPalletCodeSelector: s => s.SourcePalletNo);
+        }
+
+        private async Task<WebResponseContent> CreateRobotPalletTaskAsync(
+            StockDTO stock,
+            string taskName,
+            RobotTaskTypeEnum taskType,
+            Func<StockDTO, string?> palletCodeSelector,
+            bool requireStockWithoutLocation,
+            Func<StockDTO, string?>? stockPalletCodeSelector = null)
+        {
+            try
+            {
+                if (stock == null)
+                    return WebResponseContent.Instance.Error("浠诲姟鍙傛暟涓嶈兘涓虹┖");
+
+                var palletCode = palletCodeSelector(stock)?.Trim();
+                if (string.IsNullOrWhiteSpace(palletCode))
+                    return WebResponseContent.Instance.Error("鎵樼洏鍙蜂笉鑳戒负绌�");
+
+                var sourceLineNo = stock.SourceLineNo?.Trim();
+                var targetLineNo = stock.TargetLineNo?.Trim();
+                if (string.IsNullOrWhiteSpace(sourceLineNo) || string.IsNullOrWhiteSpace(targetLineNo))
+                    return WebResponseContent.Instance.Error("鏉ユ簮绾夸綋缂栧彿鍜岀洰鏍囩嚎浣撶紪鍙蜂笉鑳戒负绌�");
+
+                var existingTask = await BaseDal.QueryFirstAsync(t =>
+                    t.PalletCode == palletCode &&
+                    (t.TaskStatus == TaskRobotStatusEnum.RobotNew.GetHashCode()
+                     || t.TaskStatus == TaskRobotStatusEnum.RobotExecuting.GetHashCode()
+                     || t.TaskStatus == TaskRobotStatusEnum.RobotPickFinish.GetHashCode()
+                     || t.TaskStatus == TaskRobotStatusEnum.RobotPutFinish.GetHashCode()
+                     || t.TaskStatus == TaskRobotStatusEnum.RobotPending.GetHashCode()));
+                if (existingTask != null)
+                    return WebResponseContent.Instance.Error($"鎵樼洏[{palletCode}]宸插瓨鍦ㄦ湭瀹屾垚浠诲姟");
+
+                Dt_StockInfo? stockInfo = null;
+                if (requireStockWithoutLocation)
+                {
+                    var stockPalletCode = (stockPalletCodeSelector ?? palletCodeSelector).Invoke(stock)?.Trim();
+                    if (string.IsNullOrWhiteSpace(stockPalletCode))
+                        return WebResponseContent.Instance.Error("婧愭墭鐩樺彿涓嶈兘涓虹┖");
+
+                    stockInfo = await _stockInfoService.GetStockInfoAsync(stockPalletCode);
+                    if (stockInfo == null)
+                        return WebResponseContent.Instance.Error($"鎵樼洏[{stockPalletCode}]搴撳瓨涓嶅瓨鍦�");
+
+                    if (stockInfo.LocationId > 0 || !string.IsNullOrWhiteSpace(stockInfo.LocationCode))
+                        return WebResponseContent.Instance.Error($"鎵樼洏[{stockPalletCode}]搴撳瓨宸茬粦瀹氳揣浣嶏紝涓嶈兘鍒涘缓鏈烘鎵媨taskName}浠诲姟");
+                }
+
+                var task = new Dt_Task
+                {
+                    TaskNum = await BaseDal.GetTaskNo(),
+                    PalletCode = palletCode,
+                    PalletType = stockInfo?.PalletType ?? 0,
+                    Roadway = stock.Roadway,
+                    TaskType = taskType.GetHashCode(),
+                    TaskStatus = TaskRobotStatusEnum.RobotNew.GetHashCode(),
+                    SourceAddress = sourceLineNo,
+                    TargetAddress = targetLineNo,
+                    CurrentAddress = sourceLineNo,
+                    NextAddress = targetLineNo,
+                    WarehouseId = stockInfo?.WarehouseId ?? 1,
+                    Grade = 1,
+                    Remark = $"鏈烘鎵媨taskName}",
+                    Creater = "system"
+                };
+
+                var result = await Repository.AddDataAsync(task) > 0;
+                if (!result)
+                    return WebResponseContent.Instance.Error($"鏈烘鎵媨taskName}浠诲姟鍒涘缓澶辫触");
+
+                var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
+                return WebResponseContent.Instance.OK($"鏈烘鎵媨taskName}浠诲姟鍒涘缓鎴愬姛", wmstaskDto);
+            }
+            catch (Exception ex)
+            {
+                return WebResponseContent.Instance.Error($"鏈烘鎵媨taskName}浠诲姟鍒涘缓澶辫触: {ex.Message}");
+            }
+        }
+
         #endregion WCS閫昏緫澶勭悊
 
         #region 鍒嗗鏌滄帴鍙�
@@ -629,30 +781,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