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_OutboundOrderDetail.cs | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 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_OutboundOrderDetail.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_OutboundOrderDetail.cs"
index 0a17802..d38c497 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_OutboundOrderDetail.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_OutboundOrderDetail.cs"
@@ -47,31 +47,31 @@
/// <summary>
/// 琛屽彿
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿")]
- public int RowNo { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿", DefaultValue = "0")]
+ public int RowNo { get; set; }
/// <summary>
/// 鍗曟嵁鏁伴噺
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
public decimal OrderQuantity { get; set; }
/// <summary>
/// 閿佸畾鏁伴噺
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "閿佸畾鏁伴噺", DefaultValue = "0")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "閿佸畾鏁伴噺", DefaultValue = "0")]
public decimal LockQuantity { get; set; }
/// <summary>
/// 宸插嚭鏁伴噺
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "宸插嚭鏁伴噺", DefaultValue = "0")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "宸插嚭鏁伴噺", DefaultValue = "0")]
public decimal OverOutQuantity { get; set; }
/// <summary>
/// 璁㈠崟鏄庣粏鐘舵��
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��", DefaultValue = "0")]
public int OrderDetailStatus { get; set; }
/// <summary>
/// 鍗曚綅
@@ -83,29 +83,56 @@
/// 琛屽彿
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿")]
+ [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿", DefaultValue = "0")]
public string? lineNo { get; set; }
/// <summary>
/// 鎸枡鏁伴噺
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "MoveQty", ColumnDescription = "鎸枡鏁伴噺")]
+ [SugarColumn(ColumnDescription = "鎸枡鏁伴噺", IsNullable = true)]
public decimal MoveQty { get; set; }
/// <summary>
/// 渚涘簲鍟嗙紪鍙�
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "supplyCode", ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
+ [SugarColumn(ColumnDescription = "渚涘簲鍟嗙紪鍙�", IsNullable = true)]
public string? SupplyCode { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnDescription = "鏁伴噺", DefaultValue = "0", IsNullable = true)]
+ public decimal BarcodeQty { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnDescription = "鍗曚綅", IsNullable = true)]
+ public string BarcodeUnit { get; set; } = null!;
+
+
+ /// <summary>
+ ///
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnDescription = "鏁伴噺", DefaultValue = "0", IsNullable = true)]
+ public decimal BarcodeMoveQty { get; set; }
/// <summary>
/// 浠撳簱
/// 榛樿鍊�:
///</summary>
- [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "浠撳簱")]
+ [SugarColumn(ColumnDescription = "浠撳簱", IsNullable = true)]
public string? WarehouseCode { get; set; }
+
+ /// <summary>
+ /// 鍥炰紶MES
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍥炰紶MES")]
+ public int ReturnToMESStatus { get; set; } = 0;
/// <summary>
/// 澶囨敞
/// </summary>
@@ -114,5 +141,36 @@
[SugarColumn(IsIgnore = true)]
public decimal NeedOutQuantity => OrderQuantity - MoveQty;
+
+ [SugarColumn(IsNullable = true, ColumnDescription = "", IsIgnore = true)]
+ public decimal PickedQty { get; set; }
+
+ [SugarColumn(IsNullable = true, ColumnDescription = "")]
+ public string documentsNO { get; set; }
+
+ [SugarColumn(IsNullable = true, ColumnDescription = "")]
+ public decimal AllocatedQuantity { get; set; }
+
+ [SugarColumn(IsNullable = true, ColumnDescription = "")]
+ public int BatchAllocateStatus { get; set; }
+
+ /// <summary>
+ /// 铏氭嫙鍑哄叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "铏氭嫙鍑哄叆搴撴暟閲�")]
+ public decimal NoStockOutQty { get; set; }
+
+
+ // 鏂板瀛楁
+
+ /// <summary>
+ ///
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍥炰紶MES鏁版嵁")]
+ public string ReturnJsonData { get; set; }
+
+ [SugarColumn(IsNullable = true)]
+ public decimal CurrentDeliveryQty { get; set; }
+
}
}
--
Gitblit v1.9.3