From cba2c0ff983f40757aa9840a3bd520c28a9896d9 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期三, 15 四月 2026 17:37:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
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;
}
-
-
}
}
--
Gitblit v1.9.3