From e6b190354191122069b1a0518f050d6504f7ec5e Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 11 二月 2026 15:29:39 +0800
Subject: [PATCH] 重构WMS服务并简化逻辑
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 245 +++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 119 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 4dab813..4400580 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,21 +1,4 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
-/*----------------------------------------------------------------
- * 鍛藉悕绌洪棿锛歐IDESEA_TaskInfoService
- * 鍒涘缓鑰咃細鑳＄搴�
- * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
- * 鐗堟湰锛歏1.0.0
- * 鎻忚堪锛�
- *
- * ----------------------------------------------------------------
- * 淇敼浜猴細
- * 淇敼鏃堕棿锛�
- * 鐗堟湰锛歏1.0.1
- * 淇敼璇存槑锛�
- *
- *----------------------------------------------------------------*/
-#endregion << 鐗� 鏈� 娉� 閲� >>
-
-using AutoMapper;
+锘縰sing AutoMapper;
using SqlSugar;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.TaskEnum;
@@ -24,9 +7,6 @@
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -36,26 +16,27 @@
public partial class TaskService : ServiceBase<Dt_Task, IRepository<Dt_Task>>, ITaskService
{
private readonly IMapper _mapper;
- private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IStockInfoService _stockInfoService;
private readonly ILocationInfoService _locationInfoService;
public IRepository<Dt_Task> Repository => BaseDal;
- private Dictionary<string, OrderByType> _taskOrderBy = new()
- {
- {nameof(Dt_Task.Grade),OrderByType.Desc },
- {nameof(Dt_Task.CreateDate),OrderByType.Asc},
- };
+ private readonly Dictionary<string, OrderByType> _taskOrderBy = new()
+ {
+ { nameof(Dt_Task.Grade), OrderByType.Desc },
+ { nameof(Dt_Task.CreateDate), OrderByType.Asc },
+ };
public List<int> TaskTypes => typeof(TaskTypeEnum).GetEnumIndexList();
-
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
- public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
+ public TaskService(
+ IRepository<Dt_Task> BaseDal,
+ IMapper mapper,
+ IStockInfoService stockInfoService,
+ ILocationInfoService locationInfoService) : base(BaseDal)
{
_mapper = mapper;
- _unitOfWorkManage = unitOfWorkManage;
_stockInfoService = stockInfoService;
_locationInfoService = locationInfoService;
}
@@ -63,21 +44,21 @@
/// <summary>
/// 鍒涘缓浠诲姟锛堢粍鐩樺叆搴撲换鍔°�佺┖鎵樼洏鍥炲簱浠诲姟锛�
/// </summary>
- /// <param name="taskDto">瑕佸垱寤虹殑鍑哄簱浠诲姟鐨勮缁嗕俊鎭�備笉鑳戒负null銆�</param>
- /// <returns>鏄惁鎴愬姛</returns>
public async Task<WebResponseContent> CreateTaskInboundAsync(CreateTaskDto taskDto)
{
- WebResponseContent content = new WebResponseContent();
try
{
- if (string.IsNullOrWhiteSpace(taskDto.PalletCode) || string.IsNullOrWhiteSpace(taskDto.SourceAddress) || string.IsNullOrWhiteSpace(taskDto.TargetAddress) || string.IsNullOrWhiteSpace(taskDto.Roadway))
+ if (string.IsNullOrWhiteSpace(taskDto.PalletCode) ||
+ string.IsNullOrWhiteSpace(taskDto.SourceAddress) ||
+ string.IsNullOrWhiteSpace(taskDto.TargetAddress) ||
+ string.IsNullOrWhiteSpace(taskDto.Roadway))
{
- return content.Error("Invalid task details.");
+ return WebResponseContent.Instance.Error("Invalid task details.");
}
- if (taskDto.TaskType != TaskTypeEnum.Inbound || taskDto.TaskType != TaskTypeEnum.InEmpty)
+ if (taskDto.TaskType != TaskTypeEnum.Inbound && taskDto.TaskType != TaskTypeEnum.InEmpty)
{
- return content.Error("Invalid task details.");
+ return WebResponseContent.Instance.Error("Invalid task details.");
}
var task = new Dt_Task
@@ -97,66 +78,54 @@
Creater = "system"
};
- var result = await Repository.AddDataAsync(task) > 0 ? true : false;
- if (result)
- {
- var WmstaskDto = _mapper.Map<WMSTaskDTO>(task);
- return content.OK("浠诲姟鍒涘缓鎴愬姛", WmstaskDto);
- }
- else
- {
- return content.Error("浠诲姟鍒涘缓澶辫触");
- }
+ var result = await Repository.AddDataAsync(task) > 0;
+ if (!result) return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
+
+ var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
+ return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", wmstaskDto);
}
catch (Exception ex)
{
- return content.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
}
}
/// <summary>
- /// 鏍规嵁鎸囧畾鐨勪换鍔¤鎯呭紓姝ュ垱寤烘柊鐨勫嚭搴撲换鍔°��
+ /// 鏍规嵁鎸囧畾鐨勪换鍔¤鎯呭紓姝ュ垱寤烘柊鐨勫嚭搴撲换鍔�
/// </summary>
- /// <param name="taskDto">瑕佸垱寤虹殑鍑哄簱浠诲姟鐨勮缁嗕俊鎭�備笉鑳戒负null銆�</param>
- /// <returns>琛ㄧず寮傛鎿嶄綔鐨勪换鍔°�備换鍔＄粨鏋滃寘鍚〃绀哄凡鍒涘缓鐨勫嚭搴撲换鍔＄殑<see cref="WMSTaskDTO"/>锛屽鏋滀换鍔℃棤娉曞垱寤哄垯涓�<see langword="null"/>銆�</returns>
public async Task<WebResponseContent> CreateTaskOutboundAsync(CreateTaskDto taskDto)
{
- WebResponseContent content = new WebResponseContent();
try
{
+ var stockResult = await _stockInfoService.GetStockInfoAsync(taskDto.WarehouseId);
+ if (stockResult == null || !stockResult.Any())
+ return WebResponseContent.Instance.Error("鏈壘鍒板簱瀛樹俊鎭�");
- List<Dt_StockInfo>? stockResult = await _stockInfoService.GetStockInfoAsync(taskDto.WarehouseId);
- var taskList = new List<Dt_Task>();
- foreach (var item in stockResult)
+ var taskList = stockResult.Select(item => new Dt_Task
{
- var taskInfo = new Dt_Task()
- {
- WarehouseId = item.WarehouseId,
- PalletCode = item.PalletCode,
- PalletType = item.PalletType,
- SourceAddress = item.LocationCode,
- TargetAddress = taskDto.TargetAddress,
- Roadway = item.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.Outbound.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- Grade = 1,
- TaskNum = 0,
- CurrentAddress = item.LocationCode,
- NextAddress = taskDto.TargetAddress,
- Creater = "system",
-
- };
- taskList.Add(taskInfo);
- }
+ WarehouseId = item.WarehouseId,
+ PalletCode = item.PalletCode,
+ PalletType = item.PalletType,
+ SourceAddress = item.LocationCode,
+ TargetAddress = taskDto.TargetAddress,
+ Roadway = item.LocationDetails.RoadwayNo,
+ TaskType = TaskTypeEnum.Outbound.GetHashCode(),
+ TaskStatus = TaskStatusEnum.New.GetHashCode(),
+ Grade = 1,
+ TaskNum = 0,
+ CurrentAddress = item.LocationCode,
+ NextAddress = taskDto.TargetAddress,
+ Creater = "system",
+ }).ToList();
var result = await BaseDal.AddDataAsync(taskList) > 0;
var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
- return content.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto);
+ return WebResponseContent.Instance.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto);
}
- catch (Exception e)
+ catch (Exception ex)
{
- return content.Error($"浠诲姟鍒涘缓澶辫触: {e.Message}");
+ return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
}
}
@@ -164,76 +133,114 @@
/// <summary>
/// 鑾峰彇鍙叆搴撹揣浣�
/// </summary>
- /// <param name="warehouseId"></param>
- /// <param name="taskType"></param>
- /// <returns></returns>
public async Task<WebResponseContent> GetTasksLocationAsync(CreateTaskDto taskDto)
{
- WebResponseContent content = new WebResponseContent();
try
{
- var stockResult = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
- if (stockResult == null) return content.Error("鏈壘鍒板搴旂殑浠诲姟");
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
+ if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
+ var locationInfo = await _locationInfoService.GetLocationInfo(task.Roadway);
+ if (locationInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
- var locationInfo = await _locationInfoService.GetLocationInfo(stockResult.Roadway);
- if (locationInfo == null) return content.Error("鏈壘鍒板搴旂殑璐т綅");
-
- // 鏇存柊璐т綅淇℃伅
locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
+ task.CurrentAddress = taskDto.SourceAddress;
+ task.NextAddress = locationInfo.LocationCode;
+ task.TargetAddress = taskDto.TargetAddress;
+ task.TaskStatus = TaskStatusEnum.Line_Finish.GetHashCode();
- // 璺熸柊浠诲姟淇℃伅
- stockResult.CurrentAddress = taskDto.SourceAddress;
- stockResult.NextAddress = locationInfo.LocationCode;
- stockResult.TargetAddress = taskDto.TargetAddress;
- stockResult.TaskStatus = TaskStatusEnum.Line_Finish.GetHashCode();
-
- var updateResult = await BaseDal.UpdateDataAsync(stockResult);
+ var updateResult = await BaseDal.UpdateDataAsync(task);
var locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
- return content.OK(updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触", locationInfo.LocationCode);
+ return WebResponseContent.Instance.OK(
+ updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触",
+ locationInfo.LocationCode);
}
catch (Exception ex)
{
- return content.Error($"鑾峰彇浠诲姟澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"鑾峰彇浠诲姟澶辫触: {ex.Message}");
}
}
- // 浠诲姟瀹屾垚銆傛坊鍔犲簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
- public async Task<WebResponseContent> FinishTaskAsync(CreateTaskDto taskDto)
+ /// <summary>
+ /// 鍏ュ簱浠诲姟瀹屾垚锛氭坊鍔犲簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
+ /// </summary>
+ public async Task<WebResponseContent> InboundFinishTaskAsync(CreateTaskDto taskDto)
{
- WebResponseContent content = new WebResponseContent();
try
{
- var taskResult = await BaseDal.QueryFirstAsync(s => s.PalletCode == taskDto.PalletCode);
- if (taskResult == null) return content.Error("鏈壘鍒板搴旂殑浠诲姟");
- var locationResult = await _locationInfoService.GetLocationInfo(taskResult.Roadway, taskDto.PalletCode);
- if (locationResult == null) return content.Error("鏈壘鍒板搴旂殑璐т綅");
+ 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);
- stockInfo.LocationCode = locationResult.LocationCode;
- stockInfo.LocationId = locationResult.Id;
- stockInfo.OutboundDate = taskResult.Roadway.Contains("GW") ? DateTime.Now.AddHours(2) : taskResult.Roadway.Contains("CW") ? DateTime.Now.AddHours(1) : DateTime.Now.AddHours(0);
+ 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
+ };
- // 淇敼璐т綅鐘舵��
- locationResult.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationResult);
- var addStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
- if (!updateLocationResult || !addStockResult) return content.Error("浠诲姟瀹屾垚澶辫触");
+ location.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
- // 鍒犻櫎浠诲姟鏁版嵁
- var deleteTaskResult = await BaseDal.DeleteDataAsync(taskResult);
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- // 娣诲姞鍘嗗彶浠诲姟鏁版嵁
- var historyTask = _mapper.Map<Dt_Task_Hty>(taskResult);
+ var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
historyTask.InsertTime = DateTime.Now;
- if (!deleteTaskResult) return content.Error("浠诲姟瀹屾垚澶辫触");
- return content.OK("浠诲姟瀹屾垚");
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
}
catch (Exception ex)
{
- return content.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚 锛氫慨鏀瑰簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
+ /// </summary>
+ public async Task<WebResponseContent> OutboundFinishTaskAsync(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); stockInfo.LocationCode = location.LocationCode;
+ stockInfo.LocationId = location.Id;
+ stockInfo.OutboundDate = DateTime.Now;
+
+ 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 deleteTaskResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
}
}
}
--
Gitblit v1.9.3