From 5909649db85ff29faf983154763cc4b7301665e2 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 18 十二月 2025 11:15:31 +0800
Subject: [PATCH] 新增任务调度功能及优化日志处理新增任务状态枚举值 HasSent，表示任务已发送。新增任务调度接口 `ISchedulerCenter`，定义任务调度相关方法。 新增任务工厂 `JobFactory`，通过依赖注入创建任务实例。 新增任务调度服务配置 `JobSetup`，支持依赖注入配置。 新增通用响应类 `ResponseContent`，封装任务调度操作结果。新增任务调度服务实现 `SchedulerCenterServer`，实现任务添加、暂停、恢复等功能。 新增任务信息 DTO `TaskInfoDto` 和任务计划实体类 `TasksQz`。 新增任务配置类 `JobConfig`，描述任务类型及执行间隔。 注释掉部分服务中的旧任务创建逻辑，准备替换为新调度机制。 新增 AGV 任务调度作业 `AgvTaskJob`，处理 AGV 任务调度。 新增 Quartz 中间件 `QuartzJobMiddleWare`，初始化任务调度。 在 `Program.cs` 中集成 Quartz，配置任务调度依赖注入。 优化日志记录和异常处理，提升代码可维护性和调试性。
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
index 3f48801..f4a1118 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/InvokeMESService.cs"
@@ -288,7 +288,7 @@
{
ReqCode = Guid.NewGuid().ToString(),
ReqTime = DateTime.Now.ToString(),
- BusinessType = "2",
+ BusinessType = "3",
FactoryArea = inboundOrder.FactoryArea,
OperationType = 1,
Operator = inboundOrder.Operator,
@@ -379,6 +379,7 @@
.Where(it => it.OrderId == feedinboundOrder.Id).ExecuteCommand();
}
}
+ return WebResponseContent.Instance.Error("鍥炰紶鎴愬姛锛�");
}
else
{
@@ -386,6 +387,7 @@
.Where(it => it.Id == inboundOrder.Id).ExecuteCommand();
_inboundOrderDetailRepository.Db.Updateable<Dt_InboundOrderDetail>().SetColumns(it => new Dt_InboundOrderDetail { ReturnToMESStatus = 2 })
.Where(it => it.OrderId == inboundOrder.Id).ExecuteCommand();
+ return WebResponseContent.Instance.Error("鍥炰紶寮傚父锛�");
}
}
}
@@ -675,13 +677,13 @@
var mesResult = await FeedbackOutbound(feedModel);
if (mesResult == null || mesResult.code != 200)
{
- var messages = mesResult?.message??"";
+ var messages = mesResult?.message ?? "";
await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
.SetColumns(x => new Dt_OutboundOrder
{
ReturnToMESStatus = 2,
- Remark = messages,
+ Remark = messages,
})
.Where(x => x.OrderNo == orderNo)
.ExecuteCommandAsync();
@@ -689,7 +691,7 @@
await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
.SetColumns(it => new Dt_OutboundOrderDetail
{
- ReturnToMESStatus = 2,
+ ReturnToMESStatus = 2,
documentsNO = documentNo,
})
.Where(x => detailIds.Contains(x.Id))
@@ -697,7 +699,7 @@
return (flowControl: false, value: WebResponseContent.Instance.Error($"鍥炰紶MES澶辫触"));
}
-
+
var updates = pickingRecords.Where(x => detailIds.Contains(x.OrderDetailId)).ToList();
updates.ForEach(x =>
{
@@ -727,7 +729,8 @@
await _outboundOrderService.Db.Updateable<Dt_OutboundOrder>()
.SetColumns(x => new Dt_OutboundOrder
{
- ReturnToMESStatus = 1,Remark="",
+ ReturnToMESStatus = 1,
+ Remark = "",
OrderStatus = newStatus
})
.Where(x => x.OrderNo == orderNo)
@@ -905,7 +908,7 @@
_logger.LogError(errorMsg);
await _outboundOrderDetailService.Db.Updateable<Dt_OutboundOrderDetail>()
- .SetColumns(x => x.ReturnToMESStatus ==2)
+ .SetColumns(x => x.ReturnToMESStatus == 2)
.Where(x => x.OrderId == outboundOrder.Id)
.ExecuteCommandAsync();
--
Gitblit v1.9.3