From 3b7569285434bb38736627821f7d7eb34fabca28 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 09 四月 2026 16:32:30 +0800
Subject: [PATCH] 优化海康跨楼层任务，处理设备信息写入失败任务
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 50b210d..eae3f6f 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"
@@ -130,7 +130,7 @@
continue;
//throw new Exception($"鎵樼洏鍙枫�恵task.containerCode}銆戝凡瀛樺湪浠诲姟");
}
- if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType&&x.TaskState<TaskStatusEnum.TakeFinish.ObjToInt())!=null)
+ if (BaseDal.QueryFirst(x => x.SourceAddress == task.fromLocationCode && x.TaskType == item.taskType && x.TaskState < TaskStatusEnum.TakeFinish.ObjToInt()) != null)
{
objects.Add(new
{
@@ -168,7 +168,7 @@
break;
#endregion
#region 娴峰悍AGV
- case(int)TaskTypeEnum.STURR:
+ case (int)TaskTypeEnum.STURR:
case (int)TaskTypeEnum.Q1TSJ4:
content = CreateHKNewInTask(task, item.taskType);
objects.Add(content.Data);
@@ -178,7 +178,7 @@
content = CreateHKNewOutTask(task, item.taskType);
objects.Add(content.Data);
break;
-
+
case (int)TaskTypeEnum.Q3RK:
case (int)TaskTypeEnum.Q3CK:
content = CarryTask(task, item.taskType);
@@ -243,7 +243,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||dt_Task.TaskType==(int)TaskTypeEnum.STURR;
+ 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 鍑箰澹�
@@ -331,7 +331,7 @@
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(),headers: headers);
+ 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 == "鎴愬姛")
@@ -1146,7 +1146,7 @@
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
EnableStatus = item.EnableStatus,
- PalletCode = item.PalletCode
+ PalletCode = item.PalletCode
});
}
content.OK(data: list);
@@ -1161,7 +1161,7 @@
list.Add(new
{
LoctionCode = value,
- LocationStatus = value!=0? 100 : 0,
+ LocationStatus = value != 0 ? 100 : 0,
EnableStatus = 0,
});
content.OK(data: list);
@@ -1180,7 +1180,7 @@
LoctionCode = item.LocationCode,
LocationStatus = item.LocationStatus,
EnableStatus = item.EnableStatus,
- PalletCode = item.PalletCode
+ PalletCode = item.PalletCode
});
}
content.OK(data: list);
@@ -1191,7 +1191,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);
--
Gitblit v1.9.3