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 | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 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 f720d11..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"
@@ -10,7 +10,10 @@
namespace WIDESEA_Model.Models
{
- [SugarTable]
+ /// <summary>
+ /// 璐ㄦ鍗�
+ /// </summary>
+ [SugarTable(nameof(Dt_CheckOrder), "璐ㄦ鍗�")]
public class Dt_CheckOrder : BaseEntity
{
/// <summary>
@@ -18,30 +21,40 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int CheckOrderId { get; set; }
-
+ /// <summary>
+ /// 浠撳簱涓婚敭
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
+ public int WarehouseId { get; set; }
/// <summary>
/// 妫�楠屽崟鍙�
/// </summary>
- [CodeRule(RuleCodeEnum.InboundOrderRule)]
+ [CodeRule(RuleCodeEnum.CheckOrderRule)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "妫�楠屽崟鍙�")]
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>
+ /// 璐ㄦ鍗曠姸鎬�
+ /// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "璐ㄦ鍗曠姸鎬�")]
public int CheckOrderStatus { get; set; }
+ /// <summary>
+ /// 瀹℃壒鐘舵��
+ /// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "瀹℃壒鐘舵��")]
public int AuditStatus { get; set; }
/// <summary>
- /// 鏀惰揣鍗曟槑缁嗚鍙�
+ /// 鏀惰揣鍗曟槑缁嗚鍙�/閫佹鍑哄簱璇︽儏琛屽彿
/// </summary>
- [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏀惰揣鍗曟槑缁嗚鍙�/閫佹鍑哄簱璇︽儏琛屽彿")]
public int ReceiveDetailRowNo { get; set; }
/// <summary>
@@ -49,6 +62,18 @@
/// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
public string MaterielCode { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")]
+ public string LotNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鐗╂枡瑙勬牸")]
+ public string MaterielSpec { get; set; }
/// <summary>
/// 鍚堟牸鏁伴噺
@@ -92,9 +117,34 @@
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐗归噰璇存槑")]
public string DefectedNote { get; set; }
+ /// <summary>
+ /// 妫�楠屼汉
+ /// </summary>
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "妫�楠屼汉")]
public string CheckUserName { get; set; }
-
+ /// <summary>
+ /// 妫�楠屼笂浼犵姸鎬�
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "妫�楠屼笂浼犵姸鎬�")]
+ public int UploadStatus { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [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))]
public List<Dt_CheckOrderResult> Details { get; set; }
}
--
Gitblit v1.9.3