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_OutboundService/OutboundService.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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_OutboundService/OutboundService.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_OutboundService/OutboundService.cs"
index 1be9611..ecc4177 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_OutboundService/OutboundService.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_OutboundService/OutboundService.cs"
@@ -249,7 +249,7 @@
if (outboundOrder.IsBatch == 1)
{
- selectedDetails = _detailRepository.QueryData(x => x.WarehouseCode == selectedDetails.First().WarehouseCode && x.MaterielCode == selectedDetails.First().MaterielCode && x.BatchNo == selectedDetails.First().BatchNo && x.SupplyCode == selectedDetails.First().SupplyCode);
+ selectedDetails = _detailRepository.QueryData(x => x.OrderId == selectedDetails.First().OrderId && x.WarehouseCode == selectedDetails.First().WarehouseCode && x.MaterielCode == selectedDetails.First().MaterielCode && x.BatchNo == selectedDetails.First().BatchNo && x.SupplyCode == selectedDetails.First().SupplyCode);
}
@@ -1759,6 +1759,7 @@
{
stock.PalletType = (int)PalletTypeEnum.Empty;
stock.StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨;
+ stock.LocationCode = "";
}
else if (stock.Details.Count > 0)
{
@@ -1771,6 +1772,8 @@
{
return content.Error($"鎵樼洏{palletCode}搴撳瓨鏈嫞閫夊畬涓嶅厑璁稿洖搴�");
}
+ stock.StockStatus = (int)StockStatusEmun.缁勭洏鏆傚瓨;
+ stock.LocationCode = "";
}
var task = await _taskRepository.Db.Queryable<Dt_Task>()
@@ -1796,18 +1799,18 @@
SourceAddress = stations[station],
TargetAddress = newLocation.LocationCode,
TaskStatus = (int)TaskStatusEnum.New,
- TaskType = stock.Details.Count > 0 ? (int)TaskTypeEnum.InPick : (int)TaskTypeEnum.OutEmpty,
+ TaskType = stock.Details.Count > 0 ? (int)TaskTypeEnum.InPick : (int)TaskTypeEnum.InEmpty,
PalletType = stock.PalletType,
WarehouseId = stock.WarehouseId
};
-
+ _stockInfoRepository.UpdateData(stock);
_taskRepository.AddData(newTask);
- var moveResult = await _eSSApiService.MoveContainerAsync(new MoveContainerRequest
- {
- slotCode = movestations[station],
- containerCode = palletCode
- });
+ //var moveResult = await _eSSApiService.MoveContainerAsync(new MoveContainerRequest
+ //{
+ // slotCode = movestations[station],
+ // containerCode = palletCode
+ //});
return content.OK();
}
--
Gitblit v1.9.3