From 733e63cb362f17aea4a1020654fa348a0d0c1f06 Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期一, 24 二月 2025 00:08:59 +0800 Subject: [PATCH] 优化入库逻辑,优化直接出库逻辑,优化移库任务逻辑 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_hty.cs | 55 +++++++++++++++++++------------------------------------ 1 files changed, 19 insertions(+), 36 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_hty.cs" index 5d19374..c9b9efd 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_hty.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_hty.cs" @@ -10,48 +10,31 @@ namespace WIDESEA_Model.Models { - [SugarTable(nameof(Dt_OutboundOrder_hty), "鍑哄簱鍗曞巻鍙�")] - public class Dt_OutboundOrder_hty : BaseEntity + [SugarTable(nameof(Dt_OutboundOrder_Hty), "鍑哄簱鍗曞巻鍙�")] + public class Dt_OutboundOrder_Hty : Dt_OutboundOrder,IBaseHistoryEntity { - [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] - public int Id { get; set; } - - [CodeRule(WIDESEA_Core.Enums.RuleCode.OutboundOrderRule)] - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)] - public string OrderNo { get; set; } - - [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)] - public string UpperOrderNo { get; set; } - - [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷", IsOnlyIgnoreUpdate = true)] - public int OrderType { get; set; } - - [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")] - public int OrderStatus { get; set; } - - [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡", IsOnlyIgnoreUpdate = true)] - public int CreateType { get; set; } - - [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")] - public string Remark { get; set; } + /// <summary> + /// 鍘熻〃涓婚敭 + /// </summary> + [ImporterHeader(Name = "鍘熻〃涓婚敭")] + [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")] + [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")] + public int SourceId { get; set; } /// <summary> - /// 鎿嶄綔鑰� + /// 鎿嶄綔绫诲瀷 /// </summary> - [ImporterHeader(Name = "鎿嶄綔鑰�")] - [ExporterHeader(DisplayName = "鎿嶄綔鑰�")] - [SugarColumn(IsNullable = false, Length = 50, IsOnlyIgnoreUpdate = true, ColumnDescription = "鎿嶄綔鑰�")] - public string Operator { get; set; } + [ImporterHeader(Name = "鎿嶄綔绫诲瀷")] + [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")] + [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")] + public string OperateType { get; set; } /// <summary> - /// 鎿嶄綔鏃堕棿 + /// 绉诲叆鍘嗗彶鏃堕棿 /// </summary> - [ImporterHeader(Name = "鎿嶄綔鏃堕棿")] - [ExporterHeader(DisplayName = "鎿嶄綔鏃堕棿")] - [SugarColumn(IsNullable = false, IsOnlyIgnoreUpdate = true, ColumnDescription = "鎿嶄綔鏃堕棿")] - public DateTime OperatingTime { get; set; } = DateTime.Now; - - [Navigate(NavigateType.OneToMany, nameof(Dt_OutboundOrderDetail_hty.OrderId), nameof(Id))] - public List<Dt_OutboundOrderDetail_hty> Details { get; set; } + [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")] + [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")] + [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")] + public DateTime InsertTime { get; set; } } } -- Gitblit v1.9.3