Merge branch 'main' of http://git.ts.e57.cn/chfei/29WxOrder
This commit is contained in:
commit
70996d5409
2 files changed
+1
-10
No files matched your search
@@ -575,17 +575,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
// 装载订单售后详情
|
// 装载订单售后详情
|
||||||
order.refundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
order.refundItems = new ObservableCollection<oms_wei_refund_info>(refunds.Where(of => of.order_id == order.order_id));
|
||||||
|
|
||||||
if (order.order_id.Contains("3740137835668615168"))
|
|
||||||
{
|
|
||||||
var x = order.orderItems.FirstOrDefault();
|
|
||||||
}
|
|
||||||
|
|
||||||
// 装载同步单
|
// 装载同步单
|
||||||
order.SyncLogisticsList = [.. syncLogistics.Where(os => order.orderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))),];
|
order.SyncLogisticsList = [.. syncLogistics.Where(os => order.orderItems.Any(oi => oi.DirectPddBuyerOrders.Any(od => od.order_sn == os.order_id))),];
|
||||||
if (order.SyncLogisticsList.Count > 0)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// 装载订单物流最后一条信息
|
// 装载订单物流最后一条信息
|
||||||
order.latestEWaybills = [.. ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong())];
|
order.latestEWaybills = [.. ewaybillLst.Where(ew => ew.order_id == order.order_id.ParseToLong())];
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ namespace AllBase
|
|||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
public static int VersionCount = 369;
|
public static int VersionCount = 370;
|
||||||
|
|
||||||
//public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
//public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
|
||||||
public static string ServerUrl
|
public static string ServerUrl
|
||||||
|
|||||||
Reference in new issue
Block a user