From 5408616fd72786b63cfe69a7426c3fb499b6962b Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期四, 17 十月 2024 18:49:04 +0800
Subject: [PATCH] Merge branch 'Liudl'
---
Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs b/Wms/Model/ModelVm/BllAsnVm/BoxInfoVm.cs
index aa41732..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; }
}
@@ -205,6 +205,30 @@
public string ProductionTime { get; set; }
public string ExpirationTime { get; set; }
public string StoreTime { get; set; }
+ public string SupplierLot { get; set; }
+
+ }
+
+ /// <summary>
+ /// 琛ユ墦鐗╂枡鏍囩Vm
+ /// </summary>
+ public class BuDaLabelBoxVm
+ {
+ public string BoxNo { get; set; }
+ public string EndBoxNo { get; set; }
+ public string BoxNo2 { get; set; }
+ public string EndBoxNo2 { get; set; }
+ public string Type { get; set; }
+
+ }
+
+ /// <summary>
+ /// 琛ユ墦鐗╂枡鏍囩Vm
+ /// </summary>
+ public class EditLabelQtyVm
+ {
+ public int Id { get; set; }
+ public string Qty { get; set; }
}
--
Gitblit v1.8.0