From 1faef6894400be9923b24038fddb7f9218bd7b6b Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 18:19:16 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 1021 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 897 insertions(+), 124 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index db2cb23..4ac879d 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -1,15 +1,22 @@
-锘縰sing AutoMapper;
+using Mapster;
+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_DTO;
+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_IStockService;
@@ -26,6 +33,10 @@
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;
public IRepository<Dt_Task> Repository => BaseDal;
@@ -45,7 +56,11 @@
ILocationInfoService locationInfoService,
HttpClientHelper httpClientHelper,
IConfiguration configuration,
- RoundRobinService roundRobinService) : base(BaseDal)
+ RoundRobinService roundRobinService,
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -53,6 +68,10 @@
_httpClientHelper = httpClientHelper;
_configuration = configuration;
_roundRobinService = roundRobinService;
+ _mesService = mesService;
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
+ _unitOfWorkManage = unitOfWorkManage;
}
#region WCS閫昏緫澶勭悊
@@ -64,7 +83,7 @@
{
try
{
- WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+ WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
if (content.Status)
{
return content;
@@ -169,18 +188,23 @@
var locationInfo = await _locationInfoService.GetLocationInfo(task.Roadway);
if (locationInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
- locationInfo.LocationStatus = LocationStatusEnum.FreeLock.GetHashCode();
- task.CurrentAddress = task.SourceAddress;
- task.NextAddress = locationInfo.LocationCode;
- task.TargetAddress = locationInfo.LocationCode;
- task.TaskStatus = TaskInStatusEnum.Line_InFinish.GetHashCode();
+ 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 updateResult = await BaseDal.UpdateDataAsync(task);
- var locationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ var updateTaskResult = await BaseDal.UpdateDataAsync(task);
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ if (!updateTaskResult || !updateLocationResult)
+ {
+ return WebResponseContent.Instance.Error("浠诲姟鏇存柊澶辫触");
+ }
- return WebResponseContent.Instance.OK(
- updateResult && locationResult ? "浠诲姟鏇存柊鎴愬姛" : "浠诲姟鏇存柊澶辫触",
- locationInfo.LocationCode);
+ return WebResponseContent.Instance.OK("浠诲姟鏇存柊鎴愬姛", locationInfo.LocationCode);
+ });
}
catch (Exception ex)
{
@@ -202,30 +226,48 @@
if (location == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑璐т綅");
var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
- stockInfo.LocationCode = location.LocationCode;
- stockInfo.LocationId = location.Id;
- stockInfo.OutboundDate = task.Roadway switch
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+
+ // 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
+ //if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
+ //{
+ // return WebResponseContent.Instance.OK();
+ //}
+
+ return await ExecuteWithinTransactionAsync(async () =>
{
- 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();
+ 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();
+ location.LocationStatus = LocationStatusEnum.InStock.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("浠诲姟瀹屾垚");
+ 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)
{
@@ -246,24 +288,98 @@
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;
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
+ if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
- location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
+ // 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
+ if (taskDto.WarehouseId == (int)WarehouseEnum.FJ1 || taskDto.WarehouseId == (int)WarehouseEnum.ZJ1)
+ {
+ OutTaskCompleteDto outTaskCompleteDto = new OutTaskCompleteDto()
+ {
+ TaskId = task.OrderNo,
+ DevId = task.TargetAddress,
+ ReqTime = DateTime.Now.ToString()
+ };
+ return await OutTaskComplete(outTaskCompleteDto);
+ }
- var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
- var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
- if (!updateLocationResult || !updateStockResult)
- return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+ WebResponseContent content = new WebResponseContent();
+ return await ExecuteWithinTransactionAsync(async () =>
+ {
+ stockInfo.LocationId = 0;
+ stockInfo.LocationCode = null;
+ stockInfo.OutboundDate = DateTime.Now;
- var deleteTaskResult = await BaseDal.DeleteDataAsync(task);
- if (!deleteTaskResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+ location.LocationStatus = LocationStatusEnum.Free.GetHashCode();
- var historyTask = _mapper.Map<Dt_Task_Hty>(task);
- historyTask.InsertTime = DateTime.Now;
+ var updateLocationResult = await _locationInfoService.UpdateLocationInfoAsync(location);
+ var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
+ if (!updateLocationResult || !updateStockResult)
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ // 璋冪敤MES鎵樼洏鍑虹珯
+ var outboundRequest = new OutboundInContainerRequest
+ {
+ EquipmentCode = "STK-GROUP-001",
+ ResourceCode = "STK-GROUP-001",
+ LocalTime = DateTime.Now,
+ ContainerCode = taskDto.PalletCode,
+ ParamList = new List<ParamItem>()
+ };
+ var outboundResult = _mesService.OutboundInContainer(outboundRequest);
+ if (outboundResult == null || outboundResult.Data == null || !outboundResult.Data.IsSuccess)
+ {
+ return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES鍑虹珯澶辫触: {outboundResult?.Data?.Msg ?? outboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
+ }
+
+ 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)
{
@@ -280,7 +396,7 @@
{
try
{
- WebResponseContent content = await GetTasksByPalletCodeAsync(taskDto.PalletCode);
+ WebResponseContent content = await GetTaskByPalletCodeAsync(taskDto.PalletCode);
if (content.Status)
{
return content;
@@ -299,6 +415,61 @@
}
/// <summary>
+ /// 绌烘墭鐩樺叆搴撳畬鎴�
+ /// </summary>
+ public async Task<WebResponseContent> InboundFinishTaskTrayAsync(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 () =>
+ {
+ stockInfo.LocationCode = location.LocationCode;
+ stockInfo.LocationId = location.Id;
+ 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("浠诲姟瀹屾垚澶辫触");
+
+ // 淇濆瓨浠诲姟鍘嗗彶
+ 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 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 deleteResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ });
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
+ }
+ }
+
+ /// <summary>
/// 鍒涘缓绌烘墭鐩樺嚭搴撲换鍔�
/// </summary>
/// <param name="taskDto"></param>
@@ -308,7 +479,7 @@
try
{
- var stockInfo = await _stockInfoService.Repository.QueryFirstAsync(x => x.LocationDetails.WarehouseId == taskDto.WarehouseId && x.LocationDetails.LocationStatus == LocationStatusEnum.InStock.GetHashCode() && x.StockStatus == StockStatusEmun.绌烘墭鐩樺簱瀛�.GetHashCode());
+ 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("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
@@ -322,18 +493,77 @@
NextAddress = taskDto.TargetAddress,
TargetAddress = taskDto.TargetAddress,
Roadway = stockInfo.LocationDetails.RoadwayNo,
- TaskType = TaskTypeEnum.OutEmpty.GetHashCode(),
+ TaskType = TaskOutboundTypeEnum.OutEmpty.GetHashCode(),
TaskStatus = TaskStatusEnum.New.GetHashCode(),
Grade = 1,
TaskNum = await BaseDal.GetTaskNo(),
Creater = "system",
};
- var taskDtos = _mapper.Map<List<WMSTaskDTO>>(task);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+ 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>
+ /// 绌烘墭鐩樺嚭搴撳畬鎴�
+ /// </summary>
+ public async Task<WebResponseContent> OutboundFinishTaskTrayAsync(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.StockStatus = StockStatusEmun.鍑哄簱瀹屾垚.GetHashCode();
+
+ 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 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 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 deleteResult = await BaseDal.DeleteDataAsync(task);
+ if (!deleteResult) return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
+
+ return WebResponseContent.Instance.OK("浠诲姟瀹屾垚");
+ });
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error($"瀹屾垚浠诲姟澶辫触: {ex.Message}");
}
}
@@ -368,20 +598,37 @@
/// </summary>
/// <param name="palletCode"></param>
/// <returns></returns>
- private async Task<WebResponseContent> GetTasksByPalletCodeAsync(string palletCode)
+ private async Task<WebResponseContent> GetTaskByPalletCodeAsync(string palletCode)
{
try
{
- var tasks = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
- if (tasks == null)
+ var task = await BaseDal.QueryFirstAsync(s => s.PalletCode == palletCode);
+ if (task == null)
return WebResponseContent.Instance.Error("鏈壘鍒板搴旂殑浠诲姟");
- var taskDtos = _mapper.Map<List<WMSTaskDTO>>(tasks);
- return WebResponseContent.Instance.OK("鏌ヨ鎴愬姛", taskDtos);
+ 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>
@@ -427,38 +674,12 @@
{
// 1. 鏌ヨ鍒版湡搴撳瓨
var expiredStocks = await _stockInfoService.Repository
- .QueryDataAsync(s => s.OutboundDate <= DateTime.Now
+ .QueryDataNavAsync(s => s.OutboundDate <= DateTime.Now
&& s.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.GetHashCode());
if (expiredStocks == null || !expiredStocks.Any())
{
return WebResponseContent.Instance.OK("鏃犲埌鏈熷簱瀛橀渶瑕佸鐞�");
- }
-
- // 鎵归噺鍔犺浇浣嶇疆璇︽儏锛堜紭鍖� N+1 鏌ヨ闂锛�
- var locationIds = expiredStocks
- .Where(s => s.LocationId > 0)
- .Select(s => s.LocationId)
- .Distinct()
- .Cast<object>()
- .ToList();
-
- if (locationIds.Any())
- {
- var locations = await _locationInfoService.Repository
- .QureyDataByIdsAsync(locationIds);
-
- // 鍒涘缓浣嶇疆瀛楀吀浠ヤ究蹇�熸煡鎵�
- var locationDict = locations.ToDictionary(l => l.Id, l => l);
-
- // 涓烘瘡涓簱瀛樺叧鑱斾綅缃鎯�
- foreach (var stock in expiredStocks)
- {
- if (stock.LocationId > 0 && locationDict.ContainsKey(stock.LocationId))
- {
- stock.LocationDetails = locationDict[stock.LocationId];
- }
- }
}
// 杩囨护鏈変綅缃笖浣嶇疆鏈夊簱瀛樼殑璁板綍
@@ -525,29 +746,70 @@
taskList.Add(task);
}
- var addResult = await BaseDal.AddDataAsync(taskList) > 0;
- if (!addResult)
+ var transactionResult = await ExecuteWithinTransactionAsync(async () =>
{
- return WebResponseContent.Instance.Error($"鎵归噺鍒涘缓浠诲姟澶辫触锛屽叡 {taskList.Count} 涓换鍔�");
+ 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(() =>
{
- foreach (var task in taskList)
+ try
{
- try
- {
- var wmstaskDto = _mapper.Map<WMSTaskDTO>(task);
- _httpClientHelper.Post<WebResponseContent>(
- "http://localhost:9292/api/Task/ReceiveTask",
- JsonSerializer.Serialize(wmstaskDto));
- }
- catch (Exception ex)
- {
- // WCS 閫氱煡澶辫触涓嶅奖鍝嶄换鍔″垱寤猴紝璁板綍鏃ュ織鍗冲彲
- Console.WriteLine($"WCS 閫氱煡澶辫触锛屼换鍔＄紪鍙�: {task.TaskNum}, 閿欒: {ex.Message}");
- }
+ 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}");
}
});
@@ -559,6 +821,125 @@
}
}
+ /// <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"
+ };
+
+ 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}");
+ }
+ }
+
#endregion WCS閫昏緫澶勭悊
#region 鍒嗗鏌滄帴鍙�
@@ -566,7 +947,7 @@
/// <summary>
/// 鍫嗗灈鏈哄彇鏀捐揣瀹屾垚鍚庣墿娴侀�氱煡鍖栨垚鍒嗗鏌滃畬鎴愪俊鍙�
/// </summary>
- public async Task<WebResponseContent> InOrOutCompletedAsync(InputDto input)
+ public async Task<WebResponseContent> InOrOutCompletedAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
@@ -577,30 +958,26 @@
try
{
var stockInfo = await _stockInfoService.GetStockInfoAsync(input.PalletCode, input.LocationCode);
+
+ int locationStatus;
if (stockInfo == null)
{
var location = await _locationInfoService.GetLocationInfoAsync(input.LocationCode);
-
- OutPutDto outPutDto = new OutPutDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = location.LocationStatus
- };
- content.OK(data: outPutDto);
+ locationStatus = location?.LocationStatus ?? 0;
}
else
{
- OutPutDto outPutDto = new OutPutDto()
- {
- LocationCode = input.LocationCode,
- PalletCode = input.PalletCode,
- IsNormalProcedure = 1,
- LocationStatus = stockInfo.LocationDetails.LocationStatus
- };
- content.OK(data: outPutDto);
+ 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)
{
@@ -615,7 +992,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<WebResponseContent> SendLocationStatusAsync(InputDto input)
+ public async Task<WebResponseContent> SendLocationStatusAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.LocationCode))
@@ -652,7 +1029,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<WebResponseContent> RequestOutboundAsync(InputDto input)
+ public async Task<WebResponseContent> RequestOutboundAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.LocationCode) || string.IsNullOrWhiteSpace(input.PalletCode))
@@ -711,7 +1088,7 @@
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- public async Task<WebResponseContent> GetPalletCodeCellAsync(InputDto input)
+ public async Task<WebResponseContent> GetPalletCodeCellAsync(GradingMachineInputDto input)
{
WebResponseContent content = new WebResponseContent();
if (string.IsNullOrWhiteSpace(input.PalletCode) || string.IsNullOrWhiteSpace(input.LocationCode))
@@ -725,7 +1102,7 @@
{
return content.Error("鏈壘鍒板搴旂殑鎵樼洏");
}
- var outPutDtos = stockInfo.Details.Select(x => new OutPutDto()
+ var outPutDtos = stockInfo.Details.Select(x => new OutputDto()
{
LocationCode = input.LocationCode,
PalletCode = input.PalletCode,
@@ -743,5 +1120,401 @@
}
#endregion 鍒嗗鏌滄帴鍙�
+
+
+ #region 鏋佸嵎搴撲换鍔℃ā鍧�
+ public string AGV_OutTaskComplete = WIDESEA_Core.Helper.AppSettings.Configuration["AGV_OutTaskComplete"]; // 涓婃姤AGV鍑哄簱杈撻�佺嚎瀹屾垚
+ public string WCS_ReceiveTask = WIDESEA_Core.Helper.AppSettings.Configuration["WCS_ReceiveTask"]; // WMS杈撻�佺嚎浠诲姟涓嬪彂
+ /// <summary>
+ /// 鍑哄叆搴撶敵璇�
+ /// </summary>
+ /// <param name="applyInOutDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> ApplyInOutAsync(ApplyInOutDto applyInOutDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ // 鍙傛暟楠岃瘉
+ if (applyInOutDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.TrayNumber)) return aGVResponse.Error("鎵樼洏鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.MaterialType)) return aGVResponse.Error("鐗╂枡绫诲瀷涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.MaterialName)) return aGVResponse.Error("鐗╂枡鎻忚堪涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.ReqTime)) return aGVResponse.Error("璇锋眰鏃堕棿涓嶈兘涓虹┖");
+ if (applyInOutDto.Floor != 1 && applyInOutDto.Floor != 2) return aGVResponse.Error($"妤煎眰娈甸敊璇紝蹇呴』涓�1(妯″垏娈�)鎴�2(鍗风粫娈�)锛屽綋鍓嶅�硷細{applyInOutDto.Floor}");
+ if (applyInOutDto.YinYang != 1 && applyInOutDto.YinYang != 2) return aGVResponse.Error($"闃撮槼鏋侀敊璇紝蹇呴』涓�1(闃存瀬)鎴�2(闃虫瀬)锛屽綋鍓嶅�硷細{applyInOutDto.YinYang}");
+ if (applyInOutDto.InOut != 1 && applyInOutDto.InOut != 2) return aGVResponse.Error($"鍑哄叆搴撶被鍨嬮敊璇紝蹇呴』涓�1(鍏ュ簱)鎴�2(鍑哄簱)锛屽綋鍓嶅�硷細{applyInOutDto.InOut}");
+ if (applyInOutDto.InOut == 1) // 鍏ュ簱
+ {
+ if (applyInOutDto.Width == null || applyInOutDto.Width <= 0) return aGVResponse.Error("鍏ュ簱鏃跺搴︿笉鑳戒负绌轰笖蹇呴』澶т簬0");
+ if (string.IsNullOrWhiteSpace(applyInOutDto.Group)) return aGVResponse.Error("鍏ュ簱鏃舵暣鎵樼粍鍒笉鑳戒负绌�");
+ }
+ // 妫�鏌ヤ换鍔℃槸鍚﹀凡瀛樺湪
+ var existingTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == applyInOutDto.TrayNumber);
+ if (existingTask != null) return aGVResponse.Error($"WMS宸叉湁褰撳墠浠诲姟锛屼笉鍙噸澶嶄笅鍙戯紝浠诲姟鍙凤細{applyInOutDto.TaskId}");
+ // 鍒涘缓浠诲姟
+ Dt_Task task = new Dt_Task
+ {
+ OrderNo = applyInOutDto.TaskId, // 浣跨敤AGV鐨勪换鍔″彿
+ PalletCode = applyInOutDto.TrayNumber,
+ PalletType = applyInOutDto.Floor,
+ //WarehouseId = applyInOutDto.YinYang,
+ Grade = 1,
+ Creater = "AGV",
+ CreateDate = DateTime.Now,
+ Remark = $"鐗╂枡绫诲瀷锛歿applyInOutDto.MaterialType}锛岀墿鏂欐弿杩帮細{applyInOutDto.MaterialName}"
+ };
+ // 鏍规嵁闃存瀬/闃虫瀬璁剧疆宸烽亾鍜岀珯鍙�
+ if (applyInOutDto.YinYang == 1) // 闃存瀬
+ {
+ // 璐х墿鍒拌揪鍚庡垎閰嶈揣鐗╀綅
+ task.Roadway = WarehouseEnum.FJ1.ToString();
+ task.WarehouseId = (int)WarehouseEnum.FJ1;
+ task.SourceAddress = applyInOutDto.InOut == 1 ? "D10010" : "D10020"; // 鍏ュ簱鍙�/鍑哄簱鍙�
+ task.NextAddress = "D10080"; // 闃存瀬鍏叡鍑哄簱鍙�
+ task.TargetAddress = "闃存瀬鍗峰簱";
+ }
+ else if (applyInOutDto.YinYang == 2) // 闃虫瀬
+ {
+ task.Roadway = WarehouseEnum.ZJ1.ToString();
+ task.WarehouseId = (int)WarehouseEnum.ZJ1;
+ task.SourceAddress = applyInOutDto.InOut == 1 ? "D10100" : "D10090"; // 鍏ュ簱鍙�/鍑哄簱鍙�
+ task.NextAddress = "D10160"; // 闃虫瀬鍏叡鍑哄簱鍙�
+ task.TargetAddress = "姝ｆ瀬鍗峰簱";
+ }
+ // 鏍规嵁鍑哄叆搴撶被鍨嬭缃洰鏍囧湴鍧�
+ if (applyInOutDto.InOut == 1) // 鍏ュ簱
+ {
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(applyInOutDto.TrayNumber);
+ if (stockInfo != null) return aGVResponse.Error($"褰撳墠鎵樼洏{applyInOutDto.TrayNumber}宸茬粡鍏ュ簱浜�");
+
+ task.TaskType = (int)TaskInboundTypeEnum.Inbound;
+ task.TaskStatus = (int)TaskInStatusEnum.InNew;
+ task.CurrentAddress = task.SourceAddress; // 褰撳墠鍦ㄥ叆搴撳彛
+ // 淇濆瓨浠诲姟
+ var result = await BaseDal.AddDataAsync(task);
+ }
+ else // 鍑哄簱
+ {
+ // 鍒ゆ柇鏄惁绉诲簱
+ task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
+ task.TaskStatus = (int)TaskOutStatusEnum.OutNew;
+ task.CurrentAddress = task.SourceAddress; // 褰撳墠鍦ㄥ叆搴撳彛
+ // 鏌ユ壘搴撳瓨
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(applyInOutDto.TrayNumber);
+ if (stockInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹applyInOutDto.TrayNumber}鐨勫簱瀛樹俊鎭�");
+ // 楠岃瘉搴撳瓨鎵�灞炴槸鍚︽纭�
+ if (stockInfo.WarehouseId != applyInOutDto.YinYang) return aGVResponse.Error($"鎵樼洏{applyInOutDto.TrayNumber}涓嶅睘浜庡綋鍓峽(applyInOutDto.YinYang == 1 ? "闃存瀬" : "闃虫瀬")}");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍏ュ簱瀹屾垚) return aGVResponse.Error($"鎵樼洏{applyInOutDto.TrayNumber}姝ｅ湪绉诲姩涓紝璇风◢鍚庯紒");
+ task.SourceAddress = stockInfo.LocationCode; // 婧愬湴鍧�涓鸿揣浣�
+ task.CurrentAddress = stockInfo.LocationCode; // 褰撳墠浣嶇疆鍦ㄨ揣浣�
+ task.TargetAddress = applyInOutDto.YinYang == 1 ? "D10020" : "D10090"; // 鐩爣鍦板潃涓哄嚭搴撳彛
+
+ // 淇濆瓨浠诲姟
+ var result = await BaseDal.AddDataAsync(task);
+ // 鍒ゆ柇鏄惁绉诲簱
+ //var transferTask = await _locationInfoService.TransferCheckAsync(result);
+ }
+
+ // 鏋勫缓鍝嶅簲鏁版嵁
+ AGVDataDto aGVDataDto = new AGVDataDto
+ {
+ DevId = applyInOutDto.InOut == 1 ? task.SourceAddress : task.TargetAddress,
+ TrayNumber = task.PalletCode,
+ Group = applyInOutDto.Group,
+ Width = applyInOutDto.Width ?? 0,
+ LabelNumber = applyInOutDto.LabelNumber,
+ ProductNo = applyInOutDto.ProductNo,
+ ProductName = applyInOutDto.ProductName,
+ Quantity = applyInOutDto.Quantity,
+ UomCode = applyInOutDto.UomCode,
+ ProductType = applyInOutDto.ProductType,
+ Equipment = applyInOutDto.Equipment,
+ ProductionDate = applyInOutDto.ProductionDate,
+ LowerLimitTime = applyInOutDto.LowerLimitTime,
+ WarningTime = applyInOutDto.WarningTime,
+ OverdueTime = applyInOutDto.OverdueTime
+ };
+
+ return aGVResponse.OK(aGVDataDto);
+ }
+ catch (Exception ex)
+ {
+ return aGVResponse.Error($"WMS浠诲姟鍒涘缓鎺ュ彛閿欒: {ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 鎵嬪姩鍑哄簱瀹屾垚鍙嶉缁橝GV
+ /// </summary>
+ /// <param name="outTaskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<WebResponseContent> OutTaskComplete(OutTaskCompleteDto outTaskCompleteDto)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ try
+ {
+ if (outTaskCompleteDto == null) return webResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(outTaskCompleteDto.TaskId)) return webResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(outTaskCompleteDto.DevId)) return webResponse.Error("鍑哄簱鍙ｇ紪鍙蜂笉鑳戒负绌�");
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == outTaskCompleteDto.TaskId);
+ if (task == null) return webResponse.Error("鏈壘鍒颁换鍔′俊鎭�");
+ outTaskCompleteDto.ReqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ var httpResponse = _httpClientHelper.Post<AGVResponse>(AGV_OutTaskComplete, JsonSerializer.Serialize(outTaskCompleteDto)).Data;
+ // 鍒ゆ柇杩滅▼鎺ュ彛杩斿洖鏄惁鎴愬姛
+ if (httpResponse != null && httpResponse.Data != null)
+ {
+ AGVResponse agvResponse = httpResponse;
+ // 鏍规嵁code瀛楁鍒ゆ柇锛宑ode涓簍rue琛ㄧず鎴愬姛
+ if (agvResponse.Code == true)
+ {
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null) return webResponse.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ if (locationInfo == null) return webResponse.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
+ {
+ return webResponse.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Free;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteData(task);
+ _locationInfoService.UpdateData(locationInfo);
+ _stockInfoService.DeleteData(stockInfo);
+ _unitOfWorkManage.CommitTran();
+ return webResponse.OK(agvResponse.Msg);
+ }
+ else
+ {
+ // 澶辫触锛氳繑鍥濧GV杩斿洖鐨勯敊璇俊鎭�
+ return webResponse.Error(string.IsNullOrWhiteSpace(agvResponse.Msg)
+ ? "AGV鎺ュ彛璋冪敤澶辫触"
+ : agvResponse.Msg);
+ }
+ }
+ else
+ {
+ // HTTP璇锋眰鏈韩澶辫触
+ return webResponse.Error(httpResponse?.Msg ?? "AGV鎺ュ彛璋冪敤寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return webResponse.Error($"WMS浠诲姟瀹屾垚鎺ュ彛閿欒锛歿ex.Message}");
+ }
+ }
+ ///// <summary>
+ ///// 浠诲姟瀹屾垚鎺ュ彛
+ ///// </summary>
+ ///// <param name="wCSTask"></param>
+ ///// <returns></returns>
+ //public async Task<WebResponseContent> TaskCompleted(WCSTaskDTO wCSTask)
+ //{
+ // WebResponseContent webResponse = new WebResponseContent();
+ // try
+ // {
+ // Dt_Task task = await BaseDal.QueryFirstAsync(x => x.TaskId == wCSTask.TaskNum && x.PalletCode == wCSTask.PalletCode);
+ // if (task == null) return webResponse.Error("鏈壘鍒颁换鍔′俊鎭�");
+ // // 鍑哄簱瀹屾垚鍙嶉
+ // OutTaskCompleteDto outTaskCompleteDto = new OutTaskCompleteDto()
+ // {
+ // TaskId = task.OrderNo,
+ // DevId = task.TargetAddress,
+ // ReqTime = DateTime.Now.ToString()
+ // };
+ // return await OutTaskComplete(outTaskCompleteDto);
+ // }
+ // catch (Exception ex)
+ // {
+ // return webResponse.Error($"WMS浠诲姟瀹屾垚鎺ュ彛閿欒锛歿ex.Message}");
+ // }
+ //}
+ /// <summary>
+ /// 杈撻�佺嚎鐢宠杩涘叆
+ /// </summary>
+ /// <param name="applyEnterDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> ApplyEnterAsync(ApplyEnterDto applyEnterDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ // 鍙傛暟楠岃瘉
+ if (applyEnterDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyEnterDto.DevId)) return aGVResponse.Error("璁惧缂栧彿涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(applyEnterDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (applyEnterDto.InOut != 1 && applyEnterDto.InOut != 2) return aGVResponse.Error($"鍑哄叆搴撶被鍨嬮敊璇紝蹇呴』涓�1(鍏ュ簱)鎴�2(鍑哄簱)锛屽綋鍓嶅�硷細{applyEnterDto.InOut}");
+
+ // 鏌ヨ浠诲姟鏄惁瀛樺湪
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == applyEnterDto.TaskId);
+ if (task == null) return aGVResponse.Error($"鏈壘鍒颁换鍔′俊鎭紝浠诲姟鍙凤細{applyEnterDto.TaskId}");
+ if (applyEnterDto.InOut == 1 && task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskStatus == (int)TaskInStatusEnum.InNew)
+ {
+ aGVResponse.OK();
+ }
+ else if(applyEnterDto.InOut == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound && task.TaskStatus == (int)TaskStatusEnum.Line_Finish)
+ {
+ aGVResponse.OK();
+ }
+ return aGVResponse.Error($"杈撻�佺嚎{applyEnterDto.DevId}褰撳墠绻佸繖锛岃绋嶅悗閲嶈瘯");
+
+ // Dt_Task.SourceAddress璇㈤棶wcs绔欏彴1-闃存瀬鍏ュ彛鍙獶10010鍜孌10020锛�2-闃虫瀬D10090鍜孌10100鏄惁鏈夎揣鐗�
+ //var httpResponse = _httpClientHelper.Post<WebResponseContent>("http://127.0.0.1:9999/api/Task/ApplyInOut", JsonSerializer.Serialize(task)).Data;
+ //if (httpResponse != null && httpResponse.Status == true)
+ //{
+ // _unitOfWorkManage.BeginTran();
+ // task.TaskStatus = (int)TaskStatusEnum.AGV_Executing;
+ // await BaseDal.UpdateDataAsync(task);
+ // _unitOfWorkManage.CommitTran();
+ // return aGVResponse.OK();
+ //}
+ //else
+ //{
+ // return aGVResponse.Error($"绔欏彴{task.SourceAddress}宸茬粡杞借揣");
+ //}
+ }
+ catch (Exception ex)
+ {
+ //_unitOfWorkManage.RollbackTran();
+ return aGVResponse.Error($"WMS杈撻�佺嚎鐢宠鎺ュ彛閿欒锛歿ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 鍙栨斁璐у畬鎴�
+ /// </summary>
+ /// <param name="taskCompleteDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> TaskCompleteAsync(TaskCompleteDto taskCompleteDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ if (taskCompleteDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(taskCompleteDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+ if (string.IsNullOrWhiteSpace(taskCompleteDto.DevId)) return aGVResponse.Error("璁惧缂栧彿涓嶈兘涓虹┖");
+ if (taskCompleteDto.InOut != 1 && taskCompleteDto.InOut != 2) return aGVResponse.Error($"鍑哄叆搴撶被鍨嬮敊璇紝蹇呴』涓�1(鍏ュ簱)鎴�2(鍑哄簱)锛屽綋鍓嶅�硷細{taskCompleteDto.InOut}");
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == taskCompleteDto.TaskId);
+ if (task == null) return aGVResponse.Error($"鏈壘鍒颁换鍔′俊鎭紝浠诲姟鍙凤細{taskCompleteDto.TaskId}");
+ if (taskCompleteDto.InOut == 2)
+ {
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ if (locationInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
+ {
+ return aGVResponse.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ locationInfo.LocationStatus = (int)LocationStatusEnum.Free;
+ task.TaskStatus = (int)TaskOutStatusEnum.OutFinish;
+ _unitOfWorkManage.BeginTran();
+ _stockInfoService.DeleteData(stockInfo);
+ await _locationInfoService.UpdateLocationInfoAsync(locationInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ //鏌ユ壘鍙敤璐т綅
+ var availableLocation = await _locationInfoService.GetLocationInfo(task.Roadway);
+
+ if (availableLocation == null) return aGVResponse.Error("鏃犲彲鐢ㄧ殑鍏ュ簱璐т綅");
+
+ task.TargetAddress = availableLocation.LocationCode;
+ // 閫氱煡WCS鍏ュ簱
+ var wcsTaskDto = _mapper.Map<WCSTaskDTO>(task);
+ var httpResponse = _httpClientHelper.Post<WebResponseContent>(WCS_ReceiveTask, JsonSerializer.Serialize(wcsTaskDto));
+ if (httpResponse == null) return aGVResponse.Error("涓嬪彂WCS澶辫触");
+
+ task.TaskStatus = (int)TaskStatusEnum.Line_Executing;
+ task.Dispatchertime = DateTime.Now;
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(task.TargetAddress);
+ if (locationInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹task.TargetAddress}鐨勮揣浣嶄俊鎭�");
+ if (locationInfo.LocationStatus != (int)LocationStatusEnum.InStock)
+ {
+ return aGVResponse.Error($"褰撳墠璐т綅{locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ Dt_StockInfo dt_Stock = new Dt_StockInfo()
+ {
+ PalletCode = task.PalletCode,
+ StockStatus = (int)StockStatusEmun.鍏ュ簱纭,
+ LocationCode = locationInfo.LocationCode,
+ WarehouseId = task.WarehouseId,
+ Creater = "AGV",
+ CreateDate = DateTime.Now
+ };
+ locationInfo.LocationStatus = (int)LocationStatusEnum.FreeLock;
+ _unitOfWorkManage.BeginTran();
+ BaseDal.UpdateData(task);
+ _locationInfoService.UpdateData(locationInfo);
+ _stockInfoService.AddData(dt_Stock);
+ _unitOfWorkManage.CommitTran();
+ }
+ return aGVResponse.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return aGVResponse.Error($"WMS鍙栨斁璐у畬鎴愭帴鍙ｉ敊璇細{ex.Message}");
+ }
+ }
+ /// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskCancelDto">璇锋眰鍙傛暟</param>
+ /// <returns></returns>
+ public async Task<AGVResponse> TaskCancelAsync(TaskCancelDto taskCancelDto)
+ {
+ AGVResponse aGVResponse = new AGVResponse();
+ try
+ {
+ if (taskCancelDto == null) return aGVResponse.Error("璇锋眰鍙傛暟涓嶈兘涓虹┖");
+ if (string.IsNullOrWhiteSpace(taskCancelDto.TaskId)) return aGVResponse.Error("浠诲姟鍙蜂笉鑳戒负绌�");
+
+ var task = await BaseDal.QueryFirstAsync(x => x.OrderNo == taskCancelDto.TaskId);
+ // 娌℃湁浠诲姟寮哄埗鍙栨秷
+ if (task == null) return aGVResponse.OK();
+
+ if (task.TaskStatus == (int)TaskInStatusEnum.InNew)
+ {
+ task.TaskStatus = (int)TaskInStatusEnum.InCancel;
+ // 鍏ュ簱浠诲姟鐩存帴鍒犻櫎
+ _unitOfWorkManage.BeginTran();
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ return aGVResponse.OK();
+ }
+ else if(task.TaskStatus == (int)TaskOutStatusEnum.OutNew)
+ {
+ // 鍑哄簱浠诲姟鎭㈠搴撳瓨
+ var stockInfo = await _stockInfoService.GetStockInfoAsync(task.PalletCode);
+ if (stockInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹task.PalletCode}鐨勫簱瀛樹俊鎭�");
+ var locationInfo = await _locationInfoService.GetLocationInfoAsync(stockInfo.LocationCode);
+ if (locationInfo == null) return aGVResponse.Error($"鏈壘鍒版墭鐩榹stockInfo.LocationCode}鐨勮揣浣嶄俊鎭�");
+ if (stockInfo.StockStatus != (int)StockStatusEmun.鍑哄簱閿佸畾 || locationInfo.LocationStatus != (int)LocationStatusEnum.InStockLock)
+ {
+ return aGVResponse.Error($"褰撳墠搴撳瓨{stockInfo.StockStatus}鎴栬�呰揣浣峽locationInfo.LocationStatus}鐘舵�佷俊鎭敊璇�");
+ }
+ stockInfo.StockStatus = (int)StockStatusEmun.鍏ュ簱瀹屾垚;
+ locationInfo.LocationStatus = (int)LocationStatusEnum.InStock;
+ task.TaskStatus = (int)TaskOutStatusEnum.OutCancel;
+ _unitOfWorkManage.BeginTran();
+ _locationInfoService.UpdateData(locationInfo);
+ _stockInfoService.UpdateData(stockInfo);
+ BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateTypeEnum.鑷姩瀹屾垚 : OperateTypeEnum.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ return aGVResponse.OK();
+ }
+ return aGVResponse.Error("浠诲姟宸茬粡鍦ㄦ墽琛屼腑锛屼笉鍙彇娑�");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return aGVResponse.Error($"WMS浠诲姟鍙栨秷鎺ュ彛閿欒锛歿ex.Message}");
+ }
+ }
+
+ #endregion 鏋佸嵎搴撲换鍔℃ā鍧�
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3