From 4f40a6aeee4a09a663409a6e4fc60350b5fd48a0 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 21 四月 2026 13:12:16 +0800
Subject: [PATCH] feat: 添加AGV任务管理和托盘组功能 feat(task): 新增AGV任务页面和路由配置 feat(stock): 添加托盘组管理页面及进站出站操作 feat(task): 在任务历史页面添加操作类型列 refactor: 优化AGV任务查询条件及过滤逻辑
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/QuartzNet/SchedulerCenterServer.cs | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/QuartzNet/SchedulerCenterServer.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/QuartzNet/SchedulerCenterServer.cs
index 1556608..6be42fe 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/QuartzNet/SchedulerCenterServer.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/QuartzNet/SchedulerCenterServer.cs
@@ -31,6 +31,7 @@
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.CustomException;
using Quartz.Impl.Matchers;
+using WIDESEAWCS_Core.LogHelper;
namespace WIDESEAWCS_QuartzJob
{
@@ -85,7 +86,7 @@
WebResponseContent result = new WebResponseContent();
try
{
- if (_scheduler.IsShutdown && _scheduler.IsStarted)
+ if (_scheduler.IsShutdown || !_scheduler.IsStarted)
{
// 浠嶧actory涓幏鍙朣cheduler瀹炰緥
NameValueCollection collection = new NameValueCollection
@@ -103,13 +104,13 @@
{
//绛夊緟浠诲姟杩愯瀹屾垚
await this._scheduler.Start();
- await Console.Out.WriteLineAsync(QuartzJobInfoMessage.StartJobSuccess);
+ QuartzLogger.Info(QuartzJobInfoMessage.StartJobSuccess);
result = WebResponseContent.Instance.OK(QuartzJobInfoMessage.StartJobSuccess);
return result;
}
else
{
- await _scheduler.Shutdown();
+ // 璋冨害鍣ㄥ凡鍦ㄨ繍琛岋紝鐩存帴杩斿洖鎻愮ず
result = WebResponseContent.Instance.Error(QuartzJobInfoMessage.JobHasStart);
return result;
}
@@ -134,16 +135,13 @@
//绛夊緟浠诲姟杩愯瀹屾垚
await _scheduler.Shutdown(false);
- await Console.Out.WriteLineAsync(QuartzJobInfoMessage.StopJobSuccess);
+ QuartzLogger.Info(QuartzJobInfoMessage.StopJobSuccess);
result = WebResponseContent.Instance.OK(QuartzJobInfoMessage.StopJobSuccess);
return result;
}
else
{
- IReadOnlyCollection<string> jobGroupNames = await _scheduler.GetJobGroupNames();
-
- await _scheduler.PauseAll();
-
+ // 璋冨害鍣ㄥ凡鍋滄锛岀洿鎺ヨ繑鍥炴彁绀猴紙涓嶅啀瀵瑰凡 shutdown 鐨� scheduler 璋冪敤 PauseAll锛�
result = WebResponseContent.Instance.Error(QuartzJobInfoMessage.JobHasStop);
return result;
}
@@ -168,7 +166,7 @@
{
try
{
- if (_scheduler.IsShutdown && _scheduler.IsStarted)
+ if (_scheduler.IsShutdown || !_scheduler.IsStarted)
{
// 浠嶧actory涓幏鍙朣cheduler瀹炰緥
NameValueCollection collection = new NameValueCollection
--
Gitblit v1.9.3