From 682413a01effa5ae936e418fecdfd72f670d09ab Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期六, 11 四月 2026 17:14:32 +0800
Subject: [PATCH] feat(出库任务): 实现高温2号出库到CWSC1时自动创建入库任务
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 343 ++++++++++++++++++++++++--------------------------------
1 files changed, 149 insertions(+), 194 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 4dab813..f64135c 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,31 +1,25 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
-/*----------------------------------------------------------------
- * 鍛藉悕绌洪棿锛歐IDESEA_TaskInfoService
- * 鍒涘缓鑰咃細鑳＄搴�
- * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
- * 鐗堟湰锛歏1.0.0
- * 鎻忚堪锛�
- *
- * ----------------------------------------------------------------
- * 淇敼浜猴細
- * 淇敼鏃堕棿锛�
- * 鐗堟湰锛歏1.0.1
- * 淇敼璇存槑锛�
- *
- *----------------------------------------------------------------*/
-#endregion << 鐗� 鏈� 娉� 閲� >>
-
-using AutoMapper;
+using Mapster;
+using MapsterMapper;
+using Microsoft.Extensions.Configuration;
using SqlSugar;
+using System.DirectoryServices.Protocols;
+using System.Text.Json;
+using WIDESEA_Common.Constants;
using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Core;
+using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO.GradingMachine;
+using WIDESEA_DTO.MES;
+using WIDESEA_DTO.Stock;
using WIDESEA_DTO.Task;
using WIDESEA_IBasicService;
-using WIDESEA_IInboundService;
-using WIDESEA_IOutboundService;
using WIDESEA_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
@@ -36,205 +30,166 @@
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;
+ 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;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IRecordService _recordService;
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,
+ HttpClientHelper httpClientHelper,
+ IConfiguration configuration,
+ RoundRobinService roundRobinService,
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage,
+ IRecordService recordService) : base(BaseDal)
{
_mapper = mapper;
- _unitOfWorkManage = unitOfWorkManage;
_stockInfoService = stockInfoService;
_locationInfoService = locationInfoService;
+ _httpClientHelper = httpClientHelper;
+ _configuration = configuration;
+ _roundRobinService = roundRobinService;
+ _mesService = mesService;
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
+ _unitOfWorkManage = unitOfWorkManage;
+ _recordService = recordService;
}
/// <summary>
- /// 鍒涘缓浠诲姟锛堢粍鐩樺叆搴撲换鍔°�佺┖鎵樼洏鍥炲簱浠诲姟锛�
+ /// 鏌ユ壘鎵樼洏鏄惁瀛樺湪鏈畬鎴愪换鍔°��
/// </summary>
- /// <param name="taskDto">瑕佸垱寤虹殑鍑哄簱浠诲姟鐨勮缁嗕俊鎭�備笉鑳戒负null銆�</param>
- /// <returns>鏄惁鎴愬姛</returns>
- public async Task<WebResponseContent> CreateTaskInboundAsync(CreateTaskDto taskDto)
+ private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
{
- WebResponseContent content = new WebResponseContent();
try
{
- if (string.IsNullOrWhiteSpace(taskDto.PalletCode) || string.IsNullOrWhiteSpace(taskDto.SourceAddress) || string.IsNullOrWhiteSpace(taskDto.TargetAddress) || string.IsNullOrWhiteSpace(taskDto.Roadway))
- {
- return content.Error("Invalid task details.");
- }
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+ if (task == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- if (taskDto.TaskType != TaskTypeEnum.Inbound || taskDto.TaskType != TaskTypeEnum.InEmpty)
- {
- return content.Error("Invalid task details.");
- }
+ var taskDto = _mapper.Map<WMSTaskDTO>(task);
+ return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDto);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
+ }
+ }
- var task = new Dt_Task
+ /// <summary>
+ /// 淇濆瓨浠诲姟鍘嗗彶銆�
+ /// </summary>
+ private async Task<WebResponseContent> SaveTaskHistoryAsync(Dt_Task task, string operateType)
+ {
+ var historyTask = _mapper.Map<Dt_Task_Hty>(task);
+ historyTask.InsertTime = DateTime.Now;
+ historyTask.OperateType = operateType;
+
+ var saved = await _task_HtyService.Repository.AddDataAsync(historyTask) > 0;
+ return saved
+ ? WebResponseContent.Instance.OK()
+ : WebResponseContent.Instance.Error("浠诲姟鍘嗗彶淇濆瓨澶辫触");
+ }
+
+ /// <summary>
+ /// 淇濆瓨搴撳瓨鍘嗗彶銆�
+ /// </summary>
+ private async Task<WebResponseContent> SaveStockHistoryAsync(Dt_StockInfo stockInfo, string operateType)
+ {
+ var historyStock = _mapper.Map<Dt_StockInfo_Hty>(stockInfo);
+ historyStock.InsertTime = DateTime.Now;
+ historyStock.OperateType = operateType;
+
+ var saved = await _stockInfo_HtyService.Repository.AddDataAsync(historyStock) > 0;
+ return saved
+ ? WebResponseContent.Instance.OK()
+ : WebResponseContent.Instance.Error("搴撳瓨鍘嗗彶淇濆瓨澶辫触");
+ }
+
+ /// <summary>
+ /// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊銆�
+ /// </summary>
+ private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task, string operateType = "")
+ {
+ var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteTaskResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return await SaveTaskHistoryAsync(task, operateType);
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸烽亾纭畾鐩爣鍦板潃锛屾敮鎸佸鍑哄簱鍙ｈ疆璇€��
+ /// </summary>
+ private string DetermineTargetAddress(string roadway, Dictionary<string, List<string>> addressMap)
+ {
+ if (string.IsNullOrWhiteSpace(roadway))
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ string? matchedPrefix = null;
+ foreach (var kvp in addressMap)
+ {
+ if (roadway.Contains(kvp.Key))
{
- 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"
+ matchedPrefix = kvp.Key;
+ break;
+ }
+ }
+
+ if (matchedPrefix == null)
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
+ return TaskAddressConstants.DEFAULT_ADDRESS;
+
+ if (addresses.Count == 1)
+ return addresses[0];
+
+ return _roundRobinService.GetNextAddress(matchedPrefix, addresses);
+ }
+
+ /// <summary>
+ /// 鏍规嵁搴撳瓨 Remark 纭畾鐩爣鍦板潃锛圙W_1鈫抂11001,11010]杞锛孏W_2鈫扖WSC1锛孋W_1鈫�22001锛夈��
+ /// </summary>
+ private string DetermineTargetAddressByRemark(string remark, string roadway, Dictionary<string, List<string>> addressMap)
+ {
+ // 鏍规嵁 Remark 纭畾鐩爣鍦板潃
+ if (!string.IsNullOrWhiteSpace(remark))
+ {
+ return remark switch
+ {
+ StockRemarkConstants.GW1 => _roundRobinService.GetNextAddress(StockRemarkConstants.GW1, TaskAddressConstants.GW1_ADDRESSES.ToList()),
+ StockRemarkConstants.GW2 => TaskAddressConstants.GW2_ADDRESS,
+ StockRemarkConstants.CW1 => TaskAddressConstants.CW1_ADDRESS,
+ _ => DetermineTargetAddress(roadway, addressMap)
};
-
- 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("浠诲姟鍒涘缓澶辫触");
- }
}
- catch (Exception ex)
- {
- return content.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
- {
-
- 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}");
- }
+ // Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
+ return DetermineTargetAddress(roadway, addressMap);
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3