From d89c4f466c0922287ff88d4f61bfba71461cdbf0 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期二, 02 十二月 2025 15:37:58 +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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 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_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 056d47f..af9e5f0 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"
@@ -83,33 +83,82 @@
/// 琛屽彿
/// 榛樿鍊�:
///</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 = "鏁伴噺", DefaultValue = "0", IsNullable = true)]
+ public decimal BarcodeQty { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "barcodeUnit", ColumnDescription = "鍗曚綅", IsNullable = true )]
+ public string BarcodeUnit { get; set; } = null!;
+
+
+ /// <summary>
+ ///
+ /// 榛樿鍊�:
+ ///</summary>
+ [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>
+ /// 鍥炰紶MES
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍥炰紶MES")]
+ public int ReturnToMESStatus { get; set; } = 0;
/// <summary>
/// 澶囨敞
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
+
+ [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