海运出口详情添加日志、表单设置、业务联系人信息；租户端登录默认首页修改

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core;
 using DS.Module.Core.Enums;
+using DS.WMS.Core.Code.Dtos;
 using Masuit.Tools.Systems;
 using SqlSugar;
 
@@ -30,8 +31,21 @@ public class SeaExportRes
     /// </summary>
     public OpBusinessYardRes? YardInfo { get; set; }
 
-    
+    /// <summary>
+    /// 表单设置
+    /// </summary>
+    public List<CodeFormSetRes>? FormSetList { get; set; }
 
+    /// <summary>
+    /// 业务日志
+    /// </summary>
+    public List<OpBusinessLogRes>? BusinessLogList { get; set; }
+
+    /// <summary>
+    /// 业务订单联系人
+    /// </summary>
+    public List<BusinessOrderContactRes>? OrderContactList { get; set; }
+     
     /// <summary>
     /// 主键Id
     /// </summary>

ds-wms-service/DS.WMS.Core/Op/Interface/ISeaExportService.cs

@@ -35,7 +35,7 @@ public interface ISeaExportService
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    DataResult<SeaExportRes> GetSeaExportInfo(string id);
+    Task<DataResult<SeaExportRes>> GetSeaExportInfo(string id);
 
 
     /// <summary>

ds-wms-service/DS.WMS.Core/Op/Method/BookingSlot/BookingSlotService.cs

@@ -265,7 +265,7 @@ namespace DS.WMS.Core.Op.Method
                             // 更新订舱表
                             //var bookingOrder = await _repBookingOrder.FirstOrDefaultAsync(x => x.Id == allocation.BOOKING_ID);
 
-                            var bookingOrder = _seaExportService.GetSeaExportInfo(allocation.BookingId.ToString()).Data;
+                            var bookingOrder = _seaExportService.GetSeaExportInfo(allocation.BookingId.ToString()).GetAwaiter().GetResult()?.Data;
 
                             /*
                             var oldBookingOrder = bookingOrder.Adapt<BookingOrder>();
@@ -4268,7 +4268,7 @@ namespace DS.WMS.Core.Op.Method
 
             SeaExportRes orderInfo = null;
 
-            var orderRlt = _seaExportService.GetSeaExportInfo(model.seaExportId.ToString());
+            var orderRlt = _seaExportService.GetSeaExportInfo(model.seaExportId.ToString()).GetAwaiter().GetResult();
 
             if (orderRlt.Succeeded)
             {

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -6,6 +6,7 @@ using DS.Module.DjyRulesEngine;
 using DS.Module.DjyServiceStatus;
 using DS.Module.SqlSugar;
 using DS.Module.UserModule;
+using DS.WMS.Core.Code.Dtos;
 using DS.WMS.Core.Code.Entity;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Info.Entity;
@@ -529,27 +530,34 @@ public partial class SeaExportService : ISeaExportService
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    public DataResult<SeaExportRes> GetSeaExportInfo(string id)
+    public async Task<DataResult<SeaExportRes>> GetSeaExportInfo(string id)
     {
         var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
-        var data = tenantDb.Queryable<SeaExport>()
-            .ClearFilter(typeof(IOrgId))
+        tenantDb.QueryFilter.Clear<IOrgId>();
+        var data = await tenantDb.Queryable<SeaExport>()
             .Where(a => a.Id == long.Parse(id))
             .Select<SeaExportRes>()
             .Mapper(it =>
             {
-                var edi = tenantDb.Queryable<SeaExportEdi>().ClearFilter(typeof(IOrgId)).First(x => x.BusinessId == it.Id);
+                var edi = tenantDb.Queryable<SeaExportEdi>().First(x => x.BusinessId == it.Id);
 
                 if (edi != null)
                     it.EdiInfo = edi.Adapt<SeaExportEdiRes>();
 
-                it.CtnInfo = tenantDb.Queryable<OpCtn>().ClearFilter(typeof(IOrgId)).Where(x => x.BSNO == it.Id.ToString()).Select<OpCtnRes>().ToList();
+                it.CtnInfo = tenantDb.Queryable<OpCtn>().Where(x => x.BSNO == it.Id.ToString()).Select<OpCtnRes>().ToList();
                 it.CtnPriceInfo = tenantDb.Queryable<BusinessCtnPrice>().Where(x => x.BusinessId == it.Id).Select<BusinessCtnPriceRes>().ToList();
 
-                it.DischargePortCountry = tenantDb.Queryable<CodePort>().Where(x => x.Id == it.DischargePortId).Select(x => x.CountryName).First();
+                it.FormSetList = tenantDb.Queryable<CodeFormSet>().Where(x => x.PermissionName == "海运出口-详情").Select<CodeFormSetRes>().ToList();
+
+                it.BusinessLogList = tenantDb.Queryable<OpBusinessLog>().Where(x => x.BusinessId == it.Id).Select<OpBusinessLogRes>().ToList();
+
+                it.OrderContactList = tenantDb.Queryable<BusinessOrderContact>().Where(x => x.BusinessId == it.Id).Select<BusinessOrderContactRes>().ToList();
+
+
+                //it.DischargePortCountry = tenantDb.Queryable<CodePort>().Where(x => x.Id == it.DischargePortId).Select(x => x.CountryName).First();
             })
-            .First();
-        return DataResult<SeaExportRes>.Success(data, MultiLanguageConst.DataQuerySuccess);
+            .FirstAsync();
+        return await Task.FromResult(DataResult<SeaExportRes>.Success(data, MultiLanguageConst.DataQuerySuccess));
     }
     /// <summary>
     /// 批量更新

ds-wms-service/DS.WMS.Core/Sys/Method/CommonService.cs

@@ -541,7 +541,8 @@ public class CommonService : ICommonService
             .Mapper(it =>
             {
                 //只能写在Select后面
-                it.HomePath = "/analysis";
+                //it.HomePath = "/analysis";
+                it.HomePath = "/taskmanage";
             })
             .FirstAsync();
         data.UserOrgs = orgRelations;

ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs

@@ -95,9 +95,9 @@ public class SeaExportController : ApiController
     /// <returns></returns>
     [HttpGet]
     [Route("GetSeaExportInfo")]
-    public DataResult<SeaExportRes> GetSeaExportInfo([FromQuery] string id)
+    public async Task<DataResult<SeaExportRes>> GetSeaExportInfo([FromQuery] string id)
     {
-        var res =  _invokeService.GetSeaExportInfo(id);
+        var res = await _invokeService.GetSeaExportInfo(id);
         return res;
     }