From dab0a583302f306d8c0ec37fbae37c9b4e37e473 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 29 十二月 2025 18:46:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs b/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs
index 278ccd7..71ecf59 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs
@@ -25,9 +25,6 @@
[SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
public int WarehouseId { get; set; }
- [ImporterHeader(Name = "鍗曟嵁缂栧彿")]
- [ExporterHeader(DisplayName = "鍗曟嵁缂栧彿")]
- [CodeRule(WIDESEA_Core.Enums.RuleCode.InboundOrderRule)]
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
public string OrderNo { get; set; }
@@ -41,6 +38,7 @@
/// <summary>
/// 涓婃父鍗曟嵁缂栧彿
/// </summary>
+
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父鍗曟嵁缂栧彿")]
public string UpperOrderNo { get; set; }
@@ -76,9 +74,15 @@
/// <summary>
/// 鍑哄叆搴撶被鍨�
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "鍑哄叆搴撶被鍨�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍑哄叆搴撶被鍨�",Length = 50)]
public string InoutType { get; set; }
+ /// <summary>
+ /// 鎺ㄥ崟绯荤粺
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鎺ㄥ崟绯荤粺")]
+ public string System { get; set; }
+
[ImporterHeader(IsIgnore = true)]
[ExporterHeader(IsIgnore = true)]
[Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderDetail.OrderId), nameof(Id))]
--
Gitblit v1.9.3