From 814dc35a0c66e286e2ccc2728f6003a9e750a578 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Tue, 26 Mar 2024 09:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB=E5=9F=BAAP?=
 =?UTF-8?q?I=E8=AE=A2=E8=88=B1=EF=BC=8C=E5=8F=96=E6=B6=88=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=88=B9=E6=9C=9F=E8=A1=A8=E7=9A=84=E8=B5=B7=E5=A7=8B?=
 =?UTF-8?q?=E5=9C=B0=E5=92=8C=E7=9B=AE=E7=9A=84=E5=9C=B0=E7=9A=84=E6=B8=AF?=
 =?UTF-8?q?=E5=8F=A3=E4=BB=A3=E7=A0=81=EF=BC=8C=E6=94=B9=E7=94=A8=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingMSKAPIService.cs      | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

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<BookingDeliveryRecordDto, BookingDeliveryRecord>(QuerySearch.SortField);
+            /*
+            //菜单375504048771141=我的任务台账
+            List<long> userlist = await _sysDataUserMenuService.GetDataScopeList(MenuConst.MenuTaskManage);
+
+            if (userlist == null)
+                userlist = new List<long> { 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)