Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1601,7 +1601,12 @@ namespace Myshipping.Application
                 var t = list.Union<GoodsStatusQuery>(config).OrderBy(x => x.Sort).DistinctBy(x => x.StatusName).ToList();
                 if (t != null)
                 {
-                    var StatusName = t.Where(x=>x.FinishTime!=null).OrderByDescending(x => x.FinishTime).Select(x => x.StatusName).First();
+                    var StatusName = t.Where(x => x.FinishTime.HasValue).OrderByDescending(x => x.FinishTime).Select(x => x.StatusName).FirstOrDefault();
+                    if (StatusName == null)
+                    {
+                        StatusName = "";
+                    }
+
                     order.BSSTATUSNAME = StatusName;
 
                     await _rep.AsUpdateable(order).IgnoreColumns(it => new