From 3090db54ecfebf7ee1089bf85916b19e93f0db45 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 11 一月 2025 10:49:11 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 d23cf79..9d72778 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"
@@ -195,14 +195,14 @@
task.NextAddress = router.NextPosi;
task.DeviceCode = stationManger.StationDeviceCode;
}
- else if(item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt())
+ else if (item.TaskType == TaskTypeEnum.MesOutbound.ObjToInt())
{
task.NextAddress = router.NextPosi;
task.DeviceCode = stationManger.StackerCraneCode;
}
else
{
- task.NextAddress = item.TargetAddress;
+ task.NextAddress = router.NextPosi;
if (item.RoadWay.Contains("AGV"))
{
task.DeviceCode = item.RoadWay;
@@ -290,7 +290,7 @@
return WebResponseContent.Instance.Error($"鏈壘鍒扮珯鍙颁俊鎭�");
}
string address = AppSettings.Get("WMSApiAddress");
- if(string.IsNullOrEmpty(address))
+ if (string.IsNullOrEmpty(address))
{
return WebResponseContent.Instance.Error($"鏈壘鍒癢MSApi鍦板潃");
}
@@ -323,7 +323,7 @@
{
return WebResponseContent.Instance.Error($"鏈壘鍒癢MSApi鍦板潃");
}
- string responseStr = HttpHelper.Post($"{address}/api/Task/AssignRoadway?taskNum={taskNum}",roadwayNos.Serialize());
+ string responseStr = HttpHelper.Post($"{address}/api/Task/AssignRoadway?taskNum={taskNum}", roadwayNos.Serialize());
WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr);
if (responseContent != null && responseContent.Status && responseContent.Data != null)
{
@@ -346,7 +346,9 @@
/// <returns></returns>
public string? RequestAssignLocation(int taskNum, string roadwayNo)
{
- string responseStr = HttpHelper.Get($"http://127.0.0.1:9283/api/Task/AssignInboundTaskLocation?taskNum={taskNum}&roadwayNo={roadwayNo}");
+ string address = AppSettings.Get("WMSApiAddress");
+ if (string.IsNullOrEmpty(address)) throw new Exception("鏈壘鍒癢MSApi鍦板潃");
+ string responseStr = HttpHelper.Get($"{address}/api/Task/AssignInboundTaskLocation?taskNum={taskNum}&roadwayNo={roadwayNo}");
WebResponseContent? responseContent = JsonConvert.DeserializeObject<WebResponseContent>(responseStr);
if (responseContent != null && responseContent.Status && responseContent.Data != null)
--
Gitblit v1.9.3