From 334ecd210dbadba93c8ac7cf1c6255db999f226d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 19 七月 2025 09:24:24 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
index c3c168d..d698f98 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -251,6 +251,15 @@
task.NextAddress = router.NextPosi;
}
}
+ else
+ {
+ if (taskTypeGroup == TaskTypeGroup.InboundGroup)
+ {
+ task.CurrentAddress = router.StartPosi;
+ task.NextAddress = "";
+ task.DeviceCode = router.ChildPosiDeviceCode;
+ }
+ }
}
tasks.Add(task);
}
@@ -321,7 +330,7 @@
/// <param name="palletCode"></param>
/// <param name="sourceAddress"></param>
/// <returns></returns>
- public WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, int taskType=630)
+ public WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress, string roadWay="", int taskType=630)
{
WebResponseContent content = new WebResponseContent();
try
@@ -343,7 +352,7 @@
Id = 1,
TaskNum = DateTime.Now.ToString("mmss").ObjToInt(),
PalletCode="",
- RoadWay="",
+ RoadWay= roadWay ?? "",
TaskType= taskType,
PalletType=1,
TaskStatus=TaskStatusEnum.New.ObjToInt(),
@@ -631,6 +640,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = "")
{
+ //鍒ゆ柇鏄惁涓虹┖
if (string.IsNullOrEmpty(currentAddress))
return BaseDal.QueryFirst(x => x.DeviceCode == deviceNo && x.TaskState == (int)TaskStatusEnum.SC_Execute, TaskOrderBy);
else
--
Gitblit v1.9.3