From 075c5319285ab9896a74655c82cec7c1ae0e0196 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 12 十二月 2025 14:13:46 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundLockInfo.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundLockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundLockInfo.cs"
index 190c8ae..0c61ab4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundLockInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundLockInfo.cs"
@@ -67,20 +67,25 @@
/// 鍗曟嵁鏁伴噺
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public float OrderQuantity { get; set; }
+ public decimal OrderQuantity { get; set; }
/// <summary>
/// 鍘熷搴撳瓨閲�
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鍘熷搴撳瓨閲�")]
- public float OriginalQuantity { get; set; }
+ public decimal OriginalQuantity { get; set; }
/// <summary>
/// 鍒嗛厤鍑哄簱閲�
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鍒嗛厤鍑哄簱閲�")]
- public float AssignQuantity { get; set; }
+ public decimal AssignQuantity { get; set; }
+ /// <summary>
+ /// 宸叉嫞閫夋暟閲�
+ /// </summary>
+ [SugarColumn(IsNullable = false, ColumnDescription = "宸叉嫞閫夋暟閲�")]
+ public decimal PickedQty { get; set; } //
/// <summary>
/// 璐т綅缂栧彿
/// </summary>
@@ -103,10 +108,56 @@
[SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
public int? TaskNum { get; set; }
+ public string SupplyCode { get; set; }
+
+ [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿")]
+ public string lineNo { get; set; }
+
+ public string WarehouseCode { get; set; }
/// <summary>
- /// 鐘舵��
+ /// 鐘舵�� 鐘舵�侊細0-宸插垎閰� 1-鍑哄簱涓� 2-閮ㄥ垎鎷ｉ�� 3宸叉嫞閫�
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鐘舵��")]
public int Status { get; set; }
+
+ [SugarColumn(Length = 100, ColumnDescription = "褰撳墠鏉＄爜")]
+ public string CurrentBarcode { get; set; } // 褰撳墠鏉＄爜锛堟媶鍖呭悗鍙兘鍙樺寲锛�
+
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍘熷閿佸畾鏁伴噺")]
+ public decimal OriginalLockQuantity { get; set; } // 鍘熷閿佸畾鏁伴噺
+ public int IsSplitted { get; set; } // 鏄惁宸叉媶鍖� 0-鍚� 1-鏄�
+
+ [SugarColumn( ColumnDescription = "鎷嗗寘鐖堕攣瀹欼d")]
+ public int? ParentLockId { get; set; }
+
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔鑰�")]
+ public string Operator { get; set; }
+
+ [SugarColumn( ColumnDescription = "鐗╂枡鏉＄爜鏁伴噺")]
+ public decimal BarcodeQty { get; set; }
+ [SugarColumn(ColumnDescription = "鐗╂枡鍗曚綅")]
+ public string BarcodeUnit { get; set; }
+
+ [SugarColumn(ColumnDescription = "鍒嗘壒鍑哄簱鎵规鍙�")]
+ public string OutboundBatchNo { get; set; }
+
+ [Navigate(NavigateType.OneToOne, nameof(StockInfo))]//涓�瀵逛竴 SchoolId鏄疭tudentA绫婚噷闈㈢殑
+ public Dt_StockInfo StockInfo { get; set; } //涓嶈兘璧嬪�煎彧鑳芥槸null
+
+ [SugarColumn(ColumnDescription = "鏄惁鍒嗛厤")]
+ public int IsUnallocated { get; set; } = 0;
+
+ [SugarColumn(ColumnDescription = "鍘傚尯")]
+ public string FactoryArea { get; set; }
+
+ /// <summary>
+ /// 鍓╀綑鏁伴噺
+ /// </summary>
+ [SqlSugar.SugarColumn(IsIgnore = true)]
+
+ public decimal RemainQuantity => AssignQuantity - PickedQty;
+
+ public int ReturnToMESStatus { get; set; }
+
}
}
--
Gitblit v1.9.3