修改马士基API订舱

Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs

@@ -327,17 +327,19 @@ namespace Myshipping.Application.Service.BookingOrder
                     {
                         placeOfReceipt = new MSKAPIBookingRouteDetailsBase
                         {
-                            UNLocationCode = model.placeOfReceiptUnLocCode,
-                            cityName = model.placeOfReceiptCityName,
+                            UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfReceiptUnLocCode
+                                : model.placeOfReceiptUnLocCode,
+                            //cityName = model.placeOfReceiptCityName,
                         },
                         placeOfDelivery = new MSKAPIBookingRouteDetailsBase
                         {
-                            UNLocationCode = model.placeOfDeliveryUnLocCode,
-                            cityName = model.placeOfDeliveryCityName,
+                            UNLocationCode = model.isSendNoSchedule ?  model.userPlaceOfDeliveryUnLocCode
+                                : model.placeOfDeliveryUnLocCode,
+                            //cityName = model.placeOfDeliveryCityName,
                         },
                         selectedRoute = new MSKAPIBookingRoute
                         {
-                            bookingSchedules = new List<MSKAPIBookingSchedules> { 
+                            bookingSchedules = new List<MSKAPIBookingSchedules> {
                                 new MSKAPIBookingSchedules
                                 {
                                     originDepartureDateTimeLocal = model.originDepartureDateTimeLocal.Value.ToString("yyyy-MM-ddTHH:mm:ss"),
@@ -353,16 +355,18 @@ namespace Myshipping.Application.Service.BookingOrder
                                     },
                                     startLocation = new MSKAPIBookingRouteDetailsBase
                                     {
-                                        cityName = model.placeOfReceiptCityName,
-                                        UNLocationCode = model.placeOfReceiptUnLocCode
+                                        //cityName = model.placeOfReceiptCityName,
+                                        UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfReceiptUnLocCode
+                                            : model.placeOfReceiptUnLocCode
                                     },
                                     endLocation = new MSKAPIBookingRouteDetailsBase
                                     {
-                                        cityName = model.placeOfDeliveryCityName,
-                                        UNLocationCode = model.placeOfDeliveryUnLocCode
+                                        //cityName = model.placeOfDeliveryCityName,
+                                        UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfDeliveryUnLocCode
+                                            : model.placeOfDeliveryUnLocCode
                                     },
                                     transportModeCode = model.transportMode
-                                } 
+                                }
                             }
                         },
                     }
@@ -987,6 +991,8 @@ namespace Myshipping.Application.Service.BookingOrder
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.PriceOwnerCompanyPartyCode), t => t.PRICE_OWNER_COMPANY_PARTYCODE.Contains(QuerySearch.PriceOwnerCompanyPartyCode))
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.PlaceReceiptCity), t => t.PLACERECEIPT_CITY.Contains(QuerySearch.PlaceReceiptCity) || t.PLACERECEIPT_UNLOC_CODE.Contains(QuerySearch.PlaceReceiptCity))
                                      .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.PlaceDeliveryCity), t => t.PLACEDELIVERY_CITY.Contains(QuerySearch.PlaceDeliveryCity) || t.PLACEDELIVERY_UNLOC_CODE.Contains(QuerySearch.PlaceDeliveryCity))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookingReference), t => t.BOOKING_REFERENCE.Contains(QuerySearch.BookingReference))
+                                     .WhereIF(!string.IsNullOrWhiteSpace(QuerySearch.BookingCreator), t => t.CreatedUserName.Contains(QuerySearch.BookingCreator) || t.UpdatedUserName.Contains(QuerySearch.BookingCreator))
                                      .OrderBy(entityOrderCol + (QuerySearch.descSort ? " desc " : " asc "))
                                      .ToPagedListAsync(QuerySearch.PageNo, QuerySearch.PageSize);
 
@@ -1251,5 +1257,38 @@ namespace Myshipping.Application.Service.BookingOrder
             }).ExecuteCommandAsync();
         }
         #endregion
+
+        #region 批量发送
+        /// <summary>
+        /// 批量发送
+        /// </summary>
+        /// <param name="ids">马士基API订舱ID组</param>
+        /// <returns>返回执行结果消息</returns>
+        public async Task<string> BatchSend(long[] ids)
+        {
+            var list = await _bookingDeliveryRecordRep.AsQueryable()
+                 .Where(a => ids.Contains(a.Id)).ToListAsync();
+
+            if (list.Count != ids.Length)
+                throw Oops.Oh("订舱数据获取失败，请确认选中的记录是否存在");
+
+
+            return string.Empty;
+        }
+        #endregion
+
+        #region 批量发送
+        /// <summary>
+        /// 批量发送
+        /// </summary>
+        /// <param name="id">马士基API订舱ID</param>
+        /// <param name="copyNum">需要复制生成记录</param>
+        /// <returns>返回执行结果消息</returns>
+        public async Task<string> BatchCopy(long id, int copyNum)
+        {
+
+            return string.Empty;
+        }
+        #endregion
     }
 }

Myshipping.Application/Service/BookingOrder/Dto/QueryBookingDeliveryRecordDto.cs

@@ -142,5 +142,15 @@ namespace Myshipping.Application
         /// 目的地
         /// </summary>
         public string PlaceDeliveryCity { get; set; }
+
+        /// <summary>
+        /// 订舱号
+        /// </summary>
+        public string BookingReference { get; set; }
+
+        /// <summary>
+        /// 订舱人
+        /// </summary>
+        public string BookingCreator { get; set; }
     }
 }

Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs

@@ -65,5 +65,20 @@ namespace Myshipping.Application
         /// <param name="id">请求订舱ID</param>
         /// <returns></returns>
         Task Delete(long id);
+
+        /// <summary>
+        /// 批量发送
+        /// </summary>
+        /// <param name="ids">马士基API订舱ID组</param>
+        /// <returns>返回执行结果消息</returns>
+        Task<string> BatchSend(long[] ids);
+
+        /// <summary>
+        /// 批量发送
+        /// </summary>
+        /// <param name="id">马士基API订舱ID</param>
+        /// <param name="copyNum">需要复制生成记录</param>
+        /// <returns>返回执行结果消息</returns>
+        Task<string> BatchCopy(long id,int copyNum);
     }
 }