From 1fb400ef4e1169146296681e58185097d479e48f Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期五, 10 四月 2026 22:10:50 +0800
Subject: [PATCH] feat(任务服务): 根据库存Remark确定目标地址并移除MES出站调用
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 909 ++++----------------------------------------------------
1 files changed, 69 insertions(+), 840 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 0464857..e06a6cf 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -2,20 +2,24 @@
using MapsterMapper;
using Microsoft.Extensions.Configuration;
using SqlSugar;
+using System.DirectoryServices.Protocols;
using System.Text.Json;
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_IRecordService;
using WIDESEA_IStockService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
@@ -31,6 +35,10 @@
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;
@@ -51,7 +59,11 @@
HttpClientHelper httpClientHelper,
IConfiguration configuration,
RoundRobinService roundRobinService,
- IMesService mesService) : base(BaseDal)
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage,
+ IRecordService recordService) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -60,387 +72,15 @@
_configuration = configuration;
_roundRobinService = roundRobinService;
_mesService = mesService;
- }
-
- #region WCS閫昏緫澶勭悊
-
- /// <summary>
- /// 鍒涘缓浠诲姟锛堢粍鐩樺叆搴撲换鍔°�佺┖鎵樼洏鍥炲簱浠诲姟锛�
- /// </summary>
- public async Task<WebResponseContent> CreateTaskInboundAsync(CreateTaskDto taskDto)
- {
- try
- {
- WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
- if (content.Status)
- {
- return content;
- }
-
- if (string.IsNullOrWhiteSpace(taskDto.PalletCode) ||
- string.IsNullOrWhiteSpace(taskDto.Roadway))
- {
- return WebResponseContent.Instance.Error("鏃犳晥鐨勪换鍔¤鎯�");
- }
-
- if (taskDto.TaskType != TaskTypeEnum.Inbound && taskDto.TaskType != TaskTypeEnum.InEmpty)
- {
- return WebResponseContent.Instance.Error("鏃犳晥鐨勪换鍔¤鎯�");
- }
-
- // 浣跨敤 switch 琛ㄨ揪寮忔槧灏勪换鍔＄被鍨�
- int taskInboundType = taskDto.TaskType switch
- {
- TaskTypeEnum.Inbound => TaskInboundTypeEnum.Inbound.GetHashCode(),
- TaskTypeEnum.InEmpty => TaskInboundTypeEnum.InEmpty.GetHashCode(),
- _ => 0 // 鐞嗚涓婁笉浼氳蛋鍒拌繖閲岋紝鍥犱负宸茬粡楠岃瘉杩囦簡
- };
-
- var task = new Dt_Task
- {
- TaskNum = await BaseDal.GetTaskNo(),
- PalletCode = taskDto.PalletCode,
- PalletType = taskDto.PalletType,
- Roadway = taskDto.Roadway,
- TaskType = taskInboundType,
- TaskStatus = TaskInStatusEnum.InNew.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;
- if (!result) return WebResponseContent.Instance.Error("浠诲姟鍒涘缓澶辫触");
-
- var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
- return WebResponseContent.Instance.OK("浠诲姟鍒涘缓鎴愬姛", wmstaskDto);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
- }
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
+ _unitOfWorkManage = unitOfWorkManage;
+ _recordService = recordService;
}
/// <summary>
- /// 鏍规嵁鎸囧畾鐨勪换鍔¤鎯呭紓姝ュ垱寤烘柊鐨勫嚭搴撲换鍔�
+ /// 鏌ユ壘鎵樼洏鏄惁瀛樺湪鏈畬鎴愪换鍔°��
/// </summary>
- public async Task<WebResponseContent> CreateTaskOutboundAsync(CreateTaskDto taskDto)
- {
- try
- {
- var stockResult = await _stockInfoService.GetStockInfoAsync(taskDto.WarehouseId);
- if (stockResult == null || !stockResult.Any())
- return WebResponseContent.Instance.Error("鏈壘鍒板簱瀛樹俊鎭�");
-
- var taskList = stockResult.Select(item => 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",
- }).ToList();
-
- var result = await BaseDal.AddDataAsync(taskList) > 0;
- var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
- return WebResponseContent.Instance.OK(result ? "浠诲姟鍒涘缓鎴愬姛" : "浠诲姟鍒涘缓澶辫触", wmstaskDto ?? new object());
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"浠诲姟鍒涘缓澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鑾峰彇鍙叆搴撹揣浣�
- /// </summary>
- public async Task<WebResponseContent> GetTasksLocationAsync(CreateTaskDto taskDto)
- {
- try
- {
- 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("鏈壘鍒板搴旂殑璐т綅");
-
- 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 updateTaskResult = await BaseDal.UpdateDataAsync(task);
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
- if (!updateTaskResult || !updateLocationResult)
- {
- return WebResponseContent.Instance.Error("浠诲姟鏇存柊澶辫触");
- }
-
- return WebResponseContent.Instance.OK("浠诲姟鏇存柊鎴愬姛", locationInfo.LocationCode);
- });
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鑾峰彇浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚锛氭坊鍔犲簱瀛橈紝淇敼璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁锛屾坊鍔犲巻鍙蹭换鍔℃暟鎹�
- /// </summary>
- public async Task<WebResponseContent> InboundFinishTaskAsync(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.TargetAddress);
- if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
-
- var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
- if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
-
- return await ExecuteWithinTransactionAsync(async () =>
- {
- WebResponseContent content = new WebResponseContent();
- 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();
-
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
- var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
- if (!updateLocationResult || !updateStockResult)
- return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- // 璋冪敤MES鎵樼洏杩涚珯
- var inboundRequest = new InboundInContainerRequest
- {
- EquipmentCode = "STK-GROUP-001",
- ResourceCode = "STK-GROUP-001",
- LocalTime = DateTime.Now,
- ContainerCode = taskDto.PalletCode
- };
- var inboundResult = _mesService.InboundInContainer(inboundRequest);
- if (inboundResult == null || inboundResult.Data == null || !inboundResult.Data.IsSuccess)
- {
- return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES杩涚珯澶辫触: {inboundResult?.Data?.Msg ?? inboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
- }
- return await CompleteTaskAsync(task);
- });
- }
- catch (Exception ex)
- {
- 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);
- if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
-
- return await ExecuteWithinTransactionAsync(async () =>
- {
- stockInfo.LocationId = 0;
- stockInfo.LocationCode = null;
- 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("浠诲姟瀹屾垚澶辫触");
- return await CompleteTaskAsync(task);
- });
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 绉诲簱浠诲姟瀹屾垚锛氫慨鏀瑰簱瀛樹綅缃笌鐘舵�侊紝淇敼婧�/鐩爣璐т綅鐘舵�侊紝鍒犻櫎浠诲姟鏁版嵁
- /// </summary>
- public async Task<WebResponseContent> RelocationFinishTaskAsync(CreateTaskDto taskDto)
- {
- try
- {
- var task = await BaseDal.QueryFirstAsync(s =>
- s.PalletCode == taskDto.PalletCode &&
- s.TaskType == TaskRelocationTypeEnum.Relocation.GetHashCode());
- if (task == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑绉诲簱浠诲姟");
-
- var sourceLocation = await _locationInfoService.GetLocationInfo(task.Roadway, task.SourceAddress);
- if (sourceLocation == null) return WebResponseContent.Instance.Error("鏈壘鍒扮Щ搴撴簮璐т綅");
-
- var targetLocation = await _locationInfoService.GetLocationInfo(task.Roadway, task.TargetAddress);
- if (targetLocation == null) return WebResponseContent.Instance.Error("鏈壘鍒扮Щ搴撶洰鏍囪揣浣�");
-
- var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
- if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
-
- 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();
-
- 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("绉诲簱浠诲姟瀹屾垚澶辫触");
-
- return await CompleteTaskAsync(task);
- });
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍒涘缓绌烘墭鐩樺叆搴撲换鍔�
- /// </summary>
- /// <param name="taskDto"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> CreateTaskInboundTrayAsync(CreateTaskDto taskDto)
- {
- try
- {
- WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
- if (content.Status)
- {
- return content;
- }
-
- //var tasks = await BaseDal.QueryAsync(s => s.PalletCode == palletCode);
- //if (tasks == null || !tasks.Any())
- // return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- //var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛"/*, taskDtos*/);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
- /// </summary>
- /// <param name="taskDto"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> GetOutBoundTrayTaskAsync(CreateTaskDto taskDto)
- {
- try
- {
-
- 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("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
-
- var task = new Dt_Task()
- {
- WarehouseId = stockInfo.LocationDetails.WarehouseId,
- PalletCode = stockInfo.PalletCode,
- PalletType = stockInfo.PalletType,
- SourceAddress = stockInfo.LocationCode,
- CurrentAddress = stockInfo.LocationCode,
- NextAddress = taskDto.TargetAddress,
- TargetAddress = taskDto.TargetAddress,
- Roadway = stockInfo.LocationDetails.RoadwayNo,
- TaskType = TaskOutboundTypeEnum.OutEmpty.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- Grade = 1,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "system",
- };
- 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)
- {
- return WebResponseContent.Instance.Error($"鏌ヨ浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <summary>
- /// 淇敼浠诲姟鐘舵�侊紙鏍规嵁浠诲姟ID淇敼涓烘寚瀹氱姸鎬侊級
- /// </summary>
- /// <param name="taskId"></param>
- /// <param name="newStatus"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> UpdateTaskByStatusAsync(int taskId, int newStatus)
- {
- try
- {
- var tasks = await BaseDal.QueryFirstAsync(s => s.TaskNum == taskId);
- if (tasks == null)
- return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
-
- tasks.TaskStatus = newStatus;
- await BaseDal.UpdateDataAsync(tasks);
-
- return WebResponseContent.Instance.OK("淇敼鎴愬姛", tasks);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"淇敼澶辫触: {ex.Message}");
- }
- }
-
-
- /// <summary>
- /// 鏌ユ壘鎵樼洏鏄惁鏈変换鍔�
- /// </summary>
- /// <param name="palletCode"></param>
- /// <returns></returns>
private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
{
try
@@ -448,6 +88,7 @@
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);
}
@@ -458,30 +99,56 @@
}
/// <summary>
- /// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊锛堝垹闄や换鍔℃暟鎹級
+ /// 淇濆瓨浠诲姟鍘嗗彶銆�
/// </summary>
- private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task)
+ private async Task<WebResponseContent> SaveTaskHistoryAsync(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;
- return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ 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 "10080";
- // 鏌ユ壘鍖归厤鐨勫贩閬撳墠缂�
- string matchedPrefix = null;
+ string? matchedPrefix = null;
foreach (var kvp in addressMap)
{
if (roadway.Contains(kvp.Key))
@@ -494,472 +161,34 @@
if (matchedPrefix == null)
return "10080";
- var addresses = addressMap[matchedPrefix];
- if (addresses == null || addresses.Count == 0)
+ if (!addressMap.TryGetValue(matchedPrefix, out var addresses) || addresses == null || addresses.Count == 0)
return "10080";
- // 鍗曚釜鍦板潃锛岀洿鎺ヨ繑鍥�
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>
- public async Task<WebResponseContent> CreateAutoOutboundTasksAsync()
+ private string DetermineTargetAddressByRemark(string remark, string roadway, Dictionary<string, List<string>> addressMap)
{
- try
+ // 鏍规嵁 Remark 纭畾鐩爣鍦板潃
+ if (!string.IsNullOrWhiteSpace(remark))
{
- // 1. 鏌ヨ鍒版湡搴撳瓨
- var expiredStocks = await _stockInfoService.Repository
- .QueryDataNavAsync(s => s.OutboundDate <= DateTime.Now
- && s.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode());
-
- if (expiredStocks == null || !expiredStocks.Any())
+ return remark switch
{
- return WebResponseContent.Instance.OK("鏃犲埌鏈熷簱瀛橀渶瑕佸鐞�");
- }
-
- // 杩囨护鏈変綅缃笖浣嶇疆鏈夊簱瀛樼殑璁板綍
- expiredStocks = expiredStocks
- .Where(s => s.LocationDetails != null
- && s.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode())
- .ToList();
-
- if (!expiredStocks.Any())
- {
- return WebResponseContent.Instance.OK("鏃犵鍚堟潯浠剁殑鍒版湡搴撳瓨");
- }
-
- // 2. 妫�鏌ュ凡瀛樺湪鐨勪换鍔�
- var palletCodes = expiredStocks.Select(s => s.PalletCode).ToList();
- var existingTasks = await Repository.QueryDataAsync(t =>
- palletCodes.Contains(t.PalletCode)
- && (t.TaskStatus == TaskStatusEnum.New.GetHashCode()
- || t.TaskStatus == TaskStatusEnum.SC_Executing.GetHashCode()
- || t.TaskStatus == TaskInStatusEnum.InNew.GetHashCode()));
-
- var processedPallets = existingTasks.Select(t => t.PalletCode).ToHashSet();
-
- // 3. 绛涢�夐渶瑕佸鐞嗙殑搴撳瓨
- var stocksToProcess = expiredStocks
- .Where(s => !processedPallets.Contains(s.PalletCode))
- .ToList();
-
- if (!stocksToProcess.Any())
- {
- return WebResponseContent.Instance.OK("鎵�鏈夊埌鏈熷簱瀛樺凡瀛樺湪浠诲姟");
- }
-
- // 4. 鑾峰彇閰嶇疆鐨勭洰鏍囧湴鍧�鏄犲皠
- var targetAddressMap = _configuration.GetSection("AutoOutboundTask:TargetAddresses")
- .Get<Dictionary<string, List<string>>>()
- ?? new Dictionary<string, List<string>>();
-
- // 5. 鎵归噺鍒涘缓浠诲姟
- var taskList = new List<Dt_Task>();
- foreach (var stock in stocksToProcess)
- {
- // 鏍规嵁宸烽亾纭畾鐩爣鍦板潃
- var targetAddress = DetermineTargetAddress(
- stock.LocationDetails?.RoadwayNo ?? "",
- targetAddressMap);
-
- var task = new Dt_Task
- {
- WarehouseId = stock.WarehouseId,
- PalletCode = stock.PalletCode,
- PalletType = stock.PalletType,
- SourceAddress = stock.LocationCode,
- CurrentAddress = stock.LocationCode,
- NextAddress = targetAddress,
- TargetAddress = targetAddress,
- Roadway = stock.LocationDetails?.RoadwayNo ?? "",
- TaskType = TaskTypeEnum.Outbound.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- Grade = 1,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "system_auto"
- };
- taskList.Add(task);
- }
-
- var transactionResult = await ExecuteWithinTransactionAsync(async () =>
- {
- var addResult = await BaseDal.AddDataAsync(taskList) > 0;
- if (!addResult)
- {
- 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锛堝紓姝ワ紝涓嶅奖鍝嶄富娴佺▼锛�
- _ = Task.Run(() =>
- {
- try
- {
- var wmstaskDtos = _mapper.Map<List<WMSTaskDTO>>(taskList);
- _httpClientHelper.Post<WebResponseContent>(
- "http://localhost:9292/api/Task/ReceiveTask",
- wmstaskDtos.ToJson());
- }
- catch (Exception ex)
- {
- // WCS 閫氱煡澶辫触涓嶅奖鍝嶄换鍔″垱寤猴紝璁板綍鏃ュ織鍗冲彲
- Console.WriteLine($"WCS 鎵归噺閫氱煡澶辫触锛屼换鍔℃暟閲�: {taskList.Count}, 閿欒: {ex.Message}");
- }
- });
-
- return WebResponseContent.Instance.OK($"鎴愬姛鍒涘缓 {taskList.Count} 涓嚭搴撲换鍔�", taskList.Count);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error($"鑷姩鍒涘缓鍑哄簱浠诲姟澶辫触: {ex.Message}");
- }
- }
-
- /// <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"
+ "GW_1" => _roundRobinService.GetNextAddress("GW_1", new List<string> { "11001", "11010" }),
+ "GW_2" => "CWSC1",
+ "CW_1" => "22001",
+ _ => DetermineTargetAddress(roadway, addressMap)
};
-
- 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}");
- }
+
+ // Remark 涓虹┖鏃讹紝鍥為��鍒板贩閬撻厤缃�
+ return DetermineTargetAddress(roadway, addressMap);
}
-
- #endregion WCS閫昏緫澶勭悊
-
- #region 鍒嗗鏌滄帴鍙�
-
- /// <summary>
- /// 鍫嗗灈鏈哄彇鏀捐揣瀹屾垚鍚庣墿娴侀�氱煡鍖栨垚鍒嗗鏌滃畬鎴愪俊鍙�
- /// </summary>
- public async Task<WebResponseContent> InOrOutCompletedAsync(GradingMachineInputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
- {
- return content.Error($"鎵樼洏鍙锋垨鑰呰揣浣嶇紪鍙蜂笉鑳戒负绌�");
- }
-
- try
- {
- var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
-
- int locationStatus;
- if (stockInfo == null)
- {
- var location = await _locationInfoService.GetLocationInfoAsync(input.LocationCode);
- locationStatus = location?.LocationStatus ?? 0;
- }
- else
- {
- 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)
- {
- content.Error(ex.Message);
- }
-
- return content;
- }
-
- /// <summary>
- /// 鍖栨垚鍒嗗鏌滃畾鏃跺悜鐗╂祦鏇存柊鍒嗗鏌滅姸鎬佷俊鎭�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> SendLocationStatusAsync(GradingMachineInputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.LocationCode))
- {
- return content.Error($"璐т綅缂栧彿涓嶈兘涓虹┖");
- }
-
- try
- {
- var result = await _locationInfoService.Db.Updateable<Dt_LocationInfo>()
- .SetColumns(s => new Dt_LocationInfo
- {
- LocationStatus = input.LocationStatus
- }).Where(s => s.LocationCode == input.LocationCode).ExecuteCommandAsync() > 0;
-
- if (result)
- {
- content.OK("鏇存柊鎴愬姛");
- }
- else
- {
- content.Error("鏇存柊澶辫触");
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鍒嗗鏌滃伐浣滃畬鎴愬悗璋冪敤姝ゆ帴鍙ｉ�氱煡鐗╂祦鍑哄簱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> RequestOutboundAsync(GradingMachineInputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.LocationCode) || string.IsNullOrWhiteSpace(input.PalletCode))
- {
- return content.Error($"鎵樼洏鍙锋垨鑰呰揣浣嶇紪鍙蜂笉鑳戒负绌�");
- }
- try
- {
- var stock = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
- if (stock == null)
- {
- content.Error("鏈壘鍒板搴旂殑鎵樼洏");
- }
- else
- {
- var taskList = new Dt_Task
- {
- WarehouseId = stock.WarehouseId,
- PalletCode = stock.PalletCode,
- PalletType = stock.PalletType,
- SourceAddress = stock.LocationCode,
- CurrentAddress = stock.LocationCode,
- NextAddress = "10080",
- TargetAddress = "10081",
- Roadway = stock.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.Outbound.GetHashCode(),
- TaskStatus = TaskStatusEnum.New.GetHashCode(),
- Grade = 1,
- TaskNum = await BaseDal.GetTaskNo(),
- Creater = "system",
- };
-
- var result = await BaseDal.AddDataAsync(taskList) > 0;
- var wmstaskDto = result ? _mapper.Map<WMSTaskDTO>(taskList) : null;
-
- var httpResponse = _httpClientHelper.Post<WebResponseContent>("http://logistics-service/api/logistics/notifyoutbound", JsonSerializer.Serialize(wmstaskDto)).Data;
- if (result && httpResponse != null)
- {
- content.OK("鍑哄簱璇锋眰鎴愬姛");
- }
- else
- {
- content.Error("鍑哄簱璇锋眰澶辫触");
- }
- }
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
-
- /// <summary>
- /// 鍏ュ簱瀹屾垚鍒嗗璋冪敤鑾峰彇鎵樼洏涓婃瘡涓�氶亾鐢佃姱
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public async Task<WebResponseContent> GetPalletCodeCellAsync(GradingMachineInputDto input)
- {
- WebResponseContent content = new WebResponseContent();
- if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
- {
- return content.Error($"鎵樼洏鍙锋垨鑰呰揣浣嶇紪鍙蜂笉鑳戒负绌�");
- }
- try
- {
- var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
- if (stockInfo == null)
- {
- return content.Error("鏈壘鍒板搴旂殑鎵樼洏");
- }
- var outPutDtos = stockInfo.Details.Select(x => new OutputDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = stockInfo.LocationDetails.LocationStatus,
- CellCode = x.SerialNumber,
- Channel = x.InboundOrderRowNo.ToString()
- }).ToList();
- return content.OK(data: outPutDtos);
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
-
- #endregion 鍒嗗鏌滄帴鍙�
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3