From ad72c566847c2370958b6811363545ff6019a001 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期三, 26 十一月 2025 09:03:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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_OutboundOrder.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_OutboundOrder.cs"
index d72efc3..7b5bfc7 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_OutboundOrder.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_OutboundOrder.cs"
@@ -84,7 +84,7 @@
/// 榛樿鍊�:
///</summary>
[SugarColumn(ColumnName = "isBatch", ColumnDescription = "鏄惁鍒嗘壒")]
- public int? IsBatch { get; set; }
+ public int IsBatch { get; set; }
/// <summary>
/// 澶� 娉�:鍘傚尯
@@ -99,6 +99,15 @@
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
+
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔鑰�")]
+ public string Operator { get; set; }
+
+ /// <summary>
+ /// 鍥炰紶MES 0鏈洖浼狅紝1鍥炰紶鎴愬姛锛� 2鍥炰紶澶辫触
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍥炰紶MES")]
+ public int ReturnToMESStatus { get; set; } = 0;
/// <summary>
/// 鍑哄簱鍗曟槑缁�
/// </summary>
--
Gitblit v1.9.3