From 96f8501cc973232b340e36a61992ec1ad47e4a31 Mon Sep 17 00:00:00 2001 From: wankeda <Administrator@DESKTOP-HAU3ST3> Date: 星期六, 12 七月 2025 11:10:34 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu --- WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs | 45 +++++++++++++++------------------------------ 1 files changed, 15 insertions(+), 30 deletions(-) diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs index 46d4162..3a0e68c 100644 --- a/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs +++ b/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs @@ -11,7 +11,7 @@ namespace WIDESEA_Model.Models { [SugarTable(nameof(Dt_OutboundOrder_Hty), "鍑哄簱鍗�")] - public class Dt_OutboundOrder_Hty + public class Dt_OutboundOrder_Hty:BaseEntity { [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")] public int Id { get; set; } @@ -41,36 +41,21 @@ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "澶囨敞")] public string OperateType { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [ImporterHeader(Name = "鍒涘缓浜�")] - [ExporterHeader(DisplayName = "鍒涘缓浜�")] - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍒涘缓浜�")] - public string Creater { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [ImporterHeader(Name = "鍒涘缓鏃堕棿")] - [ExporterHeader(DisplayName = "鍒涘缓鏃堕棿")] - [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏃堕棿")] - public DateTime CreateDate { get; set; } = DateTime.Now; + [ImporterHeader(Name = "浠撳簱缂栫爜")] + [ExporterHeader(DisplayName = "浠撳簱缂栫爜")] + [SugarColumn(IsNullable = true, ColumnDescription = "浠撳簱缂栫爜")] + public string OutWareHouse { get; set; } + [ImporterHeader(Name = "鍗曟嵁灏忕被")] + [ExporterHeader(DisplayName = "鍗曟嵁灏忕被")] + [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁灏忕被")] + public string TransactionCode { get; set; } + [ImporterHeader(Name = "鍑哄叆搴撶被鍨�")] + [ExporterHeader(DisplayName = "鍑哄叆搴撶被鍨�")] + [SugarColumn(IsNullable = true, ColumnDescription = "鍑哄叆搴撶被鍨�")] + public string InoutType { get; set; } - /// <summary> - /// 鏇存柊鑰� - /// </summary> - [ImporterHeader(Name = "淇敼浜�")] - [ExporterHeader(DisplayName = "淇敼浜�")] - [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "淇敼浜�")] - public string Modifier { get; set; } - - /// <summary> - /// 淇敼鏃ユ湡 - /// </summary> - [ImporterHeader(Name = "淇敼鏃ユ湡")] - [ExporterHeader(DisplayName = "淇敼鏃ユ湡")] - [SugarColumn(IsNullable = true, ColumnDescription = "淇敼鏃ユ湡")] - public DateTime? ModifyDate { get; set; } + [Navigate(NavigateType.OneToMany, nameof(Dt_OutboundOrderDetail_Hty.OrderId), nameof(Id))] + public List<Dt_OutboundOrderDetail_Hty> Details { get; set; } } } -- Gitblit v1.9.3