From 2c69e642303e9f9c3b2e37194c4c6cdf7e1b3001 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期三, 29 四月 2026 17:26:33 +0800
Subject: [PATCH] 4-29
---
项目代码/WIDESEA_WCSServer/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
index 77c3686..4cd812b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
@@ -47,6 +47,7 @@
public Task Execute(IJobExecutionContext context)
{
var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryNew)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.TaskNum).ToList();
+ return Task.CompletedTask;
#region 浠诲姟涓嬪彂
if (newTasks.Count > 0)
{
@@ -62,9 +63,9 @@
string taskGroupId = Guid.NewGuid().ToString().Replace("-", "");
// 鑾峰彇璧峰绔欏彴
- Dt_StationManager stationManagerEnd = _stationManagerRepository.QueryFirst(x => x.stationLocation == task.SourceAddress);
+ Dt_StationManager stationManagerEnd = _stationManagerRepository.QueryFirst(x => x.StationLocation == task.SourceAddress);
// 鑾峰彇鐩殑绔欏彴
- Dt_StationManager finalmission = _stationManagerRepository.QueryFirst(x => x.stationLocation == task.TargetAddress);
+ Dt_StationManager finalmission = _stationManagerRepository.QueryFirst(x => x.StationLocation == task.TargetAddress);
if (stationManagerEnd == null) throw new Exception($"鏈壘鍒颁换鍔″彿${task.TaskId}璧峰鐐箋task.SourceAddress}浣嶇疆淇℃伅");
if (finalmission == null) throw new Exception($"鏈壘鍒颁换鍔″彿${task.TaskId}鐩爣鐐箋task.TargetAddress}浣嶇疆淇℃伅");
@@ -72,17 +73,19 @@
agvTaskSend.RequestId = taskGroupId;
agvTaskSend.MissionCode = task.TaskId.ToString();
agvTaskSend.ViewBoardType = "W01";
+ agvTaskSend.ContainerCode = task.PalletCode;
//璐ф灦瀛愭惉杩愪换鍔�
MissionDataItem Startingmission = new MissionDataItem() // 璧风偣
{
Sequence = 1,
- Position = stationManagerEnd.stationLocation,
+ Position = stationManagerEnd.StationLocation,
};
MissionDataItem Finalmission = new MissionDataItem() // 缁堢偣
{
Sequence = 2,
- Position = finalmission.stationLocation,
+ Position = finalmission.StationLocation,
+ PutDown = true,
};
agvTaskSend.MissionData.Add(Startingmission);
agvTaskSend.MissionData.Add(Finalmission);
@@ -100,7 +103,7 @@
throw new Exception(content.Message);
task.Dispatchertime = DateTime.Now;
task.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryExecuting;
- _taskService.UpdateData(newTasks);
+ _taskService.UpdateData(task);
Thread.Sleep(500);
}
catch (Exception ex)
--
Gitblit v1.9.3