From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001 From: helongyang <647556386@qq.com> Date: 星期日, 22 六月 2025 11:44:43 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs" index 3308e72..fa07b9a 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Check/Dt_CheckOrder.cs" @@ -34,9 +34,9 @@ public string CheckOrderNo { get; set; } /// <summary> - /// 鏀惰揣鍗曞彿 + /// 鏀惰揣鍗曞彿/閫佹鍑哄簱鍗曞彿 /// </summary> - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏀惰揣鍗曞彿")] + [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鏀惰揣鍗曞彿/閫佹鍑哄簱鍗曞彿")] public string ReceiveOrderNo { get; set; } /// <summary> @@ -52,9 +52,9 @@ public int AuditStatus { get; set; } /// <summary> - /// 鏀惰揣鍗曟槑缁嗚鍙� + /// 鏀惰揣鍗曟槑缁嗚鍙�/閫佹鍑哄簱璇︽儏琛屽彿 /// </summary> - [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�")] + [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�/閫佹鍑哄簱璇︽儏琛屽彿")] public int ReceiveDetailRowNo { get; set; } /// <summary> @@ -133,6 +133,16 @@ [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鍗曚綅")] public string Unit { get; set; } /// <summary> + /// 妫�楠屽崟绫诲瀷 + /// </summary> + [SugarColumn(IsNullable = true, ColumnDescription = "妫�楠屽崟绫诲瀷")] + public int OrderType { get; set; } + /// <summary> + /// 妫�楠屾墭鐩� + /// </summary> + [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "妫�楠屾墭鐩�")] + public string OrderPalletCode { get; set; } + /// <summary> /// 璐ㄦ缁撴灉 /// </summary> [Navigate(NavigateType.OneToMany, nameof(Dt_CheckOrderResult.CheckOrderId), nameof(CheckOrderId))] -- Gitblit v1.9.3