From a017f6a3f5b24637b99a38dbc0855785c6a2ebff Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期一, 20 四月 2026 11:01:32 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 a401406..6badb6a 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"
@@ -32,7 +32,7 @@
/// 鍗曟嵁缂栧彿
/// </summary>
[CodeRule(RuleCodeEnum.OutboundOrderRule)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
public string OrderNo { get; set; }
/// <summary>
@@ -60,9 +60,9 @@
public int CreateType { get; set; }
/// <summary>
- /// 閮ㄩ棬缂栧彿
+ /// 铏氭嫙鍑哄叆搴撻攣瀹氭爣璇�
/// </summary>
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "閮ㄩ棬缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "铏氭嫙鍑哄叆搴撻攣瀹氭爣璇�")]
public string DepartmentCode { 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