From 952a65217562bf2441dd57d02fbd35bab169cf42 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 02 四月 2026 15:08:59 +0800
Subject: [PATCH] 优化
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 113 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 82 insertions(+), 31 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 a9e0d4b..7557685 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"
@@ -55,6 +55,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 +75,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 +87,7 @@
_apiInfoService = apiInfoService;
_trackloginfoService = trackloginfoService;
_stationMangerService = stationMangerService;
+ _stationInfo = stationInfo;
}
public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTasksDTO> taskDTOs)
{
@@ -94,11 +96,11 @@
{
List<object> objects = new List<object>();
foreach (var item in taskDTOs)
- {
+ {
foreach (var task in item.tasks)
{
#region 鍒ゆ柇
- var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
+ var contentStatus = TaskHelpMethods.isOkTaskInfo(task, true, true);
if (!contentStatus.Status)
{
objects.Add(new
@@ -107,7 +109,6 @@
Message = $"浠诲姟鍙枫�恵task.taskCode}銆憑content.Message}"
});
continue;
- //throw new Exception(content.Message);
}
if (BaseDal.QueryFirst(x => x.WMSTaskNum == task.taskCode && x.TaskType == item.taskType) != null)
{
@@ -119,7 +120,7 @@
continue;
//throw new Exception($"浠诲姟鍙枫�恵task.taskCode}銆戝凡瀛樺湪浠诲姟");
}
- if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode && x.TaskType == item.taskType) != null)
+ if (BaseDal.QueryFirst(x => x.PalletCode == task.containerCode /*&& x.TaskType == item.taskType*/) != null)
{
objects.Add(new
{
@@ -129,7 +130,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
{
@@ -142,6 +143,7 @@
#endregion
switch (item.taskType)
{
+ #region 鍑箰澹獳GV闈㈡枡搴�
case (int)TaskTypeEnum.MLInbound:
content = CreateKLSNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -150,6 +152,8 @@
content = CreateKLSNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
+ #endregion
+ #region 鏃疯鍥涘悜杞︽垚鍝佸簱
case (int)TaskTypeEnum.CPInbound:
content = CreateRGVNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -158,22 +162,36 @@
content = CreateRGVNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJInbound:
+ case (int)TaskTypeEnum.CPMoveInventory:
+ content = CreateRGVNewMoveTask(task, item.taskType);
+ objects.Add(content.Data);
+ break;
+ #endregion
+ #region 娴峰悍AGV
+ case(int)TaskTypeEnum.STURR:
+ case (int)TaskTypeEnum.Q1TSJ4:
content = CreateHKNewInTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.CJOutbound:
+ case (int)TaskTypeEnum.STU0003:
+ case (int)TaskTypeEnum.CHUKU1:
content = CreateHKNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
- case (int)TaskTypeEnum.Carry:
+ 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.CJCarry:
+ case (int)TaskTypeEnum.F04:
+ case (int)TaskTypeEnum.F02:
+ case (int)TaskTypeEnum.RK3F:
+ case (int)TaskTypeEnum.CK3F:
content = CJCarryTaske(task, item.taskType);
objects.Add(content.Data);
break;
+ #endregion
default:
objects.Add(new
{
@@ -212,7 +230,7 @@
var deviceName = "";
try
{
- Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode&&x.TaskType!=TaskTypeEnum.CPMoveInventory.ObjToInt());
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode && x.TaskType != TaskTypeEnum.CPMoveInventory.ObjToInt());
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
@@ -221,13 +239,13 @@
//鍥涘悜杞�
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ 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 鍑箰澹�
if (isGALAXISTask)
{
- deviceName= "鍑箰澹獳GV";
+ deviceName = "鍑箰澹獳GV";
KLS = new CancelGALAXISTask
{
taskId = dt_Task.WMSTaskNum,
@@ -256,9 +274,9 @@
if (isAGV)
{
deviceName = "鍥涘悜杞�";
- if (dt_Task.RGVTaskId==0)
+ if (dt_Task.RGVTaskId == 0)
{
- if (dt_Task.TaskType == TaskTypeEnum.CPOutbound.ObjToInt()&&dt_Task.TaskState==TaskStatusEnum.RGV_WaitSend.ObjToInt())
+ if (dt_Task.TaskType == TaskTypeEnum.CPOutbound.ObjToInt() && dt_Task.TaskState == TaskStatusEnum.RGV_WaitSend.ObjToInt())
{
//淇敼搴撲綅鐘舵��
var rgvlocaiion = _rGVLocationInfoService.Repository.QueryFirst(x => x.LocationCode == dt_Task.SourceAddress);
@@ -300,11 +318,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 == "鎴愬姛")
@@ -358,7 +381,7 @@
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ 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.Grade = updateTaskPriority.taskPriority;
#region 鍑箰澹�
@@ -1098,7 +1121,9 @@
{
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
- EnableStatus = item.EnableStatus
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
+
});
}
content.OK(data: list);
@@ -1116,35 +1141,61 @@
{
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
- EnableStatus = item.EnableStatus
+ EnableStatus = item.EnableStatus,
+ PalletCode = item.PalletCode
});
}
content.OK(data: list);
}
else if (getLocationInfo.WarehouseId == 3)
{
-
+ //杩欓噷鏄彁鍗囨満鐨�
+ 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");
+ list.Add(new
+ {
+ LoctionCode = value,
+ LocationStatus = value!=0? 100 : 0,
+ EnableStatus = 0,
+ });
}
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)
{
//璇诲彇鍏夌數淇″彿
var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "F1") as OtherDevice;
- if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�") ;
+ if (device == null) throw new Exception("鏈壘鍒�1妤艰川妫�闂ㄨ澶囦俊鎭�");
if (!device.IsConnected) throw new Exception("PLC1妤艰川妫�闂ㄨ澶囪繛鎺ュけ璐�");
var sta = _stationMangerService.Repository.QueryData(x => x.Remark == "鎴愬搧搴�");
foreach (var item in sta)
{
- bool value = device.GetValue<QualityInspectionCommandEnum,bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
- list.Add(new
- {
- LoctionCode = item.StationCode,
- LocationStatus = value?100:0,
- EnableStatus = 0,
- });
+ bool value = device.GetValue<QualityInspectionCommandEnum, bool>(QualityInspectionCommandEnum.R_StockAvailableSymbol, item.StationCode);
+ list.Add(new
+ {
+ LoctionCode = item.StationCode,
+ LocationStatus = value ? 100 : 0,
+ EnableStatus = 0,
+ });
}
content.OK(data: list);
}
@@ -1338,6 +1389,6 @@
}
-
+
}
}
--
Gitblit v1.9.3