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/ModelDto/BllSoDto/ExportNoticeDto.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
index 9c66d49..0c3aae6 100644
--- a/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
+++ b/Wms/Model/ModelDto/BllSoDto/ExportNoticeDto.cs
@@ -103,6 +103,16 @@
/// 鏇存柊浜�
/// </summary>
public string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 澶嶆牳浜�
+ /// </summary>
+ public string CheckUserName { get; set; }
+
+ /// <summary>
+ /// 澶嶆牳鏃堕棿
+ /// </summary>
+ public DateTime? CheckTime { get; set; }
}
public class ExStockInfoDto
@@ -111,7 +121,7 @@
public string SkuName { get; set; }
public string Standard { get; set; }
public string LotNo { get; set; }
- public int? Qty { get; set; }
+ public decimal? Qty { get; set; }
}
public class EditExportNotifyDto
@@ -127,8 +137,8 @@
public string LotNo { get; set; } //鎵规
public string SkuNo { get; set; } //鐗╂枡缂栫爜
public string SkuName { get; set; } //鐗╂枡鍚嶇О
- public int Qty { get; set; } //搴撳瓨鏁伴噺
- public int ExQty { get; set; } //鏁伴噺
+ public decimal Qty { get; set; } //搴撳瓨鏁伴噺
+ public decimal ExQty { get; set; } //鏁伴噺
public string Standard { get; set; }
public string IsBale { get; set; } //鏄惁瑁瑰寘
public string IsBelt { get; set; } //鏄惁鎵撳甫
@@ -214,12 +224,12 @@
/// <summary>
/// Desc:鏁伴噺
/// </summary>
- public int Qty { get; set; }
+ public decimal Qty { get; set; }
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
/// </summary>
- public int? CompleteQty { get; set; }
+ public decimal? CompleteQty { get; set; }
/// <summary>
/// Desc:鐘舵��
@@ -245,6 +255,16 @@
/// Desc:鍑哄簱鍙�
/// </summary>
public string OutMode { get; set; }
+
+ /// <summary>
+ /// Desc:瑁呰溅鍙�
+ /// </summary>
+ public string LoadingAddre { get; set; }
+
+ /// <summary>
+ /// Desc:鎷嗗灈妯″紡
+ /// </summary>
+ public string UnstackingMode { get; set; }
/// <summary>
/// 鍒涘缓鏃ユ湡
@@ -346,7 +366,7 @@
/// <summary>
/// Desc:鎷ｈ揣鏁伴噺
/// </summary>
- public int? CompleteQty { get; set; }
+ public decimal? CompleteQty { get; set; }
/// <summary>
/// Desc:鏂版墭鐩�
@@ -373,4 +393,31 @@
/// </summary>
public string UpdateUserName { get; set; }
}
+
+ /// <summary>
+ /// 鍌ㄤ綅鐐逛俊鎭�
+ /// </summary>
+ public class AddressCls
+ {
+ /// <summary>
+ /// 鍌ㄤ綅
+ /// </summary>
+ public string LocatNo { get; set; }
+ /// <summary>
+ /// 琛�
+ /// </summary>
+ public int? Row { get; set; }
+ /// <summary>
+ /// 鍒�
+ /// </summary>
+ public int? Column { get; set; }
+ /// <summary>
+ /// 灞�
+ /// </summary>
+ public int? Layer { get; set; }
+ /// <summary>
+ /// 璺濈鐐逛綅
+ /// </summary>
+ public int? DistNum { get; set; }
+ }
}
--
Gitblit v1.8.0