From 1dce8a2ad238624ea832e0418557b4a5b53dce23 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 13 四月 2026 17:44:55 +0800
Subject: [PATCH] 添加仓库的启用禁用状态，优化修改分区接口，优化提升机job，添加海康仓位到仓位接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 158 insertions(+), 13 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
index c7a6a39..e978596 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/HKTaskMethods.cs"
@@ -13,6 +13,8 @@
using WIDESEAWCS_DTO;
using WIDESEAWCS_DTO.AGV.HIKROBOT;
using System.Diagnostics.CodeAnalysis;
+using System.Reflection.PortableExecutable;
+using WIDESEAWCS_QuartzJob;
namespace WIDESEAWCS_TaskInfoService
{
@@ -32,6 +34,10 @@
try
{
Dt_HKLocationInfo? hKLocationInfo = null;
+ if (taskType==(int)TaskTypeEnum.STURR)
+ {
+ var reslut=_stationInfo.Repository.QueryFirst(x=>x.StationCode==taskDTO.fromLocationCode) ?? throw new Exception($"鏈壘鍒拌捣鐐硅揣浣嶃�恵taskDTO.fromLocationCode}銆�");
+ }
#region 鐐瑰埌鐐�
if (!string.IsNullOrEmpty(taskDTO.toLocationCode))
{
@@ -42,6 +48,23 @@
//鑾峰彇璐т綅淇℃伅
else
hKLocationInfo = _hKLocationInfoService.GetFreeLocationInfo(taskDTO.toAreaCode) ?? throw new Exception($"鏈壘鍒扮粓鐐瑰簱鍖恒�恵taskDTO.toAreaCode}銆戝彲鐢ㄧ┖璐т綅锛�");
+ if (taskType == (int)TaskTypeEnum.Q1TSJ4)
+ {
+ var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ") as OtherDevice;
+ if (device.IsConnected)
+ {
+ var reslu = device.GetValue<HoistEnum, string>(HoistEnum.Emptycontainernumber);
+ var result = reslu?.TrimEnd('\0')?.Substring(2);
+ if (reslu == taskDTO.containerCode && result != null)
+ {
+ throw new Exception($"褰撳墠鐨勬枡绠卞彿涓簕reslu}涓巤taskDTO.containerCode}鏂欑鍙蜂笉鍖归厤");
+ }
+ }
+ else
+ {
+ throw new Exception("鎻愬崌鏈轰俊鎭澶囪繛鎺ュけ璐�");
+ }
+ }
Dt_Task dt_Task = new Dt_Task()
{
TaskNum = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
@@ -107,10 +130,20 @@
WebResponseContent content = new WebResponseContent();
try
{
+ //4妤煎簱鍐呭埌鎻愬崌鏈�
Dt_HKLocationInfo? hKLocationInfo = _hKLocationInfoService.Repository.QueryFirst(x => x.LocationCode == taskDTO.fromLocationCode) ?? throw new Exception($"鏈壘鍒拌捣鐐瑰簱浣嶃�恵taskDTO.fromLocationCode}銆戯紒");
if (hKLocationInfo.LocationStatus != LocationStatusEnum.InStock.ObjToInt()) throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戝綋鍓嶅簱浣嶇姸鎬佷笉鍙嚭搴擄紒");
if (hKLocationInfo.PalletCode != taskDTO.containerCode) throw new Exception($"璧风偣搴撲綅銆恵taskDTO.fromLocationCode}銆戠粦瀹氭枡绠卞彿銆恵hKLocationInfo.PalletCode}銆戜笌浠诲姟鏂欑鍙枫�恵taskDTO.containerCode}銆戜笉鍖归厤锛�");
- Dt_Task dt_Task = new Dt_Task()
+ //搴撳唴鍒扮幇杈圭殑鐐瑰埌鐐逛换鍔★紝鏄惁闇�瑕佸垽鏂揣浣嶇姸鎬侊紵
+ if (taskType == (int)TaskTypeEnum.STU0003)
+ {
+ var reslut = _stationInfo.Repository.QueryFirst(x => x.StationCode == taskDTO.toLocationCode) ?? throw new Exception($"鏈壘鍒扮粓鐐硅揣浣嶃�恵taskDTO.fromLocationCode}銆�");
+ if (reslut.StationStatus != (int)LocationStatusEnum.Free)
+ {
+ throw new Exception($"缁堢偣绔欏彴銆恵taskDTO.toLocationCode}銆戠姸鎬佷笉涓虹┖闂诧紒");
+ }
+ }
+ Dt_Task dt_Task = new Dt_Task()
{
TaskNum = GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
WMSTaskNum = taskDTO.taskCode,
@@ -175,8 +208,19 @@
#region 瀹炰綋绫昏浆鎹�
hIKROBOTTaskSubmit = HIKROBOTTask(task);
if (hIKROBOTTaskSubmit == null) throw new Exception("娴峰悍AGV浠诲姟瀹炰綋杞崲澶辫触");
+ var json = hIKROBOTTaskSubmit.Serialize();
#endregion
- string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskSubmit.Serialize());
+ // 鍒涘缓Headers瀛楀吀
+ var headers = new Dictionary<string, string>
+ {
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString()+task.TaskNum }
+ // 濡傛灉闇�瑕佸叾浠朒eader锛屽彲浠ョ户缁坊鍔�
+ // { "Content-Type", "application/json" }
+ };
+
+ // 浼犻�扝eaders鍙傛暟
+ string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskSubmit.Serialize(), headers: headers);
+ //string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskSubmit.Serialize());
hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
if (hIKROBOTReturn.code == "SUCCESS")
{
@@ -209,18 +253,21 @@
HIKROBOTTaskSubmit hIKROBOTTaskSubmit = new HIKROBOTTaskSubmit();
try
{
- var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType);
+ var tasktype = (TaskTypeEnum)Enum.GetValues(typeof(TaskTypeEnum)).GetValue(task.TaskType - 1);
hIKROBOTTaskSubmit.initPriority = task.Grade;
hIKROBOTTaskSubmit.robotTaskCode = task.WMSTaskNum;
hIKROBOTTaskSubmit.taskType = tasktype.ToString(); ExtraDto extraDto = new ExtraDto();
- CarrierInfoDto carrierInfoDto = new CarrierInfoDto()
+ if (task.TaskType != (int)TaskTypeEnum.MOVE && task.TaskType != (int)TaskTypeEnum.Q3RK && task.TaskType != (int)TaskTypeEnum.Q3CK && task.TaskType != (int)TaskTypeEnum.F01)
{
- carrierCode = task.PalletCode,
- carrierType = task.PalletCode.Contains("LXM") ? "DX" : "SX"
- };
- extraDto.carrierInfo.Add(carrierInfoDto);
- hIKROBOTTaskSubmit.extra = extraDto;
+ CarrierInfoDto carrierInfoDto = new CarrierInfoDto()
+ {
+ carrierCode = task.PalletCode,
+ carrierType = task.PalletCode.Contains("LXM") ? "DX" : "SX"
+ };
+ extraDto.carrierInfo.Add(carrierInfoDto);
+ hIKROBOTTaskSubmit.extra = extraDto;
+ }
switch (tasktype)
{
case TaskTypeEnum.CPInbound:
@@ -228,11 +275,11 @@
case TaskTypeEnum.MLInbound:
case TaskTypeEnum.MLOutbound:
break;
- case TaskTypeEnum.F01:
- break;
case TaskTypeEnum.RK3F:
case TaskTypeEnum.CK3F:
case TaskTypeEnum.F02:
+ case TaskTypeEnum.F03:
+ case TaskTypeEnum.F04:
{
TargetRouteDto target = new TargetRouteDto()
{
@@ -252,6 +299,7 @@
hIKROBOTTaskSubmit.targetRoute.Add(targetRoute);
}
break;
+ case TaskTypeEnum.STURR:
case TaskTypeEnum.Q1TSJ4:
{
TargetRouteDto target = new TargetRouteDto()
@@ -294,10 +342,47 @@
}
break;
case TaskTypeEnum.Q3RK:
- break;
case TaskTypeEnum.Q3CK:
+ case TaskTypeEnum.MOVE:
+ case TaskTypeEnum.F01:
+ {
+ TargetRouteDto target = new TargetRouteDto()
+ {
+ code = task.CurrentAddress,
+ operation = "DELIVERY",//鍙栬揣
+ seq = 0,
+ type = "SITE",
+ };
+ TargetRouteDto targetRoute = new TargetRouteDto()
+ {
+ code = task.NextAddress,
+ operation = "DELIVERY",//閫佽揣
+ seq = 1,
+ type = "SITE",
+ };
+ hIKROBOTTaskSubmit.targetRoute.Add(target);
+ hIKROBOTTaskSubmit.targetRoute.Add(targetRoute);
+ }
break;
- case TaskTypeEnum.Move:
+ case TaskTypeEnum.STUPTBY:
+ {
+ TargetRouteDto target = new TargetRouteDto()
+ {
+ code = task.CurrentAddress,
+ operation = "DELIVERY",//鍙栬揣
+ seq = 0,
+ type = "STORAGE",
+ };
+ TargetRouteDto targetRoute = new TargetRouteDto()
+ {
+ code = task.NextAddress,
+ operation = "DELIVERY",//閫佽揣
+ seq = 1,
+ type = "STORAGE",
+ };
+ hIKROBOTTaskSubmit.targetRoute.Add(target);
+ hIKROBOTTaskSubmit.targetRoute.Add(targetRoute);
+ }
break;
case TaskTypeEnum.CPMoveInventory:
break;
@@ -311,5 +396,65 @@
}
return hIKROBOTTaskSubmit;
}
+
+
+ /// <summary>
+ /// 娴峰悍AGV浠诲姟缁х画鎵ц
+ /// </summary>
+ /// <param name="TaskCode">浠诲姟鍙�</param>
+ /// <returns></returns>
+ public WebResponseContent Hikvisiontaskscontinue(string TaskCode, string Address = null)
+ {
+ WebResponseContent content = new WebResponseContent();
+ HIKROBOTReturn hIKROBOTReturn = null;
+ HIKROBOTTaskContinue hIKROBOTTaskContinue = null;
+ try
+ {
+ // 1. 鍙傛暟楠岃瘉
+ if (string.IsNullOrWhiteSpace(TaskCode))
+ {
+ throw new Exception("浠诲姟缂栫爜涓嶈兘涓虹┖");
+ }
+ Dt_ApiInfo? apiInfo = _apiInfoService.Repository.QueryFirst(x => x.ApiCode == nameof(HIKROBOTTaskContinue)) ?? throw new Exception("鏈壘鍒版捣搴稟GV缁х画鎵ц鎺ュ彛閰嶇疆淇℃伅锛佽妫�鏌ユ帴鍙ｉ厤缃�");
+ hIKROBOTTaskContinue = new HIKROBOTTaskContinue()
+ {
+ triggerCode = TaskCode,
+ triggerType = "TASK",//鍥哄畾鍊�
+ targetRoute = string.IsNullOrEmpty(Address) ? null :
+ new TargetRouteDto()
+ {
+ code = Address,
+ type = "SITE",
+ }
+ };
+ var headers = new Dictionary<string, string>
+ {
+ { "X-lr-request-id", DateTimeOffset.Now.ToUnixTimeSeconds().ToString()+TaskCode }
+ };
+ string response = HttpHelper.Post(apiInfo.ApiAddress, hIKROBOTTaskContinue.Serialize(), headers: headers);
+ hIKROBOTReturn = response.DeserializeObject<HIKROBOTReturn>();
+
+ if (hIKROBOTReturn.code == "SUCCESS")
+ {
+ var data = hIKROBOTReturn.data.ToString().DeserializeObject<HIKROBOTReturnData>();
+ content.OK(data: data);
+ }
+ else
+ {
+ throw new Exception(hIKROBOTReturn.message);
+ }
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ finally
+ {
+ _trackloginfoService.AddTrackLog(hIKROBOTTaskContinue, content, "娴峰悍AGV缁х画鎵ц浠诲姟", "", hIKROBOTReturn.message);
+
+ }
+ return content;
+ }
+
}
}
--
Gitblit v1.9.3