From fe41831b0e9057a16aef1e82048105aee671bbda Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期六, 19 十月 2024 19:08:06 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
index 62c6194..10d15ac 100644
--- a/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/ArrivalNoticeDetailVm.cs
@@ -54,21 +54,21 @@
/// Default:
/// Nullable:False
/// </summary>
- public int? Qty { get; set; }
+ public decimal? Qty { get; set; }
/// <summary>
/// Desc:宸茬粍鏁伴噺
/// Default:0
/// Nullable:True
/// </summary>
- public int? FactQty { get; set; }
+ public decimal? FactQty { get; set; }
/// <summary>
/// Desc:鍏ュ簱鏁伴噺
/// Default:0
/// Nullable:True
/// </summary>
- public int? CompleteQty { get; set; }
+ public decimal? CompleteQty { get; set; }
/// <summary>
/// Desc:鍖呰缂栧彿
@@ -122,6 +122,15 @@
public int? CreateUser { get; set; }
/// <summary>
+ /// 鎵规灞炴��1-鐢熶骇鏃ユ湡
+ /// </summary>
+ public string Lot1 { get; set; }
+ /// <summary>
+ /// 鎵规灞炴��2-杩囨湡鏃ユ湡
+ /// </summary>
+ public string Lot2 { get; set; }
+
+ /// <summary>
/// 鑷畾涔夊垪1
/// </summary>
public string UDF1 { get; set; }
--
Gitblit v1.8.0