From d878d164699ad5eafb1241b1de0a108ff79d18a4 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 15 四月 2026 17:37:01 +0800
Subject: [PATCH] 优化跨楼层任务
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs | 24 +++--
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs | 8 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs | 5 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs | 161 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 182 insertions(+), 16 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs"
index af2eca6..39b9633 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/HoistEnum.cs"
@@ -85,7 +85,166 @@
/// <summary>
/// 4妤煎嚭搴撴壂鐮佸畬鎴愪俊鍙�
/// </summary>
- ROutScanningCompletionSignal
+ ROutScanningCompletionSignal,
+
+ #region 鎻愬崌鏈烘姤璀︿俊鎭�
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀301
+ /// </summary>
+ R_ElectricDrumA301,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀302
+ /// </summary>
+ R_ElectricDrumA302,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀303
+ /// </summary>
+ R_ElectricDrumA303,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀304
+ /// </summary>
+ R_ElectricDrumA304,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀305
+ /// </summary>
+ R_ElectricDrumA305,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀306
+ /// </summary>
+ R_ElectricDrumA306,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼姤璀307
+ /// </summary>
+ R_ElectricDrumA307,
+
+ /// <summary>
+ /// 鐢垫粴绛�3妤兼彁鍗囨満1鎶ヨT001
+ /// </summary>
+ R_ElectricDrumT001,
+
+ /// <summary>
+ /// 鎻愬崌鏈�1鍙橀鍣ㄦ姤璀�
+ /// </summary>
+ R_InverterAlarm,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀401
+ /// </summary>
+ R_ElectricDrumA401,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀402
+ /// </summary>
+ R_ElectricDrumA402,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀403
+ /// </summary>
+ R_ElectricDrumA403,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀404
+ /// </summary>
+ R_ElectricDrumA404,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀405
+ /// </summary>
+ R_ElectricDrumA405,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀406
+ /// </summary>
+ R_ElectricDrumA406,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀407
+ /// </summary>
+ R_ElectricDrumA407,
+
+ /// <summary>
+ /// 鎻愬崌鏈�2鍙橀鍣ㄦ姤璀�
+ /// </summary>
+ R_ElectricDrumT002,
+
+ /// <summary>
+ /// 鎻愬崌鏈�1涓婇檺浣嶆姤璀�
+ /// </summary>
+ R_UpperlimitAlarm1,
+
+ /// <summary>
+ /// 鎻愬崌鏈�1涓嬮檺浣嶆姤璀�
+ /// </summary>
+ R_LowerlimitAlarm1,
+
+ /// <summary>
+ /// 鎻愬崌鏈�2涓婇檺浣嶆姤璀�
+ /// </summary>
+ R_UpperlimitAlarm2,
+
+
+ /// <summary>
+ /// 鎻愬崌鏈�2涓嬮檺浣嶆姤璀�
+ /// </summary>
+ R_LowerlimitAlarm2,
+
+
+ /// <summary>
+ /// 璇荤爜鍣�3妤兼壂鐮佸紓甯�
+ /// </summary>
+ R_ScancodeError1,
+
+
+ /// <summary>
+ /// 璇荤爜鍣�4妤兼壂鐮佸紓甯�
+ /// </summary>
+ R_ScancodeError2,
+
+ /// <summary>
+ /// 鐢垫煖鎬ュ仠3妤�
+ /// </summary>
+ R_EmergencSytop1,
+
+ /// <summary>
+ /// 鐢垫煖鎬ュ仠4妤�
+ /// </summary>
+ R_EmergencSytop2,
+
+ /// <summary>
+ ///鎻愬崌鏈烘�ュ仠3妤�
+ /// </summary>
+ R_TSJEmergencSytop1,
+
+ /// <summary>
+ /// 鎻愬崌鏈烘�ュ仠4妤�
+ /// </summary>
+ R_TSJEmergencSytop2,
+
+ /// <summary>
+ /// 鐢垫粴绛�4妤兼姤璀002
+ /// </summary>
+ R_DrumAlarmT002,
+
+ /// <summary>
+ /// 澶囩敤1
+ /// </summary>
+ R_TSJSpare1,
+
+ /// <summary>
+ /// 澶囩敤1
+ /// </summary>
+ R_TSJSpare2,
+
+ #endregion
+
+
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
index 79e5094..d0beb41 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/KLSTaskMethods.cs"
@@ -365,14 +365,16 @@
TargetAddress = taskDTO.toLocationCode,
Creater = "WMS",
};
- content = SendHIKROBOTTask(dt_Task);
- if (!content.Status) throw new Exception(content.Message);
dt_Task.Dispatchertime = DateTime.Now;
BaseDal.AddData(dt_Task);
+ return content.OK(data: new
+ {
+ taskCode = taskDTO.taskCode,
+ Message = "鎴愬姛"
+ });
}
catch (Exception ex)
{
-
content.Error(ex.Message);
}
return content;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs"
index ba18d44..bf4cffe 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs"
@@ -71,6 +71,7 @@
if (content.Status)
{
item.TaskState = (int)TaskStatusEnum.Execut;
+ _taskService.UpdateData(item);
}
}
else
@@ -85,11 +86,13 @@
{
// 鍘熶换鍔＄姸鎬佹敼涓虹瓑寰呯┖杞�
item.TaskState = (int)TaskStatusEnum.WaitingHkAGVMovePosition;
+ _taskService.UpdateData(item);
}
}
else
{
item.ExceptionMessage = "鏈壘鍒板彲鐢ˋGV灏忚溅";
+ _taskService.UpdateData(item);
}
}
}
@@ -97,6 +100,7 @@
else
{
item.ExceptionMessage = "鑾峰彇AGV灏忚溅淇℃伅澶辫触";
+ _taskService.UpdateData(item);
}
}
else if (item.TaskType == (int)TaskTypeEnum.F01)
@@ -111,7 +115,7 @@
{
// 浠庝换鍔＄殑璧峰鍦板潃涓彁鍙栭渶瑕佺殑妤煎眰浠ｇ爜
string requiredMapCode = GetMapCodeFromAddress(item.SourceAddress);
- if (string.IsNullOrEmpty(requiredMapCode))
+ if (requiredMapCode==null)
{
item.ExceptionMessage = $"鏃犳硶浠庣洰鏍囧湴鍧� {item.SourceAddress} 涓瘑鍒ゼ灞備俊鎭�";
_taskService.UpdateData(item);
@@ -128,6 +132,7 @@
if (content.Status)
{
item.TaskState = (int)TaskStatusEnum.Execut;
+ _taskService.UpdateData(item);
}
}
else
@@ -141,17 +146,18 @@
if (callCarResult.Status)
{
item.TaskState = (int)TaskStatusEnum.WaitingHkAGVMovePosition;
+ _taskService.UpdateData(item);
}
}
else
{
item.ExceptionMessage = "鏈壘鍒板彲鐢ˋGV灏忚溅";
+ _taskService.UpdateData(item);
}
}
}
}
}
- _taskService.UpdateData(item);
}
}
@@ -263,20 +269,16 @@
private string GetMapCodeFromAddress(string address)
{
if (string.IsNullOrEmpty(address))
+ {
return null;
-
+ }
// 鍦板潃鏍煎紡绀轰緥 锛欰A 瀵瑰簲 0339050AA0309145
// keys 鏄� AA銆丅B銆丆C銆丏D銆丒E銆丗F锛寁ule鏄搴旂殑鐐逛綅淇℃伅
- foreach (var floorCode in FloorMapping.FloorMap.Keys)
+ else
{
- if (address.Contains(floorCode))
- {
- return floorCode;//杩斿洖鐨勫氨鏄疉A銆丅B銆丆C銆丏D銆丒E銆丗F涓殑涓�涓紝浠ｈ〃瀵瑰簲鐨勬ゼ灞�
- }
+ var reslut = _stationInfoService.Repository.QueryFirst(x => x.StationCode == address);
+ return reslut.FloorNumber;
}
- return null;
}
-
-
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs"
index 8e37567..62a28f5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs"
@@ -13,6 +13,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core.BaseRepository;
@@ -38,8 +39,9 @@
private readonly ITrackloginfoService _trackloginfoService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IAGVCartInfoService _agvcartInfoService;
+ private readonly IStationInfoService _stationInfoService;
- public TaskJob(ITaskService taskService, IApiInfoService apiInfoService, IRGVLocationInfoService rGVLocationInfoService, IStationMangerService stationMangerService, ITrackloginfoService trackloginfoService, IUnitOfWorkManage unitOfWorkManage, IAGVCartInfoService agvcartInfoService)
+ public TaskJob(ITaskService taskService, IApiInfoService apiInfoService, IRGVLocationInfoService rGVLocationInfoService, IStationMangerService stationMangerService, ITrackloginfoService trackloginfoService, IUnitOfWorkManage unitOfWorkManage, IAGVCartInfoService agvcartInfoService, IStationInfoService stationInfoService)
{
_taskService = taskService;//娉ㄥ叆
_apiInfoService = apiInfoService;
@@ -48,6 +50,7 @@
_trackloginfoService = trackloginfoService;
_unitOfWorkManage = unitOfWorkManage;
_agvcartInfoService = agvcartInfoService;
+ _stationInfoService = stationInfoService;
}
public Task Execute(IJobExecutionContext context)
--
Gitblit v1.9.3