继续优化订单读取和展示

This commit is contained in:
wule committed 2026-10-17 09:37:11 +08:00
1 parent 1509e0a11d
commit 2f9c98b105
6 files changed
+1682 -1646

No files matched your search

@@ -1132,8 +1132,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
bool isUpdate = false;
PddBuyerAfterSaleLiteInfo afterSale = null;
if (!lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId))
PddBuyerAfterSaleLiteInfo afterSale = lstPddBuyerAfterSaleInfoLite.ToList().FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId);
if (afterSale == null)
{
isUpdate = true;
afterSale = af;
@@ -1141,7 +1141,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
}
else
{
afterSale = lstPddBuyerAfterSaleInfoLite.FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId);
var afterSaleTmp = JsonHelper.DeserializeJsonToObject<PddBuyerAfterSaleLiteInfo>(JsonHelper.SerializeObject(afterSale));
//afterSaleTmp.sendStatus = ""; // 比较订单变化,如果有变化,才写库或者处理(设置为空强制变化)
afterSaleTmp.AfterSaleStatusOldStr = null; // 设置null,比较订单变化,如果有变化,才写
File diff suppressed because it is too large. Load diff
@@ -355,7 +355,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
return;
}
if (!GetIsAbnormalOrderRebuy(orderItem) && GlobalConfig.lstOrder.Any(o => o.orderItems
if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.orderItems
.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
{
OrderListCtrl.InitOrderItemObservableProp(orderItem);
@@ -795,25 +795,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}));
});
// 作废重拍
if (order_item.ItemOrder.status == 20 /*&& order_item.refund_status <= 1*/ && order_item.ItemTransitOrder != null)
{
btnVoidTransitOrder.Visibility = Visibility.Visible;
}
else
{
btnVoidTransitOrder.Visibility = Visibility.Collapsed;
}
// 异常重拍
if (GetIsAbnormalOrderRebuy(order_item))
{
btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
}
else
{
btnAbnormalOrderRebuy.Visibility = Visibility.Collapsed;
}
// 待采购不显示所有采购信息状态(否则会显示作废订单状态)
if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
@@ -831,30 +812,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
}
}
/// <summary>
/// 判断中转仓订单是否可以异常重拍
/// </summary>
/// <param name="order_item"></param>
/// <returns></returns>
static bool GetIsAbnormalOrderRebuy(oms_wei_order_item_info order_item)
{
// 不是异常单的不可异常重拍
if (order_item?.ItemOrder?.IsAbnormal != true)
return false;
// 买手未退款的,中转正式取号以后的,不可异常重拍
if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
return false;
// 已正式取号的,不可异常重拍
if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
return false;
// 仓库异常的异常单不可异常重拍
List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
if (rawMsgKeyWords.Any(k => (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
return false;
return true;
}
private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
{
var orderItem = this.DataContext as oms_wei_order_item_info;