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/BoxInfoVm.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
index b0afa5a..ebdbe26 100644
--- a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
@@ -75,14 +75,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:鐘舵��
@@ -175,7 +175,7 @@
public class BoxQtyInfo
{
public string boxNo { get; set; }
- public int realQty { get; set; }
+ public decimal realQty { get; set; }
public string bitBoxMark { get; set; }
}
@@ -222,4 +222,14 @@
}
+ /// <summary>
+ /// 琛ユ墦鐗╂枡鏍囩Vm
+ /// </summary>
+ public class EditLabelQtyVm
+ {
+ public int Id { get; set; }
+ public string Qty { get; set; }
+
+ }
+
}
--
Gitblit v1.8.0