From f56fcadd8d412fa1a65c873e77ad04ebb31fc954 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期五, 18 七月 2025 14:27:43 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api
---
StandardPda/MES.Service/Modes/MesInvItemArnDetail.cs | 102 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/StandardPda/MES.Service/Modes/MesInvItemArnDetail.cs b/StandardPda/MES.Service/Modes/MesInvItemArnDetail.cs
index 7be265c..984683f 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemArnDetail.cs
+++ b/StandardPda/MES.Service/Modes/MesInvItemArnDetail.cs
@@ -23,7 +23,7 @@
/// 閲囪喘鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "EBELN")]
- public string Ebeln { get; set; }
+ public string? Ebeln { get; set; }
/// <summary>
/// 閲囪喘璁㈠崟琛屽彿
@@ -41,7 +41,7 @@
/// 鐗╂枡缂栫爜
/// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
+ public string? ItemNo { get; set; }
/// <summary>
/// 鏀惰揣鏁伴噺
@@ -53,7 +53,7 @@
/// 鍒涘缓浜�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
- public string CreateBy { get; set; }
+ public string? CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -65,7 +65,7 @@
/// 鏈�鍚庢洿鏂颁汉
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string LastupdateBy { get; set; }
+ public string? LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
@@ -77,25 +77,25 @@
/// 鍒嗗巶缂栫爜
/// </summary>
[SugarColumn(ColumnName = "FACTORY")]
- public string Factory { get; set; }
+ public string? Factory { get; set; }
/// <summary>
/// 鍏徃浠ｇ爜
/// </summary>
[SugarColumn(ColumnName = "COMPANY")]
- public string Company { get; set; }
+ public string? Company { get; set; }
/// <summary>
/// 閲囪喘鍗旾D
/// </summary>
[SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
+ public string? EbelnK3id { get; set; }
/// <summary>
/// 閲囪喘鍗曡ID
/// </summary>
[SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
+ public string? LineK3id { get; set; }
/// <summary>
/// 鏈搴旀敹鏁伴噺
@@ -113,7 +113,7 @@
/// 浠诲姟鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "WORK_NO")]
- public string WorkNo { get; set; }
+ public string? WorkNo { get; set; }
/// <summary>
/// 鎬ユ枡鏍囪瘑
@@ -125,19 +125,19 @@
/// 澶囨敞
/// </summary>
[SugarColumn(ColumnName = "MEMO")]
- public string Memo { get; set; }
+ public string? Memo { get; set; }
/// <summary>
/// 妫�楠岀粨鏋�
/// </summary>
[SugarColumn(ColumnName = "CHECK_RES")]
- public string CheckRes { get; set; }
+ public string? CheckRes { get; set; }
/// <summary>
/// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
/// </summary>
[SugarColumn(ColumnName = "CHECK_STATES")]
- public string CheckStates { get; set; }
+ public string? CheckStates { get; set; }
/// <summary>
/// 鏀惰揣浣欓噺
@@ -179,7 +179,7 @@
/// 浜у搧鍨嬪彿
/// </summary>
[SugarColumn(ColumnName = "BOARD_STYLE")]
- public string BoardStyle { get; set; }
+ public string? BoardStyle { get; set; }
/// <summary>
/// 浠诲姟鍗曡鍙�
@@ -203,7 +203,7 @@
/// 鍒拌揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "DHA001")]
- public string Dha001 { get; set; }
+ public string? Dha001 { get; set; }
/// <summary>
/// 宸插叆搴撴暟閲�
@@ -215,11 +215,77 @@
/// 鍒拌揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "CBILL_NO")]
- public string CbillNo { get; set; }
+ public string? CbillNo { get; set; }
- [SugarColumn(IsIgnore = true)] public string? itemModel { get; set; }
+ /// <summary>
+ /// 閲囪喘鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CG_RKQTY")]
+ public decimal? CgRkqty { get; set; }
- [SugarColumn(IsIgnore = true)] public string? itemName { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Fname { get; set; }
+ /// <summary>
+ /// 閫�璐ф爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_FLAG")]
+ public decimal? ReturnFlag { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER")]
+ public string? SalesOrder { get; set; }
+
+ /// <summary>
+ /// 涓撶敤鐗╂枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_ZY")]
+ public decimal? IsZy { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "RK_DATE")]
+ public DateTime? RkDate { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "FMTONO")]
+ public string? Fmtono { get; set; }
+
+ /// <summary>
+ /// 渚涘崗鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_NO")]
+ public string? DeliveryNo { get; set; }
+
+ /// <summary>
+ /// 渚涘崗鍒嗗綍鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_LINE")]
+ public decimal? DeliveryLine { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string? LotNo { get; set; }
+
+ /// <summary>
+ /// 鏍囪瘑璇ョ墿鏂欐槸鍚﹀凡瀹屾垚閫�琛ユ帹閫佹搷浣滐紝N-鏈帹閫侊紝Y-宸叉帹閫�
+ /// </summary>
+ [SugarColumn(ColumnName = "REPLENISHMENT_FLAG")]
+ public string? ReplenishmentFlag { get; set; }
+
+ /// <summary>
+ /// 璁″垝琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_LINE_NO")]
+ public string? PlanLineNo { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3