From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 02 七月 2025 13:55:55 +0800 Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法,支持根据托盘号和下一地址查询任务,同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法,允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法,简化了任务查询逻辑并删除了多余的注释代码。同时,增加了对 `taskNext` 的处理逻辑,确保在任务未找到时的相应处理,并更新在途数据的逻辑,提升数据一致性和准确性。 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail.cs | 121 ++++++++++++++++++++-------------------- 1 files changed, 60 insertions(+), 61 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail.cs index a0de2ac..e4b331e 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfoDetail.cs @@ -6,75 +6,74 @@ using System.Threading.Tasks; using WIDESEA_Core.DB.Models; -namespace WIDESEA_Model.Models +namespace WIDESEA_Model.Models; + +[SugarTable(nameof(DtStockInfoDetail), "搴撳瓨淇℃伅鏄庣粏")] +public class DtStockInfoDetail : BaseEntity { - [SugarTable(nameof(DtStockInfoDetail), "搴撳瓨淇℃伅鏄庣粏")] - public class DtStockInfoDetail : BaseEntity - { - /// <summary> - /// 涓婚敭 - /// </summary> - [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] - public int Id { get; set; } + /// <summary> + /// 涓婚敭 + /// </summary> + [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] + public int Id { get; set; } - /// <summary> - /// 搴撳瓨淇℃伅涓婚敭 - /// </summary> - [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨淇℃伅涓婚敭")] - public int StockId { get; set; } + /// <summary> + /// 搴撳瓨淇℃伅涓婚敭 + /// </summary> + [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨淇℃伅涓婚敭")] + public int StockId { get; set; } - /// <summary> - /// 鐗╂枡缂栧彿 - /// </summary> - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")] - public string MaterielCode { get; set; } + /// <summary> + /// 鐗╂枡缂栧彿 + /// </summary> + [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")] + public string MaterielCode { get; set; } - /// <summary> - /// 鐗╂枡鍚嶇О - /// </summary> - [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")] - public string MaterielName { get; set; } + /// <summary> + /// 鐗╂枡鍚嶇О + /// </summary> + [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")] + public string MaterielName { get; set; } - /// <summary> - /// 鍗曟嵁缂栧彿 - /// </summary> - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")] - public string OrderNo { get; set; } + /// <summary> + /// 鍗曟嵁缂栧彿 + /// </summary> + [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")] + public string OrderNo { get; set; } - /// <summary> - /// 鎵规鍙� - /// </summary> - [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵规鍙�")] - public string BatchNo { get; set; } + /// <summary> + /// 鎵规鍙� + /// </summary> + [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵规鍙�")] + public string BatchNo { get; set; } - /// <summary> - /// 搴忓垪鍙� - /// </summary> - [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "搴忓垪鍙�")] - public string SerialNumber { get; set; } + /// <summary> + /// 搴忓垪鍙� + /// </summary> + [SugarColumn(IsNullable = false, Length = 100, ColumnDescription = "搴忓垪鍙�")] + public string SerialNumber { get; set; } - /// <summary> - /// 搴撳瓨鏁伴噺 - /// </summary> - [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "搴撳瓨鏁伴噺")] - public decimal StockQuantity { get; set; } + /// <summary> + /// 搴撳瓨鏁伴噺 + /// </summary> + [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "搴撳瓨鏁伴噺")] + public decimal StockQuantity { get; set; } - /// <summary> - /// 鍑哄簱鏁伴噺 - /// </summary> - [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "鍑哄簱鏁伴噺", DefaultValue = "0")] - public decimal OutboundQuantity { get; set; } + /// <summary> + /// 鍑哄簱鏁伴噺 + /// </summary> + [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "鍑哄簱鏁伴噺", DefaultValue = "0")] + public decimal OutboundQuantity { get; set; } - /// <summary> - /// 搴撳瓨鏄庣粏鐘舵�� - /// </summary> - [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏄庣粏鐘舵��")] - public int Status { get; set; } + /// <summary> + /// 搴撳瓨鏄庣粏鐘舵�� + /// </summary> + [SugarColumn(IsNullable = false, ColumnDescription = "搴撳瓨鏄庣粏鐘舵��")] + public int Status { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")] - public string Remark { get; set; } - } -} + /// <summary> + /// 澶囨敞 + /// </summary> + [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")] + public string Remark { get; set; } +} \ No newline at end of file -- Gitblit v1.9.3