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

Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs

@@ -72,7 +72,7 @@ namespace Myshipping.Application
         public async Task<List<BookingOrderSeaeEdiServiceDto>> PageESeaeEdi(long bookingId)
         {
 
-            var entities = await _seaeedi.AsQueryable().Filter(null, true).Where(x => x.BookingId == bookingId&&x.IsDeleted==false).ToListAsync();
+            var entities = await _seaeedi.AsQueryable().Filter(null, true).Where(x => x.BookingId == bookingId && x.IsDeleted == false).ToListAsync();
             var list = entities.Adapt<List<BookingOrderSeaeEdiServiceDto>>();
             foreach (var item in list)
             {
@@ -194,11 +194,18 @@ namespace Myshipping.Application
         /// <summary>
         /// 舱单 
         /// </summary>
-        /// <param name="bookingId"></param>
+        /// <param name="Ids"></param>
         /// <returns></returns>
         [HttpPost("/BookingOrderSeaeEdi/CustEDI")]
-        public async Task CustEDI(long bookingId)
+        public async Task CustEDI(string Ids)
         {
+
+            var arr = Ids.Split(",");
+            if (arr.Count() > 0)
+            {
+                foreach (var ar in arr)
+                {
+                    long bookingId = Convert.ToInt64(ar);
                     var order = await _seaeedi.AsQueryable().Filter(null, true).Where(x => x.BookingId == bookingId).FirstAsync();
                     var ctns = await _seaeedictn.AsQueryable().Filter(null, true).Where(x => x.PId == order.Id).ToListAsync();
                     //船公司
@@ -262,8 +269,9 @@ namespace Myshipping.Application
                     await _seaeedi.UpdateAsync(x => x.Id == bookingId, x => new BookingOrderSeaeEdi { State = "已发送" });
                 }
 
-
-
+            }
+        }
         #endregion
+
     }
 }

Myshipping.Application/Service/BookingOrderSeaeEdi/Dto/BookingOrderSeaeEdiServiceDto.cs

@@ -177,7 +177,10 @@ namespace Myshipping.Application.Service.BookingOrderSeaeEdi.Dto
         /// 场站
         /// </summary>
         public string YARD { get; set; }
-
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string State { get; set; }
         public List<BookingOrderSeaeEdiCtnDto> EdiCtn { get; set; }