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_Model/Models/Outbound/Dt_OutboundLockInfo.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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_Model/Models/Outbound/Dt_OutboundLockInfo.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_Model/Models/Outbound/Dt_OutboundLockInfo.cs"
index 3e953a2..f147a49 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_Model/Models/Outbound/Dt_OutboundLockInfo.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_Model/Models/Outbound/Dt_OutboundLockInfo.cs"
@@ -111,7 +111,7 @@
public string SupplyCode { get; set; }
[SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿")]
- public string? lineNo { get; set; }
+ public string lineNo { get; set; }
public string WarehouseCode { get; set; }
/// <summary>
@@ -120,34 +120,71 @@
[SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
public int Status { get; set; }
- [SugarColumn(Length = 100)]
+ [SugarColumn(Length = 100, ColumnDescription = "褰撳墠鏉＄爜")]
public string CurrentBarcode { get; set; } // 褰撳墠鏉＄爜锛堟媶鍖呭悗鍙兘鍙樺寲锛�
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍘熷閿佸畾鏁伴噺")]
public decimal OriginalLockQuantity { get; set; } // 鍘熷閿佸畾鏁伴噺
public int IsSplitted { get; set; } // 鏄惁宸叉媶鍖� 0-鍚� 1-鏄�
+ [SugarColumn( ColumnDescription = "鎷嗗寘鐖堕攣瀹欼d")]
public int? ParentLockId { get; set; }
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔鑰�")]
public string Operator { get; set; }
-
+ [SugarColumn( ColumnDescription = "鐗╂枡鏉＄爜鏁伴噺")]
public decimal BarcodeQty { get; set; }
-
+ [SugarColumn(ColumnDescription = "鐗╂枡鍗曚綅")]
public string BarcodeUnit { get; set; }
+ [SugarColumn(ColumnDescription = "鍒嗘壒鍑哄簱鎵规鍙�")]
public string OutboundBatchNo { get; set; }
[Navigate(NavigateType.OneToOne, nameof(StockInfo))]//涓�瀵逛竴 SchoolId鏄疭tudentA绫婚噷闈㈢殑
public Dt_StockInfo StockInfo { get; set; } //涓嶈兘璧嬪�煎彧鑳芥槸null
+ [SugarColumn(ColumnDescription = "鏄惁鍒嗛厤")]
public int IsUnallocated { get; set; } = 0;
+
+ [SugarColumn(ColumnDescription = "鍘傚尯")]
public string FactoryArea { get; set; }
+ /// <summary>
+ /// 鍓╀綑鏁伴噺
+ /// </summary>
[SqlSugar.SugarColumn(IsIgnore = true)]
+
public decimal RemainQuantity => AssignQuantity - PickedQty;
-
+
public int ReturnToMESStatus { get; set; }
+
+
+ //鏂板瀛楁
+
+ /// <summary>
+ /// 鏈鍒嗛厤鍓嶇殑绱閲�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏈鍒嗛厤鍓嶇殑绱閲�")]
+ public decimal AllocatedQuantity { get; set; } = 0;
+
+ /// <summary>
+ /// 鍑哄簱鐩爣浣嶇疆
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "鍑哄簱鐩爣浣嶇疆")]
+ public string OutboundTargetLocation { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鏄庣粏涓婚敭锛堟敮鎸佸涓槑缁咺D锛岄�楀彿鍒嗛殧锛�
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鍗曟嵁鏄庣粏涓婚敭")]
+ public string OrderDetailIds { get; set; }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍒嗘嫞瀹屾垚鏁伴噺")]
+ public decimal? SortedQuantity { get; set; } = 0;
}
}
--
Gitblit v1.9.3