From 644cbe3e4eba765affa25454d69fee6286bb6094 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 30 十月 2025 13:06:35 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 5a22c8f..b7f0721 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -387,7 +387,7 @@
/// <returns></returns>
public Dt_Task QueryRequestTSJSignalTask()
{
- return BaseDal.QueryFirst(x => TaskAcrossFloorboundTypes.Contains(x.TaskType) && x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && (x.AGVSign == "RequestPickUp" || x.AGVSign == "RequestPut"));
+ return BaseDal.QueryFirst(x => x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && (x.AGVSign == "RequestPickUp" || x.AGVSign == "RequestPut"));
}
#endregion
@@ -460,7 +460,7 @@
try
{
int oldState = task.TaskState;
- if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.OutbondGroup)
{
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
@@ -485,8 +485,14 @@
content = StackCraneTaskCompleted(task.TaskNum);
return content;
}
+ if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
+ {
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
+ SendAgvTask(station.stationRemark, task.TaskNum);
+ }
+
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.InboundGroup)
{
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
task.TaskState = nextStatus;
@@ -518,7 +524,7 @@
//// 鍙嶅簭鍒楀寲鍝嶅簲鍐呭
//content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
- //LogFactory.WriteError($"Info_鑾峰彇璐т綅", $"鑾峰彇璐т綅,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙凤細銆恵task.PalletCode}銆戣繑鍥炲弬鏁般�恵JsonConvert.SerializeObject(content)}銆憑Environment.NewLine}{Environment.NewLine}");
+ //LogFactory.WriteError($"鑾峰彇璐т綅", $"鑾峰彇璐т綅,浠诲姟鍙�:銆恵task.TaskNum}銆�,鎵樼洏鍙凤細銆恵task.PalletCode}銆戣繑鍥炲弬鏁般�恵JsonConvert.SerializeObject(content)}銆�");
//// 妫�鏌ョ姸鎬佸苟杩斿洖
//if (!content.Status)
@@ -540,7 +546,6 @@
if (App.User.UserId > 0)
{
content = StackCraneTaskCompleted(task.TaskNum);
- return content;
}
task.ModifyDate = DateTime.Now;
@@ -553,7 +558,7 @@
_taskHtyRepository.AddData(task_Hty);
}
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.CarryGroup)
+ else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.CarryGroup)
{
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAGVCarryStatusEnum>();
@@ -561,6 +566,8 @@
if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
{
+ CompletedTask(task.TaskNum);
+
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -571,7 +578,7 @@
_taskHtyRepository.AddData(task_Hty);
}
}
- else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.AcrossFloorGroup)
+ else if (task.TaskState.GetTaskStateGroup() == TaskStateGroup.AcrossFloorGroup)
{
int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskAcrossFloorStatusEnum>();
@@ -606,7 +613,7 @@
stationManager = _stationManagerRepository.QueryFirst(x => x.stationType == 5 && x.stationFloor == "1F");
TaskTemplate = "CCC";
}
-
+
var taskDto = new RequestAcrossFloorTaskDto()
{
NextAddress = task.NextAddress,
@@ -661,22 +668,6 @@
BaseDal.AddData(taskNew);
SendAgvTask(TaskTemplate, taskNew.TaskNum);
- return content.OK();
- }
-
- if (task.TaskState == (int)TaskAGVCarryStatusEnum.AGV_CarryFinish)
- {
-
- CompletedTask(task.TaskNum);
-
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
-
- Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
- task_Hty.TaskId = 0;
-
- BaseDal.DeleteData(task);
- _taskHtyRepository.AddData(task_Hty);
}
}
else
@@ -769,6 +760,8 @@
task.Modifier = "System";
BaseDal.UpdateData(task);
+ content.OK(data: task);
+
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
--
Gitblit v1.9.3