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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -899,7 +899,7 @@ namespace Myshipping.Application
                     }
                 }
                 await SaveLog(entity, mlist);
-                if (!string.IsNullOrEmpty(mlist.MBLNO) && entity.MBLNO != mlist.MBLNO)
+                if (!string.IsNullOrEmpty(entity.MBLNO) && entity.MBLNO != mlist.MBLNO)
                 {
                     //更改提单号
                     await UpdateMblno(entity);
@@ -2068,7 +2068,7 @@ namespace Myshipping.Application
                 throw Oops.Bah(html.Message);
             }
 
-
+           
         }
         #endregion
 
@@ -5279,8 +5279,8 @@ namespace Myshipping.Application
                     throw Oops.Bah($"字典未配置 url_set->{CONST_TSL_EDI_URL} 请联系管理员");
 
                 //获取个人对应的账户,这里GetAccountConfig逻辑优先取个人，个人没有配置取公司对应配置
-                userWebAccountConfig = GetAccountConfig(CONST_TSL_TYPE_CODE, UserManager.UserId, UserManager.TENANT_ID).GetAwaiter()
-                    .GetResult();
+                userWebAccountConfig =  await _webAccountConfig.GetAccountConfig(CONST_TSL_TYPE_CODE, UserManager.UserId);    
+                 
 
                 _logger.LogInformation("批次={no} 获取获取网站的账户完成，result={Num}", batchNo, JSON.Serialize(userWebAccountConfig));
 
@@ -6046,27 +6046,7 @@ namespace Myshipping.Application
         }
         #endregion
 
-        /// <summary>
-        /// 获取个人或公司网站账户配置
-        /// </summary>
-        /// <param name="typeCode">账户类型代码</param>
-        /// <param name="userId">用户ID</param>
-        /// <param name="tendId">租户ID</param>
-        /// <returns>返回账户配置</returns>
-        private async Task<DjyWebsiteAccountConfig> GetAccountConfig(string typeCode, long userId, long tendId)
-        {
-            DjyWebsiteAccountConfig accountConfig = new DjyWebsiteAccountConfig();
-            accountConfig = await _djyWebsiteAccountConfigRepository.EntityContext.CopyNew().Queryable<DjyWebsiteAccountConfig>()
-                .FirstAsync(x => x.TypeCode == typeCode && x.CreatedUserId == userId);
-
-            if (accountConfig == null)
-            {
-                accountConfig = await _djyWebsiteAccountConfigRepository.EntityContext.CopyNew().Queryable<DjyWebsiteAccountConfig>()
-                .FirstAsync(x => x.TypeCode == typeCode && x.TenantId == tendId && x.IsTenant == true);
-            }
 
-            return accountConfig;
-        }
 
         #region 下载订舱、截单EDI
         /// <summary>

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -2398,6 +2398,7 @@ namespace Myshipping.Application
         }
 
 
+
         #endregion
 
         #region 其他

Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs

@@ -1408,6 +1408,24 @@ namespace Myshipping.Application
                     it.UpdatedUserName
                 }).ExecuteCommandAsync();
 
+                var taskInfo = _taskBaseRepository.AsQueryable().First(a => a.PK_ID == entity.TASK_ID);
+
+                if (taskInfo != null)
+                {
+                    taskInfo.TRUCK_NAME = entity.TruckName;
+                    taskInfo.UpdatedTime = entity.UpdatedTime;
+                    taskInfo.UpdatedUserId = UserManager.UserId;
+                    taskInfo.UpdatedUserName = UserManager.Name;
+
+                    await _taskBaseRepository.AsUpdateable(taskInfo).UpdateColumns(it => new
+                    {
+                        it.TRUCK_NAME,
+                        it.UpdatedTime,
+                        it.UpdatedUserId,
+                        it.UpdatedUserName
+                    }).ExecuteCommandAsync();
+                }
+
                 result.succ = true;
                 result.msg = "保存成功";
                 

Myshipping.Core/Service/DjyWebsiteAccountConfig/DjyWebsiteAccountConfigService.cs

@@ -192,6 +192,27 @@ namespace Myshipping.Core.Service
             }
             return accountConfig;
         }
+        ///// <summary>
+        ///// 获取个人或公司网站账户配置
+        ///// </summary>
+        ///// <param name="typeCode">账户类型代码</param>
+        ///// <param name="userId">用户ID</param>
+        ///// <param name="tendId">租户ID</param>
+        ///// <returns>返回账户配置</returns>
+        //private async Task<DjyWebsiteAccountConfig> GetAccountConfig(string typeCode, long userId, long tendId)
+        //{
+        //    DjyWebsiteAccountConfig accountConfig = new DjyWebsiteAccountConfig();
+        //    accountConfig = await _djyWebsiteAccountConfigRepository.EntityContext.CopyNew().Queryable<DjyWebsiteAccountConfig>()
+        //        .FirstAsync(x => x.TypeCode == typeCode && x.CreatedUserId == userId);
+
+        //    if (accountConfig == null)
+        //    {
+        //        accountConfig = await _djyWebsiteAccountConfigRepository.EntityContext.CopyNew().Queryable<DjyWebsiteAccountConfig>()
+        //        .FirstAsync(x => x.TypeCode == typeCode && x.TenantId == tendId && x.IsTenant == true);
+        //    }
+
+        //    return accountConfig;
+        //}
         #endregion
     }
 }