异常单补拍单功能

AllBase/Model/DBModel/oms_wei_order_info.cs

@@ -38,15 +38,20 @@ namespace AllBase.Model.DBModel
         {
             get
             {
-                if (order_id == "3737644875536802048")
+                if (order_id == "3737846414389704448")
                 {
 
                 }
+                if (status != 20 && status != 21) return false;
                 if (orderItems.All(oi => oi.ItemTransitOrder != null)) return false;
                 if (purchase_status != 0) return false;
-                if (!out_order_no.IsNullOrEmpty()) return false;
-                if (status != 20 && status != 21) return false;
                 if (gift_order_status == 1 || gift_order_status == 2) return false;
+                if (!string.IsNullOrEmpty(out_order_no))
+                {
+                    var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
+                    if (oi == null)
+                        return false;
+                }
                 return true;
             }
             set { }
@@ -59,8 +64,21 @@ namespace AllBase.Model.DBModel
             //get { return (purchase_status == 1 || !string.IsNullOrEmpty(out_order_no)) && (status == 20 || status == 21); }
             get
             {
-                if (purchase_status != 1 && string.IsNullOrEmpty(out_order_no) && !orderItems.All(oi => oi.ItemTransitOrder != null)) return false;
+                if (order_id == "3737846414389704448")
+                {
+
+                }
+
                 if (status != 20 && status != 21) return false;
+                if (purchase_status != 1 && !orderItems.All(oi => oi.ItemTransitOrder != null) && string.IsNullOrEmpty(out_order_no)) return false;
+                // 礼物单已发货
+                if (gift_order_status == 1 || gift_order_status == 2) return false;
+                if (!string.IsNullOrEmpty(out_order_no))
+                {
+                    var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
+                    if (oi != null)
+                        return false;
+                }
                 return true;
             }
             set { }
@@ -105,13 +123,32 @@ namespace AllBase.Model.DBModel
                 {
                     return true;
                 }
-                else if (orderItems.Any(oi => (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常")))
+                else if (orderItems.Any(oi => (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") && 
+                                               oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
                     return true;
                 return false;
             }
             set { }
         }
+        /// <summary>
+        /// 异常单(买手异常退货)
+        /// </summary>
+        public bool isAbnormal
+        { 
+            get
+            {
+                if (order_id == "3737821766770121728")
+                {
 
+                }
+
+                // 订单无售后或者售后关闭，有未作废的仓库单且仓库单买手信息为退款成功
+                if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
+                    return true;
+                return false;
+            }
+            set { }
+        }
 
         public string orderStatusStr
         {

AllBase/Model/DBModel/oms_wei_order_item_info.cs

@@ -191,7 +191,7 @@ namespace AllBase.Model.DBModel
         {
             get
             {
-                if (PddBuyerOrder?.wx_order_id == "3737683253753151488")
+                if (PddBuyerOrder?.wx_order_id == "3737803757296943104")
                 {
                 }
 
@@ -295,7 +295,7 @@ namespace AllBase.Model.DBModel
                 if (ItemTransitOrderWithVoid == null)
                     return "";
 
-                if (ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常"))
+                if (ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常") && ItemTransitOrderWithVoid.transfer_warehouse_status != 1)
                 {
                     if (ItemTransitOrderWithVoid.raw_message.Contains("超出派送范围"))
                         return "取号异常-超出派送范围";