From d741e7a7ad7de5045e5c6b6145d9da1783cadecd Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 13 一月 2026 09:55:03 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs | 4 ++++
1 files changed, 4 insertions(+), 0 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
index c9948d3..2dca956 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_AllocateService/AllocateService.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_AllocateService/AllocateService.cs"
@@ -525,10 +525,14 @@
{
item.OrderStatus = _InboundOrder.OrderStatus;
item.OrderType = _InboundOrder.OrderType;
+ item.Modifier = _InboundOrder.Operator;
+ item.ReturnToMESStatus = _InboundOrder.ReturnToMESStatus;
}else if (OutboundOrder!=null)
{
item.OrderStatus = OutboundOrder.OrderStatus;
item.OrderType = OutboundOrder.OrderType;
+ item.Modifier = OutboundOrder.Operator;
+ item.ReturnToMESStatus = OutboundOrder.ReturnToMESStatus;
}
}
return new PageGridData<Dt_AllocateOrder>(totalCount, data);
--
Gitblit v1.9.3