From aeb971fe12b73d83d31a83b00f0a6e2876b24a00 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 09 四月 2026 21:21:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 105 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 91 insertions(+), 14 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index cedaf63..dcabee7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Newtonsoft.Json;
using SixLabors.ImageSharp.ColorSpaces;
using SqlSugar;
using System.Collections.Generic;
@@ -55,6 +56,7 @@
private readonly IRepository<Dt_TaskExecuteDetail> _taskExecuteDetailRepository;
private readonly IApiInfoService _apiInfoService;
private readonly IStationMangerService _stationMangerService;
+ private readonly IStationInfoService _stationInfo;
private readonly IMapper _mapper;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -74,7 +76,7 @@
/// </summary>
public IRepository<Dt_Task> Repository => BaseDal;
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService) : base(BaseDal)
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository, IMapper mapper, IKLSLocationInfoService kLSLocationInfoService, IRGVLocationInfoService rGVLocationInfoService, IHKLocationInfoService hKLocationInfoService, IApiInfoService apiInfoService, ITrackloginfoService trackloginfoService, IStationMangerService stationMangerService, IStationInfoService stationInfo) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -86,6 +88,7 @@
_apiInfoService = apiInfoService;
_trackloginfoService = trackloginfoService;
_stationMangerService = stationMangerService;
+ _stationInfo = stationInfo;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -128,7 +131,7 @@
continue;
//throw new Exception($"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
}
- if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType) != null)
+ if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType && x.TaskState < TaskStatusEnum.TakeFinish.ObjToInt()) != null)
{
objects.Add(new
{
@@ -166,6 +169,7 @@
break;
#endregion
#region 娴峰悍AGV
+ case (int)TaskTypeEnum.STURR:
case (int)TaskTypeEnum.Q1TSJ4:
content = CreateHKNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -175,12 +179,17 @@
content = CreateHKNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.F01:
+
case (int)TaskTypeEnum.Q3RK:
case (int)TaskTypeEnum.Q3CK:
content = CarryTask(task, item.taskType);
objects.Add(content.Data);
break;
+ case (int)TaskTypeEnum.F01:
+ content = HKF01Transport(task, item.taskType);
+ break;
+ case (int)TaskTypeEnum.F04:
+ case (int)TaskTypeEnum.F03:
case (int)TaskTypeEnum.F02:
case (int)TaskTypeEnum.RK3F:
case (int)TaskTypeEnum.CK3F:
@@ -235,7 +244,7 @@
//鍥涘悜杞�
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.F01 || dt_Task.TaskType == (int)TaskTypeEnum.RK3F || dt_Task.TaskType == (int)TaskTypeEnum.CK3F || dt_Task.TaskType == (int)TaskTypeEnum.Q1TSJ4 || dt_Task.TaskType == (int)TaskTypeEnum.STU0003 || dt_Task.TaskType == (int)TaskTypeEnum.F02 || dt_Task.TaskType == (int)TaskTypeEnum.CHUKU1 || dt_Task.TaskType == (int)TaskTypeEnum.Q3RK || dt_Task.TaskType == (int)TaskTypeEnum.Q3CK || dt_Task.TaskType == (int)TaskTypeEnum.STURR;
//杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
dt_Task.TaskType = TaskStatusEnum.WMSCancel.ObjToInt();
#region 鍑箰澹�
@@ -314,11 +323,16 @@
cancelHIKROBOTTask = new CancelHIKROBOTTask
{
robotTaskCode = dt_Task.WMSTaskNum,
- cancelType = "CANCEL"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
+ cancelType = "DROP"//鍘熻蒋鍙栨秷锛孌ROP浜哄伐浠嬪叆锛堝師纭彇娑堬級
};
+ var headers = new Dictionary<string, string>
+ {
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString() + wMSCancelTask.TaskCode }
+ };
+
Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(CancelHIKROBOTTask));
if (apiInfo == null) throw new Exception("鏈壘鍒板洓鍚戣溅AGV浠诲姟涓嬪彂鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
- string response = HttpHelper.Post(apiInfo.ApiAddress, cancelHIKROBOTTask.Serialize());
+ string response = HttpHelper.Post(apiInfo.ApiAddress, cancelHIKROBOTTask.Serialize(), headers: headers);
HIKROBOTReturn hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
content.OK(data: hIKROBOTReturn);
if (hIKROBOTReturn.code == "SUCCESS" && hIKROBOTReturn.message == "鎴愬姛")
@@ -1112,7 +1126,9 @@
{
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
- EnableStatus = item.EnableStatus
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
+
});
}
content.OK(data: list);
@@ -1130,7 +1146,8 @@
{
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
- EnableStatus = item.EnableStatus
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
});
}
content.OK(data: list);
@@ -1141,17 +1158,33 @@
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
if (device == null) throw new Exception("鏈壘鍒版彁鍗囨満璁惧淇℃伅");
if (!device.IsConnected) throw new Exception("PLC1鎻愬崌鏈鸿澶囪繛鎺ュけ璐�");
- var value = device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJ");
+ var value = device.GetValue<HoistEnum, short>(HoistEnum.Outboundmaterialbox, "TSJC3F");
list.Add(new
{
LoctionCode = value,
- LocationStatus = value!=0? 100 : 0,
+ LocationStatus = value != 0 ? 100 : 0,
EnableStatus = 0,
});
+ content.OK(data: list);
}
else if (getLocationInfo.WarehouseId == 4)
{
-
+ List<Dt_HKLocationInfo> rGVLocationInfos = new List<Dt_HKLocationInfo>();
+ if (!string.IsNullOrEmpty(getLocationInfo.AreaCode))
+ rGVLocationInfos = _hKLocationInfoService.Repository.QueryData(x => x.WarehouseId == getLocationInfo.AreaCode.ObjToInt());
+ else
+ rGVLocationInfos = _hKLocationInfoService.Repository.QueryData();
+ foreach (var item in rGVLocationInfos)
+ {
+ list.Add(new
+ {
+ LoctionCode = item.LocationCode,
+ LocationStatus = item.LocationStatus,
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
+ });
+ }
+ content.OK(data: list);
}
else if (getLocationInfo.WarehouseId == 5)
{
@@ -1159,7 +1192,7 @@
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
if (!device.IsConnected) throw new Exception("PLC1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�");
- var sta = _stationMangerService.Repository.QueryData(x => x.Remark == "鎴愬搧搴�");
+ var sta = _stationMangerService.Repository.QueryData(x => x.StationName.Contains("鎴愬搧浠�"));
foreach (var item in sta)
{
bool value = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
@@ -1201,7 +1234,28 @@
{
throw new NotImplementedException();
}
-
+ public WebResponseContent InboundElevatorExit(string LocationCode, string containerCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ inboundElevatorExitDTO inboundElevator=new inboundElevatorExitDTO();
+ try
+ {
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(inboundElevatorExitDTO)) ?? throw new Exception("鏈壘鍒�4F鎻愬崌鏈哄嚭鍙ｆ墭鐩樺彿涓婃姤WMS鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ inboundElevator.containerCode= containerCode;
+ inboundElevator.toLocationCode = LocationCode;
+ string response = HttpHelper.Post(apiInfo.ApiAddress, inboundElevator.Serialize());
+ content.OK(data: response);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(inboundElevator, content, "4F鎻愬崌鏈哄嚭鍙ｆ墭鐩樺彿涓婃姤WMS", "", "");
+ }
+ }
/// <summary>
/// 鏂欑楠岃瘉
/// </summary>
@@ -1210,7 +1264,30 @@
/// <returns></returns>
public WebResponseContent MaterialBoxInspection(string taskCode, string containerCode)
{
- throw new NotImplementedException();
+ WebResponseContent content = new WebResponseContent();
+ inboundTransportCheckDTO checkDTO = new inboundTransportCheckDTO();
+ try
+ {
+ checkDTO.containerCode = containerCode;
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(inboundTransportCheckDTO)) ?? throw new Exception("鏈壘鍒拌鐗囧叆搴�3F鍒�4F杩愯緭绠卞彿鏍￠獙鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ string response = HttpHelper.Post(apiInfo.ApiAddress, checkDTO.Serialize());
+ content.OK(data: response);
+ WMSReturn wMSReturn = response.DeserializeObject<WMSReturn>();
+ if (wMSReturn == null) throw new Exception("WMS杩斿洖缁撴灉杞崲澶辫触锛�");
+ if (!wMSReturn.success) throw new Exception(wMSReturn.message);
+ string dataJson = wMSReturn.result.ToString();
+ Exists? exists = JsonConvert.DeserializeObject<Exists>(dataJson);
+ if (exists == null) throw new Exception($"WMS杩斿洖缁撴灉鐨剅esult杞崲澶辫触");
+ return WebResponseContent.Instance.OK(exists.errorAreaCode);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(checkDTO, content, "瑁佺墖鍏ュ簱3F鍒�4F杩愯緭绠卞彿鏍￠獙", "", "");
+ }
}
/// <summary>
--
Gitblit v1.9.3