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/WMS.Entity/DataEntity/DataBoxInfo.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs b/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
index b644278..517a22a 100644
--- a/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
+++ b/Wms/WMS.Entity/DataEntity/DataBoxInfo.cs
@@ -72,14 +72,14 @@
/// Default:
/// Nullable:False
/// </summary>
- public int Qty {get;set;}
+ public decimal Qty {get;set;}
/// <summary>
/// Desc:鏁寸鏁伴噺
/// Default:
/// Nullable:True
/// </summary>
- public int? FullQty {get;set;}
+ public decimal? FullQty {get;set;}
/// <summary>
/// Desc:鐘舵��
@@ -131,6 +131,11 @@
public DateTime? ProductionTime {get;set;}
/// <summary>
+ /// 杩囨湡鏃堕棿
+ /// </summary>
+ public DateTime? ExpirationTime { get; set; }
+
+ /// <summary>
/// Desc:渚涜揣鎵规
/// Default:
/// Nullable:True
--
Gitblit v1.8.0