From 0005d58f6888dd3e4524784d1b6f103f9b1c588e Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 30 三月 2026 18:33:22 +0800
Subject: [PATCH] 合并
---
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 578 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 568 insertions(+), 10 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 0464857..933b1e7 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -2,14 +2,17 @@
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;
@@ -31,6 +34,9 @@
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;
@@ -51,7 +57,10 @@
HttpClientHelper httpClientHelper,
IConfiguration configuration,
RoundRobinService roundRobinService,
- IMesService mesService) : base(BaseDal)
+ IMesService mesService,
+ ITask_HtyService task_HtyService,
+ IStockInfo_HtyService stockInfo_HtyService,
+ IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_mapper = mapper;
_stockInfoService = stockInfoService;
@@ -60,6 +69,9 @@
_configuration = configuration;
_roundRobinService = roundRobinService;
_mesService = mesService;
+ _task_HtyService = task_HtyService;
+ _stockInfo_HtyService = stockInfo_HtyService;
+ _unitOfWorkManage = unitOfWorkManage;
}
#region WCS閫昏緫澶勭悊
@@ -216,6 +228,12 @@
var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
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 () =>
{
WebResponseContent content = new WebResponseContent();
@@ -248,7 +266,7 @@
{
return content.Error($"浠诲姟瀹屾垚澶辫触锛歁ES杩涚珯澶辫触: {inboundResult?.Data?.Msg ?? inboundResult?.ErrorMessage ?? "鏈煡閿欒"}");
}
- return await CompleteTaskAsync(task);
+ return await CompleteTaskAsync(task, "鍏ュ簱瀹屾垚");
});
}
catch (Exception ex)
@@ -273,6 +291,19 @@
var stockInfo = await _stockInfoService.GetStockInfoAsync(taskDto.PalletCode);
if (stockInfo == null) return WebResponseContent.Instance.Error("鏈壘鍒板搴斿簱瀛樹俊鎭�");
+ // 鍒ゆ柇鏄笉鏄瀬鍗峰簱浠诲姟
+ 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);
+ }
+
+ WebResponseContent content = new WebResponseContent();
return await ExecuteWithinTransactionAsync(async () =>
{
stockInfo.LocationId = 0;
@@ -285,7 +316,23 @@
var updateStockResult = await _stockInfoService.UpdateStockAsync(stockInfo);
if (!updateLocationResult || !updateStockResult)
return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触");
- return await CompleteTaskAsync(task);
+
+ // 璋冪敤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)
@@ -331,7 +378,7 @@
if (!updateSourceResult || !updateTargetResult || !updateStockResult)
return WebResponseContent.Instance.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
- return await CompleteTaskAsync(task);
+ return await CompleteTaskAsync(task, "绉诲簱瀹屾垚");
});
}
catch (Exception ex)
@@ -368,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>
@@ -376,7 +478,6 @@
{
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("鏈壘鍒板搴旂殑搴撳瓨淇℃伅");
@@ -411,6 +512,61 @@
}
/// <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}");
+ }
+ }
+
+ /// <summary>
/// 淇敼浠诲姟鐘舵�侊紙鏍规嵁浠诲姟ID淇敼涓烘寚瀹氱姸鎬侊級
/// </summary>
/// <param name="taskId"></param>
@@ -430,11 +586,10 @@
return WebResponseContent.Instance.OK("淇敼鎴愬姛", tasks);
}
catch (Exception ex)
- {
+ {
return WebResponseContent.Instance.Error($"淇敼澶辫触: {ex.Message}");
}
}
-
/// <summary>
/// 鏌ユ壘鎵樼洏鏄惁鏈変换鍔�
@@ -460,14 +615,16 @@
/// <summary>
/// 瀹屾垚浠诲姟鍚庣粺涓�澶勭悊锛堝垹闄や换鍔℃暟鎹級
/// </summary>
- private async Task<WebResponseContent> CompleteTaskAsync(Dt_Task task)
+ 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("浠诲姟瀹屾垚");
}
@@ -961,5 +1118,406 @@
}
#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, outTaskCompleteDto.ToJson()).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