diff --git a/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs b/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
index 9b1dcbb..a933fd5 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_transit_model.cs
@@ -310,7 +310,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
 
 				//transitDetail.VoidPackageBtnVisibility = !(transitDetail.InboundTime > DateTime.MinValue) && transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
 
-				transitDetail.VoidPackageBtnVisibility = (transitAftersaleOrder.warehouse_status == 0 || transitAftersaleOrder.warehouse_status == 1 || transitAftersaleOrder.warehouse_status == 3) && 
+				transitDetail.VoidPackageBtnVisibility = /*(transitAftersaleOrder.warehouse_status == null || transitAftersaleOrder.warehouse_status == 0 || transitAftersaleOrder.warehouse_status == 1 || transitAftersaleOrder.warehouse_status == 3) &&*/
 					transitAftersaleOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废退货包裹 */
 
 				//transitDetail.VoidPackageBtnVisibility = Visibility.Visible;
@@ -450,7 +450,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
 				//	transitExtraOrder.pack_type == "1" && !OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 2 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
 				//	Visibility.Visible : Visibility.Collapsed; /* 拦截退货包裹按钮 */
 
-				transitDetail.VoidPackageBtnVisibility = !(transitExtraOrder.warehouse_status == 0 || transitExtraOrder.warehouse_status == 1 || transitExtraOrder.warehouse_status == 3) && 
+				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()) &&
diff --git a/AllBase/Model/DBModel/user_payment_record.cs b/AllBase/Model/DBModel/user_payment_record.cs
index 911eda1..2b9c530 100644
--- a/AllBase/Model/DBModel/user_payment_record.cs
+++ b/AllBase/Model/DBModel/user_payment_record.cs
@@ -69,25 +69,41 @@ namespace AllBase.Model.DBModel
 
     public enum EnumOrderPaymentType
     {
-        充值 = 1,
-        //采购花费 = 2,
-        //产品退款到账 = 3,
-        //运费退款到账 = 4,
-        //采购收款 = 5,
-        //产品退款扣除 = 6,
-        //运费退款扣除 = 7,
-        礼物单支出 = 16,
-        中转仓扣费支出 = 20,
-        中转仓作废收入 = 23,
-        中转仓超重支出 = 24,
+		//变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除, 16:礼物单话费，20:中转仓扣费支出，23:中转仓退款收入,24:中转仓超重扣费支出,26 退货包裹扣费支出30支付宝充值;31 云仓退货支出33 分销退货包裹超重花费32 分销退货包裹发货花费退款34 礼物单退费35 额外包裹创建36 额外包裹作废37 额外订单超重支出38 退货包裹作废返还55 同步物流支出
+
+		充值 = 1,
+		//采购花费 = 2,
+		//产品退款到账 = 3,
+		//运费退款到账 = 4,
+		//采购收款 = 5,
+		//产品退款扣除 = 6,
+		//运费退款扣除 = 7,
+		礼物单支出 = 16,
+
+		发货包裹扣费支出 = 20,
+		发货包裹作废返还 = 23,
+		发货包裹超重支出 = 24,
+
 		退货包裹扣费支出 = 26,
-        支付宝在线充值 = 30,
-		云仓退货支出 = 31,
-		礼物单退费 = 34,
-		额外订单创建 = 35,
-		额外订单作废 = 36,
-		额外订单超重支出 = 37,
+		退货包裹超重支出 = 28,
 		退货包裹作废返还 = 38,
+
+		支付宝在线充值 = 30,
+
+		退货仓退货支出 = 31,
+		退货仓作废返还 = 32,
+		退货仓超重支出 = 33,
+
+		礼物单退费 = 34,
+
+		额外包裹创建支出 = 35,
+		额外包裹作废返还 = 36,
+		额外包裹超重支出 = 37,
+
+		额外包裹退货拦截创建支出 = 39,
+		额外包裹退货拦截作废返还 = 40,
+		额外包裹退货拦截超重支出 = 41,
+
 		同步物流 = 55,
 	}