Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

647556386

2026-01-08 c317c0a0c5475c3889a2bc75d30d2ed83cd6e43b

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_AllocateService/AllocateService.cs

@@ -526,11 +526,13 @@
                    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);