中转仓退货包裹逻辑修改 新增中转仓拒收逻辑

AllBase/Model/DBModel/oms_wei_external_procurement_log_info.cs

@@ -78,5 +78,6 @@ namespace AllBase.Model.DBModel
         /// 中转出库时间
         /// </summary>
         public DateTime? outbound_time { get; set; }
+        public int has_reject { get; set; }
     }
 }

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -223,7 +223,12 @@ namespace AllBase.Model.DBModel
         }
         public void SetTransitOrder()
         {
-            this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
+
+			if (order_id == "3738110521481264129")
+			{
+
+			}
+			this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
             this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
             this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
             this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
@@ -250,16 +255,25 @@ namespace AllBase.Model.DBModel
             else
                 TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
 
-            if (order_id == "3737914129536416512")
-            {
+            
 
+            AddEditTransitWarehouseRejectStr = "申请";
+            if (this.ItemTransitOrderWithVoid?.has_reject == 1)
+                AddEditTransitWarehouseRejectStr = "已申请拒收";
+            if (this.ItemTransitOrderWithVoid?.has_reject == 2)
+                AddEditTransitWarehouseRejectStr = "申请拒收失败";
+            if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status == 2 ||
+                string.IsNullOrEmpty(PddBuyerOrder?.order_sn))
+            {
+                if (AddEditTransitWarehouseRejectStr != "已申请拒收")
+                    AddEditTransitWarehouseRejectStr = "";
             }
 
             // 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
             AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "已添加";
-            if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal))
+            if (this.ItemTransitOrderWithVoid == null || (!this.ItemOrder.IsEmergency && !this.ItemOrder.isAbnormal && !this.ItemOrder.IsRefund) || this.ItemTransitOrderWithVoid.warehouse_status < 2)
             {
-                if (AddEditTransitWarehouseAfterSaleStr == "添加")
+                if (AddEditTransitWarehouseAfterSaleStr != "已添加")
                     AddEditTransitWarehouseAfterSaleStr = "";
             }
             if (this.ItemTransitOrderAfterSale != null)
@@ -268,6 +282,14 @@ namespace AllBase.Model.DBModel
             this.PddBuyerAfterSaleAddressStr = this.PddBuyerAfterSale?.afterSaleAddress;
         }
         /// <summary>
+        /// 仓库拒收按钮文本参数
+        /// </summary>
+        public string AddEditTransitWarehouseRejectStr
+        {
+            get { return this.GetValue(x => x.AddEditTransitWarehouseRejectStr); }
+            set { this.SetValue(x => x.AddEditTransitWarehouseRejectStr, value); }
+        }
+        /// <summary>
         /// 仓库退货编辑按钮文本参数
         /// </summary>
         public string AddEditTransitWarehouseAfterSaleStr
@@ -695,11 +717,11 @@ namespace AllBase.Model.DBModel
         }
 
 
-        public List<order_pdd_buyer_after_sale> DirectPddOrders { get; set; } = new List<order_pdd_buyer_after_sale>();
-        public order_pdd_buyer_after_sale DirectPddOrder
+        public List<order_pdd_buyer_order> DirectPddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
+        public order_pdd_buyer_order DirectPddBuyerOrder
         {
-            get { return this.GetValue(x => x.DirectPddOrder); }
-            set { this.SetValue(x => x.DirectPddOrder, value); }
+            get { return this.GetValue(x => x.DirectPddBuyerOrder); }
+            set { this.SetValue(x => x.DirectPddBuyerOrder, value); }
         }
 
         public List<order_pdd_buyer_after_sale> DirectPddBuyerAfterSales { get; set; } = new List<order_pdd_buyer_after_sale>();
@@ -723,7 +745,7 @@ namespace AllBase.Model.DBModel
         }
         public void SetDirectOrder()
         {
-            this.DirectPddOrder = DirectPddOrders.FirstOrDefault(p => OrderItemExt?.out_order_id == p.orderSn);
+            this.DirectPddBuyerOrder = DirectPddBuyerOrders.FirstOrDefault(p => OrderItemExt?.out_order_id == p.order_sn);
 
             //this.DirectPddBuyerAfterSale = DirectPddBuyerAfterSales?.FirstOrDefault(p => p.statusText == "退款成功") ?? DirectPddBuyerAfterSales?.FirstOrDefault(p => p.statusText != "申请已撤销");
             //if (DirectPddBuyerAfterSale == null)