From 75f34e9ba2e8b249c96333f3d7936c8968e12ec7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期三, 11 二月 2026 14:44:12 +0800
Subject: [PATCH] 集成WMS调用与入库任务处理
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 205 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 172 insertions(+), 33 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 48ec9bb..4dab813 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -17,7 +17,9 @@
using AutoMapper;
using SqlSugar;
+using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Task;
@@ -35,6 +37,8 @@
{
private readonly IMapper _mapper;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IStockInfoService _stockInfoService;
+ private readonly ILocationInfoService _locationInfoService;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -48,54 +52,189 @@
public List<int> TaskOutboundTypes => typeof(TaskTypeEnum).GetEnumIndexList();
- public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IStockInfoService stockInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
{
_mapper = mapper;
_unitOfWorkManage = unitOfWorkManage;
+ _stockInfoService = stockInfoService;
+ _locationInfoService = locationInfoService;
}
/// <summary>
/// 鍒涘缓浠诲姟锛堢粍鐩樺叆搴撲换鍔°�佺┖鎵樼洏鍥炲簱浠诲姟锛�
/// </summary>
- /// <param name="palletCode">鎵樼洏鍙�</param>
- /// <param name="sourceAddress">璧峰鍦板潃</param>
- /// <param name="targetAddress">鐩爣鍦板潃</param>
- /// <param name="roadway">宸烽亾鍙�</param>
- /// <param name="warehouseId">浠撳簱涓婚敭</param>
- /// <param name="palletType">鎵樼洏绫诲瀷</param>
- /// <param name="taskType">浠诲姟绫诲瀷</param>
+ /// <param name="taskDto">瑕佸垱寤虹殑鍑哄簱浠诲姟鐨勮缁嗕俊鎭�備笉鑳戒负null銆�</param>
/// <returns>鏄惁鎴愬姛</returns>
- public async Task<Dt_Task?> CreateTaskInboundAsync(CreateTaskDto taskDto)
+ public async Task<WebResponseContent> CreateTaskInboundAsync(CreateTaskDto taskDto)
{
- if (string.IsNullOrWhiteSpace(taskDto.PalletCode) || string.IsNullOrWhiteSpace(taskDto.SourceAddress) || string.IsNullOrWhiteSpace(taskDto.TargetAddress) || string.IsNullOrWhiteSpace(taskDto.Roadway))
+ WebResponseContent content = new WebResponseContent();
+ try
{
- return null;
+ if (string.IsNullOrWhiteSpace(taskDto.PalletCode) || string.IsNullOrWhiteSpace(taskDto.SourceAddress) || string.IsNullOrWhiteSpace(taskDto.TargetAddress) || string.IsNullOrWhiteSpace(taskDto.Roadway))
+ {
+ return content.Error("Invalid task details.");
+ }
+
+ if (taskDto.TaskType != TaskTypeEnum.Inbound || taskDto.TaskType != TaskTypeEnum.InEmpty)
+ {
+ return content.Error("Invalid task details.");
+ }
+
+ var task = new Dt_Task
+ {
+ TaskNum = 0,
+ PalletCode = taskDto.PalletCode,
+ PalletType = taskDto.PalletType,
+ Roadway = taskDto.Roadway,
+ TaskType = taskDto.TaskType.GetHashCode(),
+ TaskStatus = TaskStatusEnum.New.GetHashCode(),
+ SourceAddress = taskDto.SourceAddress,
+ TargetAddress = taskDto.TargetAddress,
+ CurrentAddress = taskDto.SourceAddress,
+ NextAddress = taskDto.TargetAddress,
+ WarehouseId = taskDto.WarehouseId,
+ Grade = 1,
+ 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("浠诲姟鍒涘缓澶辫触");
+ }
}
-
- if (taskDto.TaskType != TaskTypeEnum.Inbound || taskDto.TaskType != TaskTypeEnum.InEmpty)
+ catch (Exception ex)
{
- return null;
+ return content.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
}
-
- var task = new Dt_Task
- {
- TaskNum = 0,
- PalletCode = taskDto.PalletCode,
- PalletType = taskDto.PalletType,
- Roadway = taskDto.Roadway,
- TaskType = taskDto.TaskType.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- SourceAddress = taskDto.SourceAddress,
- TargetAddress = taskDto.TargetAddress,
- CurrentAddress = taskDto.SourceAddress,
- NextAddress = taskDto.TargetAddress,
- WarehouseId = taskDto.WarehouseId,
- Grade = 1,
- Creater = "system"
- };
-
- return await Repository.AddDataAsync(task) > 0 ? task : null;
}
+
+ /// <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
+ {
+
+ List<Dt_StockInfo>? stockResult = await _stockInfoService.GetStockInfoAsync(taskDto.WarehouseId);
+ var taskList = new List<Dt_Task>();
+ foreach (var item in stockResult)
+ {
+ 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);
+ }
+
+ var result = await BaseDal.AddDataAsync(taskList) > 0;
+ var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
+ return content.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto);
+ }
+ catch (Exception e)
+ {
+ return content.Error($"浠诲姟鍒涘缓澶辫触: {e.Message}");
+ }
+ }
+
+
+ /// <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 locationInfo = await _locationInfoService.GetLocationInfo(stockResult.Roadway);
+ if (locationInfo == null) return content.Error("鏈壘鍒板搴旂殑璐т綅");
+
+ // 鏇存柊璐т綅淇℃伅
+ locationInfo.LocationStatus = LocationStatusEnum.FreeLock.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 locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+
+ return content.OK(updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触", locationInfo.LocationCode);
+ }
+ catch (Exception ex)
+ {
+ return content.Error($"鑾峰彇浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ // 浠诲姟瀹屾垚銆傛坊鍔犲簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
+ public async Task<WebResponseContent> FinishTaskAsync(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 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);
+
+ // 淇敼璐т綅鐘舵��
+ locationResult.LocationStatus = LocationStatusEnum.InStock.GetHashCode();
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationResult);
+ var addStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !addStockResult) return content.Error("浠诲姟瀹屾垚澶辫触");
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var deleteTaskResult = await BaseDal.DeleteDataAsync(taskResult);
+
+ // 娣诲姞鍘嗗彶浠诲姟鏁版嵁
+ var historyTask = _mapper.Map<Dt_Task_Hty>(taskResult);
+ historyTask.InsertTime = DateTime.Now;
+ if (!deleteTaskResult) return content.Error("浠诲姟瀹屾垚澶辫触");
+ return content.OK("浠诲姟瀹屾垚");
+ }
+ catch (Exception ex)
+ {
+ return content.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
+ }
+ }
}
}
--
Gitblit v1.9.3