From e354b5938f49ac90b237289923dcde923d22daf5 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 20 十一月 2025 09:08:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_Model/Models/Allocate/Dt_ AllocateOrder.cs | 9 ++++++++-
1 files changed, 8 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/Allocate/Dt_ AllocateOrder.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/Allocate/Dt_ AllocateOrder.cs"
index c20497a..f20eb36 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/Allocate/Dt_ AllocateOrder.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/Allocate/Dt_ AllocateOrder.cs"
@@ -87,7 +87,7 @@
/// 鏄惁鎵规
/// </summary>
[SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鎵规")]
- public bool? IsBatch { get; set; }
+ public int IsBatch { get; set; }
/// <summary>
/// 鍘傚尯
@@ -101,6 +101,13 @@
[SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
+
+ /// <summary>
+ /// 鍥炰紶MES
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍥炰紶MES")]
+ public int ReturnToMESStatus { get; set; } = 0;
+
/// <summary>
/// 璋冩嫧鍗曟槑缁�
/// </summary>
--
Gitblit v1.9.3