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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1431,7 +1431,7 @@ namespace Myshipping.Application
 
                     }).ToListAsync();
 
-                var config = _goodsStatusConfig.AsQueryable().Where(config => config.CreatedUserId == userid).ToList().Select(config => new GoodsStatusQuery
+                var config = _goodsStatusConfig.AsQueryable().Where(config => config.CreatedUserId == userid).ToList().DistinctBy(x=>x.StatusName).Select(config => new GoodsStatusQuery
                 {
 
                     ConfigId = config.Id,

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -943,7 +943,7 @@ namespace Myshipping.Application
                     if (model.BookingEDIExt != null)
                     {
                         //检索EDI扩展
-                        var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == main.Id);
+                        var ediExtEntity = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == main.Id).FirstAsync();
 
                         if (ediExtEntity == null)
                         {
@@ -1244,7 +1244,7 @@ namespace Myshipping.Application
                                 if (item.BookingEDIExt != null)
                                 {
                                     //检索EDI扩展
-                                    var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == fdmain.Id);
+                                    var ediExtEntity =   await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == fdmain.Id).FirstAsync();  
 
                                     if (ediExtEntity == null)
                                     {
@@ -1359,8 +1359,8 @@ namespace Myshipping.Application
                                 if (item.BookingEDIExt != null)
                                 {
                                     //检索EDI扩展
-                                    var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == fdentity.Id);
                                  
+                                    var ediExtEntity = await _bookingEDIExt.AsQueryable().Filter(null, true).Where(x => x.BookingId == fdentity.Id).FirstAsync();
                                     if (ediExtEntity == null)
                                     {
                                         //写入EDI扩展