diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index beb099d0..dfdd5c1f 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -18,6 +18,7 @@ using Microsoft.Extensions.Logging; using Myshipping.Application.Helper; using System.Text.RegularExpressions; using System.Globalization; +using Myshipping.Core.Const; namespace Myshipping.Application.Service.BookingOrder { @@ -327,14 +328,14 @@ namespace Myshipping.Application.Service.BookingOrder { placeOfReceipt = new MSKAPIBookingRouteDetailsBase { - UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfReceiptUnLocCode - : model.placeOfReceiptUnLocCode, + UNLocationCode = model.userPlaceOfReceiptUnLocCode + //: model.placeOfReceiptUnLocCode, //cityName = model.placeOfReceiptCityName, }, placeOfDelivery = new MSKAPIBookingRouteDetailsBase { - UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfDeliveryUnLocCode - : model.placeOfDeliveryUnLocCode, + UNLocationCode = model.userPlaceOfDeliveryUnLocCode + //: model.placeOfDeliveryUnLocCode, //cityName = model.placeOfDeliveryCityName, }, selectedRoute = new MSKAPIBookingRoute @@ -356,14 +357,14 @@ namespace Myshipping.Application.Service.BookingOrder startLocation = new MSKAPIBookingRouteDetailsBase { //cityName = model.placeOfReceiptCityName, - UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfReceiptUnLocCode - : model.placeOfReceiptUnLocCode + UNLocationCode = model.userPlaceOfReceiptUnLocCode + //: model.placeOfReceiptUnLocCode }, endLocation = new MSKAPIBookingRouteDetailsBase { //cityName = model.placeOfDeliveryCityName, - UNLocationCode = model.isSendNoSchedule ? model.userPlaceOfDeliveryUnLocCode - : model.placeOfDeliveryUnLocCode + UNLocationCode = model.userPlaceOfDeliveryUnLocCode + //: model.placeOfDeliveryUnLocCode }, transportModeCode = model.transportMode } @@ -977,6 +978,18 @@ namespace Myshipping.Application.Service.BookingOrder //这里因为返回给前端的台账数据是DTO,所以这里排序时候需要转换成Entity对应的字段 if (!string.IsNullOrWhiteSpace(QuerySearch.SortField)) entityOrderCol = MapsterExtHelper.GetAdaptProperty(QuerySearch.SortField); + /* + //菜单375504048771141=我的任务台账 + List userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuTaskManage); + + if (userlist == null) + userlist = new List { UserManager.UserId }; + + if (userlist.Count > 0) + userlist = userlist.Distinct().ToList(); + + _logger.LogInformation("任务台账权限范围 {list}", userlist); + */ var entities = await _bookingDeliveryRecordRep.AsQueryable() .WhereIF(createBegin != DateTime.MinValue, t => t.CreatedTime.HasValue && t.CreatedTime.Value >= createBegin)