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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -757,8 +757,19 @@ namespace Myshipping.Application
             {
                 ordOut.BookingEDIExt = ediExtEntity.Adapt<BookingEDIExtDto>();
             }
+
+
+
+
             List<long> arr = new List<long>();
-            arr.Add(Id);
+            if (main.ParentId == 0)
+            {
+                arr.Add(Id);
+            }
+            else {
+                arr.Add((long)main.ParentId);
+            }
+          
             var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
             if (!string.IsNullOrEmpty(itemcode))
             {

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -1777,7 +1777,7 @@ namespace Myshipping.Application
                     {
                         if (itemcode == "true") { 
                             List<long> list = new List<long>();
-                            list = order.Select(x => x.Id).ToList();
+                            list = order.Where(x=>x.ParentId==0).Select(x => x.Id).ToList();
                             if (list!=null&&list.Count>0) {
                                 await _bookingorderservice.SendBookingOrder(list.ToArray());
                             }