额外拍单等相关逻辑处理

This commit is contained in:
wule committed 2026-11-20 14:20:29 +08:00
1 parent 0f70b5e37c
commit 477ed75771
6 files changed
+55 -68

No files matched your search

@@ -76,6 +76,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
ShopName = OrderItem.ItemOrder.shop_name,
TransitTypeStr = "发货包裹",
TransitPackType = 1,
OrderCode = transitOrder.order_code,
SourceCode = transitOrder.random_code,
@@ -190,7 +191,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.RejectPackageBtnVisibility = OrderItem?.ItemOrder?.GetIsWaitBuy() != true && transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 发回退货包裹按钮 */
transitDetail.InterceptPackageBtnVisibility = transitOrder.warehouse_status == 2 &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
@@ -199,7 +200,8 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.ExtraPackagesBtnVisibility = ((transitOrder.warehouse_status == 0 || transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3 || !transitOrder.location_code.IsNullOrEmpty()) &&
!(transitDetail.CreateTime > DateTime.Now.AddDays(-2)) &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1)) ||
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "2" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "3" && af.order_void_status != 1)) ||
OrderItem._itemOrderIsAbnormal == true ?
Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
@@ -247,6 +249,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
ShopName = OrderItem.ItemOrder.shop_name,
TransitPackType = transitAftersaleOrder.pack_type.ParseToInt(),
TransitTypeStr = "退货包裹", /* 拦截退回 */
OrderCode = transitAftersaleOrder.order_code + " / " + transitAftersaleOrder.external_order_no,
@@ -357,6 +360,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
ShopName = OrderItem.ItemOrder.shop_name,
TransitPackType = transitExtraOrder.pack_type.ParseToInt(),
TransitTypeStr = "额外包裹",
OrderCode = transitExtraOrder.order_code + " / " + transitExtraOrder.batchId,
@@ -454,12 +458,15 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
transitDetail.VoidPackageBtnVisibility = (transitExtraOrder.warehouse_status == null || transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) &&
transitExtraOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废额外包裹 */
// 额外包裹在仓库只能作废,出仓以后才能拦截退回
//transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
// transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
// Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
// 秒退额外包裹才有转寄总店按钮
transitDetail.ReturnPackageBtnVisibility = (transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3 || !transitExtraOrder.location_code.IsNullOrEmpty()) &&
transitExtraOrder.pack_type == "3" &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 退货包裹按钮 */
// 所有额外包裹都有拦截退回总店按钮
transitDetail.InterceptPackageBtnVisibility = (transitExtraOrder.warehouse_status == 2 || transitExtraOrder.outbound_time > DateTime.MinValue || !transitExtraOrder.real_logistics_express_code.IsNullOrEmpty()) &&
transitExtraOrder.pack_type == "2" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
(transitExtraOrder.pack_type == "1" || transitExtraOrder.pack_type == "2" || transitExtraOrder.pack_type == "3") &&
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type.ToString() == transitExtraOrder.pack_type && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
//transitDetail.VoidPackageBtnVisibility = Visibility.Visible; /* 作废额外包裹 */
@@ -534,6 +541,12 @@ public class oms_wei_order_item_transit_detail_info : PropertyNotifyObject
set { this.SetValue(x => x.ShopName, value); }
}
public int? TransitPackType
{
get { return this.GetValue(x => x.TransitPackType); }
set { this.SetValue(x => x.TransitPackType, value); }
}
/// <summary> 仓库类型: 发货包裹 退货包裹 额外包裹 </summary>
public string TransitTypeStr
{