From a200871400d465620d45189b8068fafd0d95e01a Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 31 三月 2026 10:38:05 +0800
Subject: [PATCH] refactor: 整理TaskService任务流程结构
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs | 120 +++++++++---------------------------------------------------
1 files changed, 18 insertions(+), 102 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
index 76a54ef..4ee2d5b 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_WCS.cs
@@ -249,8 +249,8 @@
{
OutTaskCompleteDto outTaskCompleteDto = new OutTaskCompleteDto()
{
- TaskId = task.OrderNo,
- DevId = task.TargetAddress,
+ TaskId = task.OrderNo ?? string.Empty,
+ DevId = task.TargetAddress ?? string.Empty,
ReqTime = DateTime.Now.ToString()
};
return await OutTaskComplete(outTaskCompleteDto);
@@ -260,7 +260,7 @@
return await ExecuteWithinTransactionAsync(async () =>
{
stockInfo.LocationId = 0;
- stockInfo.LocationCode = null;
+ stockInfo.LocationCode = string.Empty;
stockInfo.OutboundDate = DateTime.Now;
location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
@@ -396,19 +396,13 @@
if (!updateLocationResult || !updateStockResult)
return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- // 淇濆瓨浠诲姟鍘嗗彶
- var historyTask = _mapper.Map<Dt_Task_Hty>(task);
- historyTask.InsertTime = DateTime.Now;
- historyTask.OperateType = "绌烘墭鐩樺叆搴撳畬鎴�";
- if (await _task_HtyService.Repository.AddDataAsync(historyTask) <= 0)
- return WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+ var saveTaskHistoryResult = await SaveTaskHistoryAsync(task, "绌烘墭鐩樺叆搴撳畬鎴�");
+ if (!saveTaskHistoryResult.Status)
+ return saveTaskHistoryResult;
- // 淇濆瓨搴撳瓨鍘嗗彶
- var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
- historyStock.InsertTime = DateTime.Now;
- historyStock.OperateType = "绌烘墭鐩樺叆搴撳畬鎴�";
- if (await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) <= 0)
- return WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+ var saveStockHistoryResult = await SaveStockHistoryAsync(stockInfo, "绌烘墭鐩樺叆搴撳畬鎴�");
+ if (!saveStockHistoryResult.Status)
+ return saveStockHistoryResult;
var deleteResult = await BaseDal.DeleteDataAsync(task);
if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
@@ -483,7 +477,7 @@
return await ExecuteWithinTransactionAsync(async () =>
{
stockInfo.LocationId = 0;
- stockInfo.LocationCode = null;
+ stockInfo.LocationCode = string.Empty;
stockInfo.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.GetHashCode();
location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
@@ -493,19 +487,13 @@
if (!updateLocationResult || !updateStockResult)
return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- // 淇濆瓨浠诲姟鍘嗗彶
- var historyTask = _mapper.Map<Dt_Task_Hty>(task);
- historyTask.InsertTime = DateTime.Now;
- historyTask.OperateType = "绌烘墭鐩樺嚭搴撳畬鎴�";
- if (await _task_HtyService.Repository.AddDataAsync(historyTask) <= 0)
- return WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+ var saveTaskHistoryResult = await SaveTaskHistoryAsync(task, "绌烘墭鐩樺嚭搴撳畬鎴�");
+ if (!saveTaskHistoryResult.Status)
+ return saveTaskHistoryResult;
- // 淇濆瓨搴撳瓨鍘嗗彶
- var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
- historyStock.InsertTime = DateTime.Now;
- historyStock.OperateType = "绌烘墭鐩樺嚭搴撳畬鎴�";
- if (await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) <= 0)
- return WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+ var saveStockHistoryResult = await SaveStockHistoryAsync(stockInfo, "绌烘墭鐩樺嚭搴撳畬鎴�");
+ if (!saveStockHistoryResult.Status)
+ return saveStockHistoryResult;
var deleteResult = await BaseDal.DeleteDataAsync(task);
if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
@@ -542,78 +530,6 @@
{
return WebResponseContent.Instance.Error($"淇敼澶辫触: {ex.Message}");
}
- }
-
- /// <summary>
- /// 鏌ユ壘鎵樼洏鏄惁鏈変换鍔�
- /// </summary>
- /// <param name="palletCode"></param>
- /// <returns></returns>
- private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
- {
- try
- {
- var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
- if (task == null)
- return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- var taskDto = _mapper.Map<WMSTaskDTO>(task);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDto);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊锛堝垹闄や换鍔℃暟鎹級
- /// </summary>
- private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, string operateType = "")
- {
- var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
- if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
-
- var historyTask = _mapper.Map<Dt_Task_Hty>(task);
- historyTask.InsertTime = DateTime.Now;
- historyTask.OperateType = operateType;
- var saveResult = await _task_HtyService.Repository.AddDataAsync(historyTask) > 0;
- if (!saveResult) return WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
-
- return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
- }
-
- /// <summary>
- /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃锛堟敮鎸佸鍑哄簱鍙ｈ疆璇級
- /// </summary>
- private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
- {
- if (string.IsNullOrWhiteSpace(roadway))
- return "10080";
-
- // 鏌ユ壘鍖归厤鐨勫贩閬撳墠缂�
- string matchedPrefix = null;
- foreach (var kvp in addressMap)
- {
- if (roadway.Contains(kvp.Key))
- {
- matchedPrefix = kvp.Key;
- break;
- }
- }
-
- if (matchedPrefix == null)
- return "10080";
-
- var addresses = addressMap[matchedPrefix];
- if (addresses == null || addresses.Count == 0)
- return "10080";
-
- // 鍗曚釜鍦板潃锛岀洿鎺ヨ繑鍥�
- if (addresses.Count == 1)
- return addresses[0];
-
- // 澶氫釜鍦板潃锛屼娇鐢ㄨ疆璇㈡湇鍔�
- return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
}
/// <summary>
@@ -865,7 +781,7 @@
TaskNum = await BaseDal.GetTaskNo(),
PalletCode = palletCode,
PalletType = stockInfo?.PalletType ?? 0,
- Roadway = stock.Roadway,
+ Roadway = stock.Roadway ?? string.Empty,
TaskType = taskType.GetHashCode(),
TaskStatus = TaskRobotStatusEnum.RobotNew.GetHashCode(),
SourceAddress = sourceLineNo,
@@ -882,7 +798,7 @@
if (!result)
return WebResponseContent.Instance.Error($"鏈烘鎵媨taskName}浠诲姟鍒涘缓澶辫触");
- var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
+ var wmstaskDto = _mapper.Map<WMSTaskDTO>(task) ?? new WMSTaskDTO();
return WebResponseContent.Instance.OK($"鏈烘鎵媨taskName}浠诲姟鍒涘缓鎴愬姛", wmstaskDto);
}
catch (Exception ex)
--
Gitblit v1.9.3