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/Basic/Dt_MaterielCodeInfo.cs | 99 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 69 insertions(+), 30 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/Basic/Dt_MaterielCodeInfo.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/Basic/Dt_MaterielCodeInfo.cs"
index 37610d3..5800b3b 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/Basic/Dt_MaterielCodeInfo.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/Basic/Dt_MaterielCodeInfo.cs"
@@ -12,8 +12,8 @@
/// <summary>
/// 鐗╂枡鐮佷俊鎭�
/// </summary>
- [SugarTable(nameof(Dt_MaterielCodeInfo), "鐗╂枡鐮佷俊鎭�")]
- public class Dt_MaterielCodeInfo : BaseEntity
+ [SugarTable(nameof(Dt_MaterialCodeInfo), "鐗╂枡鐮佷俊鎭�")]
+ public class Dt_MaterialCodeInfo : BaseEntity
{
/// <summary>
/// 涓婚敭
@@ -25,46 +25,85 @@
/// 鐗╂枡缂栧彿
/// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
- public string MaterielCode { get; set; }
+ public string MaterialCode { get; set; }
/// <summary>
- /// 浠撳簱涓婚敭
+ /// 鐗╂枡鍚嶇О
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱缂栧彿")]
- public int WarehouseId { get; set; }
+ [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string? MaterialName { get; set; }
/// <summary>
- /// 鎵规鍙�
+ /// 渚涘簲鍟嗙紪鍙�
/// </summary>
- [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鎵规鍙�")]
- public string LotNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [ImporterHeader(Name = "鐢熶骇鏃ユ湡")]
- [ExporterHeader(DisplayName = "鐢熶骇鏃ユ湡")]
- [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鐢熶骇鏃ユ湡")]
- public DateTime ProductionDate { get; set; }
-
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- [ImporterHeader(Name = "鏈夋晥鏈�")]
- [ExporterHeader(DisplayName = "鏈夋晥鏈�")]
- [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鏈夋晥鏈�")]
- public DateTime EffectiveDate { get; set; }
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
+ public string? SuplierCode { get; set; }
/// <summary>
/// 閲囪喘鍗曞彿
/// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閲囪喘鍗曞彿")]
- public string PurchaseOrderNo { get; set; }
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閲囪喘鍗曞彿")]
+ public string? PruchaseOrderNo { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 鐗╂枡瑙勬牸
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏁伴噺")]
- public float Quantity { get; set; }
+ [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string? MaterialSpec { get; set; }
+
+ /// <summary>
+ /// 鎵规
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵规")]
+ public string? BatchNo { get; set; }
+
+ /// <summary>
+ /// 鍘傚尯
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍘傚尯")]
+ public string? FactoryArea { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string Date { get; set; }
+
+ /// <summary>
+ /// 鏂版潯鐮�
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏂版潯鐮�")]
+ public string NewBarcode { get; set; }
+
+ /// <summary>
+ /// 鍘熸潯鐮�
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍘熸潯鐮�")]
+ public string OldBarcode { get; set; }
+
+ /// <summary>
+ /// 鍘熸暟閲�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍘熸暟閲�")]
+ public decimal OriginalQuantity { get; set; }
+
+ /// <summary>
+ /// 鏂版暟閲�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏂版暟閲�")]
+ public decimal AfterQuantity { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曚綅")]
+ public string Unit { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "澶囨敞")]
+ public string? Remark { get; set; }
}
}
--
Gitblit v1.9.3