From 10081828bf4b88b01a63bde072118bfdb582a28e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 12 九月 2025 19:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/Modes/MesInvItemArnDetail.cs | 80 +++++++++++++++++++++++----------------
1 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/MES.Service/Modes/MesInvItemArnDetail.cs b/MES.Service/Modes/MesInvItemArnDetail.cs
index 0ee4404..7f3157b 100644
--- a/MES.Service/Modes/MesInvItemArnDetail.cs
+++ b/MES.Service/Modes/MesInvItemArnDetail.cs
@@ -55,17 +55,17 @@
[SugarColumn(ColumnName = "quantity")]
public decimal? Quantity { get; set; }
- // /// <summary>
- // /// 閲囪喘鍗曚綅
- // /// </summary>
- // [SugarColumn] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
- // public string? PurchaseUnit { get; set; }
- //
- // /// <summary>
- // /// 搴撳瓨鍗曚綅
- // /// </summary>
- // [SugarColumn] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
- // public string? InventoryUnit { get; set; }
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "PurchaseUnit")] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
+ public string? PurchaseUnit { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "InventoryUnit")] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
+ public string? InventoryUnit { get; set; }
/// <summary>
/// 澶囨敞
@@ -85,23 +85,24 @@
[SugarColumn(ColumnName = "line_k3id")]
public int? LineK3id { get; set; }
- // /// <summary>
- // /// 閿�鍞鍗曞彿
- // /// </summary>
- // [SugarColumn] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
- // public string? SalesOrderId { get; set; }
- //
- // /// <summary>
- // /// 璁″垝璺熻釜鍙�
- // /// </summary>
- // [SugarColumn] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
- // public string? FMtoNo { get; set; }
- //
- // /// <summary>
- // /// 鎵瑰彿
- // /// </summary>
- // [SugarColumn] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
- // public string? FLot { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn (ColumnName = "SalesOrderId")] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
+
+ public string? SalesOrderId { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "MtoNo")] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
+ public string? MtoNo { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Lot")] // 鏈彁渚涘叿浣揗ES鏍囪瘑锛岄粯璁ゆ寜灞炴�у悕鏄犲皠锛堣嫢瀹為檯瀛楁鍚嶄笉鍚岋紝闇�琛ュ厖ColumnName锛�
+ public string? Lot { get; set; }
/// <summary>
/// 鎬ユ枡鏍囪瘑
@@ -109,9 +110,22 @@
[SugarColumn(ColumnName = "urgent_flag")]
public bool? UrgentFlag { get; set; }
- // /// <summary>
- // /// 鏀惰揣浠撳簱缂栧彿
- // /// </summary>
- // [SugarColumn(ColumnName = "FSTOCKID")]
- // public string? FStockId { get; set; }
+ /// <summary>
+ /// 鏀惰揣浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "Depot_Id")]
+ public string? DepotId { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣鍗曡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DeliveryLineID")]
+ public int? DeliveryLineID { get; set; }
+ /// <summary>
+ /// 鍙戣揣鍗曡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "Eid")]
+ public int? Eid { get; set; }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3