标签页优化

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -174,11 +174,37 @@ namespace AllBase.Model.DBModel
                 return false;
             }
             set { }
-        }
-        /// <summary>
-        /// 异常单(买手异常退货)
-        /// </summary>
-        public bool isAbnormal
+		}
+
+		public bool IsEmergencyDistribReturnOrder
+		{
+			get
+			{
+				return IsEmergency && IsDistribReturnOrder;
+			}
+			set { }
+		}
+		public bool IsEmergencyManualReturnOrder
+		{
+			get
+			{
+				return IsEmergency && !IsDistribReturnOrder;
+			}
+			set { }
+		}
+
+		public bool IsDistribReturnOrder
+		{
+			get
+			{
+				return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
+			}
+			set { }
+		}
+		/// <summary>
+		/// 异常单(买手异常退货)
+		/// </summary>
+		public bool isAbnormal
         { 
             get
             {
@@ -281,7 +307,7 @@ namespace AllBase.Model.DBModel
                 else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
                     return "退款完成";
                 // 用户取消申请
-                else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单")) && 
+                else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) && 
                           this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
                     return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
                 if (this.status == 20 || this.status == 21)