From f679f58dba34055bd579a603762c13fbe1650c9b Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期一, 23 三月 2026 13:14:20 +0800
Subject: [PATCH] 最新
---
项目代码/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 09db673..0a6c0cb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -92,6 +92,12 @@
_Dt_roadwayinfoService = dt_RoadwayinfoService;
}
+ //鏍规嵁浠诲姟鍙凤紝鏌ヨ浠诲姟
+ public Dt_Task? CurrtaskInfo(int taskNum)
+ {
+ return BaseDal.QueryData().Where(x => x.TaskNum == taskNum).FirstOrDefault();
+ }
+
/// <summary>
/// 浠诲姟瀹屾垚
/// </summary>
@@ -121,9 +127,23 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍑哄簱瀹屾垚");
}
- else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
+ else if (task.TaskType == (int)TaskTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
{
task.TaskState = (int)TaskInStatusEnum.InFinish;
+ string Result = WMSTaskStatusEnum.insuccess.GetDescription();
+ CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
+
+ if (command.status != "success") return content.Error($"璋冨彇涓婃父杩斿洖澶辫触锛屽畬鎴愬爢鍨涙満浠诲姟澶辫触锛屾潯鐮侊細{task.PalletCode},浠诲姟鍙凤細{task.TaskNum}");
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.DeleteData(task);
+ _task_HtyService.AddTaskHty(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍏ュ簱瀹屾垚");
+ }
+ else if (task.TaskType == (int)TaskTypeEnum.Inventorybound && task.TaskState == (int)TaskinventoryStatusEnum.SC_inventoryExecuting)
+ {
+ task.TaskState = (int)TaskinventoryStatusEnum.inventoryFinish;
string Result = WMSTaskStatusEnum.insuccess.GetDescription();
CommandResult command = taskreturn(int.Parse(task.WMStaskid), Result, "invmd", "");
@@ -437,5 +457,11 @@
return BaseDal.QueryData(x => x.Roadway == deviceNo && (x.TaskState == (int)TaskInStatusEnum.InNew || x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy);
}
+ public Dt_Task CutStackerCraneTask(string deviceNo)
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.Roadway == deviceNo && (x.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting || x.TaskState == (int)TaskInStatusEnum.SC_InExecuting));
+ return dt_Task;
+ }
+
}
}
--
Gitblit v1.9.3