From 3a0f51be3a0d0a7ce69bd1f70d6eda453273ec90 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Fri, 21 Jul 2023 15:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=B8=AA=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 651d62b6..2bddffb7 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -821,7 +821,7 @@ namespace Myshipping.Application
                 var mlist = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == input.Id).FirstAsync();
                 var rightlist = await _right.GetDataScopeList(MenuConst.MenuBookingOrder, true);
                 if (!(
-                    mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString()||
+                    mlist.OPID == UserManager.UserId.ToString() || mlist.OP == UserManager.Name.ToString() ||
                     mlist.DOCID == UserManager.UserId.ToString() || mlist.DOC == UserManager.Name.ToString() ||
                     mlist.CUSTSERVICEID == UserManager.UserId.ToString() || mlist.CUSTSERVICE == UserManager.Name.ToString() ||
                     mlist.ROUTEID == UserManager.UserId.ToString() || mlist.ROUTE == UserManager.Name.ToString() ||
@@ -838,7 +838,7 @@ namespace Myshipping.Application
                     entity.VOYNO = entity.VOYNOINNER;
                 }
                 entity.VERSION = Guid.NewGuid().ToString();
-              
+
 
                 await _rep.AsUpdateable(entity).IgnoreColumns(it => new
                 {
@@ -922,7 +922,7 @@ namespace Myshipping.Application
                     }
                 }
                 await SaveLog(entity, mlist);
-                if (!string.IsNullOrEmpty(entity.MBLNO) && entity.MBLNO != mlist.MBLNO)
+                if (!string.IsNullOrEmpty(entity.MBLNO) && (entity.MBLNO != mlist.MBLNO||entity.YARDID!=mlist.YARDID||entity.CARRIERID!=mlist.CARRIERID))
                 {
                     //更改提单号
                     await UpdateMblno(entity);
@@ -1853,7 +1853,6 @@ namespace Myshipping.Application
             var dicdatalist = _cache.GetAllDictData().Result;
             foreach (var item in dto)
             {
-
                 if (!string.IsNullOrWhiteSpace(item.CARRIERID))
                 {
                     var et = await _repBookingStatus.AsQueryable().Where(x => x.StaCode == "sta_mudigang" && x.BookingId == Convert.ToInt64(item.BusinessId)).FirstAsync();
@@ -1908,9 +1907,9 @@ namespace Myshipping.Application
                     status = "订阅起运港";
                     IsBookingYZ = "1";
                 }
-                else {
+                else
+                {
                     IsBookingYZ = "0";
-
                 }
                 ////添加booking日志
                 var bid = await _bookinglog.InsertReturnSnowflakeIdAsync(new BookingLog
@@ -2074,7 +2073,7 @@ namespace Myshipping.Application
                 throw Oops.Bah(html.Message);
             }
 
-           
+
         }
         #endregion
 
@@ -5285,8 +5284,8 @@ namespace Myshipping.Application
                     throw Oops.Bah($"字典未配置 url_set->{CONST_TSL_EDI_URL} 请联系管理员");
 
                 //获取个人对应的账户,这里GetAccountConfig逻辑优先取个人，个人没有配置取公司对应配置
-                userWebAccountConfig =  await _webAccountConfig.GetAccountConfig(CONST_TSL_TYPE_CODE, UserManager.UserId);    
-                 
+                userWebAccountConfig = await _webAccountConfig.GetAccountConfig(CONST_TSL_TYPE_CODE, UserManager.UserId);
+
 
                 _logger.LogInformation("批次={no} 获取获取网站的账户完成，result={Num}", batchNo, JSON.Serialize(userWebAccountConfig));
 
@@ -7957,7 +7956,7 @@ namespace Myshipping.Application
                 foreach (var item in order)
                 {
                     var dto = item.Adapt<SyncBookingOrderDto>();
-                    
+
                     var CtnDayNumlist = await GetGoodsStatusList(item.Id);
                     if (CtnDayNumlist != null)
                     {
@@ -8244,7 +8243,7 @@ namespace Myshipping.Application
                 //    it.BOOKINGNO
                 //}).ExecuteCommandAsync();
                 await _rep.UpdateAsync(x => x.Id == bookingId, x => new BookingOrder { BSSTATUSNAME = StatusName });
-               
+
             }
         }
 
@@ -8571,7 +8570,7 @@ namespace Myshipping.Application
         {
             var orderlist = _rep.AsQueryable().Filter(null, true).
                 Where(x => x.TenantId == UserManager.TENANT_ID).
-                WhereIF(!string.IsNullOrWhiteSpace(Id) && !Id.Contains(','), u => u.Id.ToString()==Id).
+                WhereIF(!string.IsNullOrWhiteSpace(Id) && !Id.Contains(','), u => u.Id.ToString() == Id).
                 WhereIF(!string.IsNullOrWhiteSpace(Id) && Id.Contains(','), u => Id.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).Contains(u.Id.ToString())).
                 Select(x => x.Id).ToList();