From 3762d139e17f5c39f968dccad53d88cff85c863d Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期五, 05 十二月 2025 09:52:02 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 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_OutboundOrderDetail.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_OutboundOrderDetail.cs"
index 3b8024e..7b5c385 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_OutboundOrderDetail.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_OutboundOrderDetail.cs"
@@ -47,7 +47,7 @@
         /// <summary>
         /// 琛屽彿
         /// </summary>
-        [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿")]
+        [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿", DefaultValue = "0")]
         public int RowNo {  get; set; }
 
         /// <summary>
@@ -71,7 +71,7 @@
         /// <summary>
         /// 璁㈠崟鏄庣粏鐘舵��
         /// </summary>
-        [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
+        [SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��", DefaultValue = "0")]
         public int OrderDetailStatus { get; set; }
         /// <summary>
         /// 鍗曚綅
@@ -83,35 +83,35 @@
         /// 琛屽彿
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿")]
+        [SugarColumn(ColumnName = "lineNo", ColumnDescription = "琛屽彿", DefaultValue= "0")]
         public string? lineNo { get; set; }
 
         /// <summary>
         /// 鎸枡鏁伴噺
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "MoveQty", ColumnDescription = "鎸枡鏁伴噺")]
+        [SugarColumn(ColumnName = "MoveQty", ColumnDescription = "鎸枡鏁伴噺",IsNullable = true)]
         public decimal MoveQty { get; set; }
 
         /// <summary>
         /// 渚涘簲鍟嗙紪鍙�
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "supplyCode", ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
+        [SugarColumn(ColumnName = "supplyCode", ColumnDescription = "渚涘簲鍟嗙紪鍙�", IsNullable = true)]
         public string? SupplyCode { get; set; }
 
         /// <summary>
         /// 鏁伴噺
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "barcodeQty", ColumnDescription = "鏁伴噺")]
+        [SugarColumn(ColumnName = "barcodeQty", ColumnDescription = "鏁伴噺", DefaultValue = "0", IsNullable = true)]
         public decimal BarcodeQty { get; set; }
 
         /// <summary>
         /// 鍗曚綅
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "barcodeUnit", ColumnDescription = "鍗曚綅")]
+        [SugarColumn(ColumnName = "barcodeUnit", ColumnDescription = "鍗曚綅", IsNullable = true    )]
         public string BarcodeUnit { get; set; } = null!;
 
 
@@ -119,13 +119,13 @@
         ///  
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "barcodemoveQty", ColumnDescription = "鏁伴噺")]
+        [SugarColumn(ColumnName = "barcodemoveQty", ColumnDescription = "鏁伴噺" , DefaultValue = "0", IsNullable = true)]
         public decimal BarcodeMoveQty { get; set; } 
         /// <summary>
         /// 浠撳簱
         /// 榛樿鍊�:
         ///</summary>
-        [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "浠撳簱")]
+        [SugarColumn(ColumnName = "warehouseCode", ColumnDescription = "浠撳簱", IsNullable = true)]
         public string? WarehouseCode { get; set; }
 
         /// <summary>
@@ -142,6 +142,23 @@
         [SugarColumn(IsIgnore = true)]
         public decimal NeedOutQuantity => OrderQuantity - MoveQty;
 
+        [SugarColumn(IsNullable = true, ColumnDescription = "")]
         public decimal PickedQty { get; set; }
+
+        [SugarColumn(IsNullable = true, ColumnDescription = "")]
+        public string documentsNO { get; set; }
+
+        [SugarColumn(IsNullable = true, ColumnDescription = "")]
+        public decimal AllocatedQuantity { get; set; }
+
+        [SugarColumn(IsNullable = true, ColumnDescription = "")]
+        public int BatchAllocateStatus { get; set; }
+
+        /// <summary>
+        /// 铏氭嫙鍑哄叆搴撴暟閲�
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDescription = "铏氭嫙鍑哄叆搴撴暟閲�")]
+        public decimal NoStockOutQty { get; set; }
+
     }
 }

--
Gitblit v1.9.3