From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs b/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs
index 00b5e3d..a7bcbff 100644
--- a/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs
+++ b/Wms/Model/ModelVm/BllAsnVm/PalletBindVm.cs
@@ -67,14 +67,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:鐘舵��
@@ -165,6 +165,7 @@
public string Standard { get; set; }
public string PackagNo { get; set; }
+ public string BindType { get; set; }
}
public class GetOkLocateVm:IndexPage
@@ -175,6 +176,7 @@
public string Column { get; set; }
public string Layer { get; set; }
public string LocateNo { get; set; }
+ public string BindId { get; set; }
}
/// <summary>
@@ -192,5 +194,22 @@
public int LocateId { get; set; }
}
-
+
+ /// <summary>
+ /// 鍙犳墭鏈烘墭鐩樼粦瀹�
+ /// </summary>
+ public class PalletsBind
+ {
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ public string PalletNo { get; set; }
+ /// <summary>
+ /// 鎵樼洏鏁伴噺
+ /// </summary>
+ public int Qty { get; set; }
+ public string BindType { get; set; }
+
+ }
+
}
--
Gitblit v1.8.0