From 75dcfe564467731b993519eb59ce330703ed1d5b Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期六, 25 四月 2026 16:26:04 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
index b23d9ec..c7d972f 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/RobotTaskService.cs
@@ -192,10 +192,11 @@
StockDTO stock = BuildRobotTaskStock(task, configKey);
// 鑾峰彇鎶撳彇鍜屾斁缃湴鍧�鐨勭嚎浣撻厤缃紙濡傛灉鏈夛級
- var section = App.Configuration.GetSection("RobotTaskAddressRules").GetSection(stock?.TargetLineNo ?? string.Empty).GetChildren().Select(c => c.Value).ToArray();
+ var section = App.Configuration.GetSection("RobotAddressRules").GetSection(stock?.TargetLineNo ?? string.Empty).GetChildren().Select(c => c.Value).ToArray();
if (section.Length < 2)
return WebResponseContent.Instance.Error($"鏈壘鍒扮嚎浣揫{stock?.TargetLineNo}]鐨勫湴鍧�閰嶇疆");
+ int taskType = MapConfigKeyToRobotTaskType(configKey);
// 鍒涘缓鏈湴鏈哄櫒浜轰换鍔�
Dt_RobotTask robotTask = new()
{
@@ -204,14 +205,14 @@
RobotTargetAddress = section[1]!,
RobotSourceAddressLineCode = stock?.SourceLineNo ?? string.Empty,
RobotTargetAddressLineCode = stock?.TargetLineNo ?? string.Empty,
- RobotRoadway = stock?.Roadway ?? string.Empty,
+ RobotRoadway = stock?.TargetLineNo == "11068" ? "娉ㄦ恫缁勭洏鏈烘鎵�" : "鎹㈢洏鏈烘鎵�" ?? string.Empty, // todo
RobotSourceAddressPalletCode = stock?.SourcePalletNo ?? string.Empty,
RobotTargetAddressPalletCode = stock?.TargetPalletNo ?? string.Empty,
- RobotTaskType = MapConfigKeyToRobotTaskType(configKey),
+ RobotTaskType = taskType,
RobotTaskState = (int)TaskRobotStatusEnum.RobotNew,
RobotGrade = task.Grade,
Creater = "WCS_Local",
- RobotTaskTotalNum = 1,
+ RobotTaskTotalNum = taskType == (int)RobotTaskTypeEnum.GroupPallet ? 48 : 1,
CreateDate = DateTime.Now
};
--
Gitblit v1.9.3