海运出口详情修改

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

@@ -16,6 +16,17 @@ public class SeaExportRes
     /// Edi信息
     /// </summary>
     public SeaExportEdiRes EdiInfo { get; set; }
+
+    /// <summary>
+    /// 箱信息
+    /// </summary>
+    public List<OpCtnRes> CtnInfo { get; set; }
+
+
+    /// <summary>
+    /// 箱型报价信息
+    /// </summary>
+    public List<BusinessCtnPriceRes> CtnPriceInfo { get; set; }
     /// <summary>
     /// 主键Id
     /// </summary>

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

@@ -29,13 +29,13 @@ public interface ISeaExportService
     /// <param name="model"></param>
     /// <returns></returns>
     Task<DataResult> EditSeaExport(SeaExportReq model);
-    
+
     /// <summary>
     /// 获取详情
     /// </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/SeaExportService.cs

@@ -790,22 +790,25 @@ 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>()
+        var data = await tenantDb.Queryable<SeaExport>()
             .ClearFilter(typeof(IOrgId))
             .Where(a => a.Id == long.Parse(id))
             .Select<SeaExportRes>()
-            .Mapper(it =>
+            .Mapper(async it =>
             {
-                var edi = tenantDb.Queryable<SeaExportEdi>().ClearFilter(typeof(IOrgId)).First(x => x.BusinessId == it.Id);
+                var edi = await tenantDb.Queryable<SeaExportEdi>().ClearFilter(typeof(IOrgId)).FirstAsync(x => x.BusinessId == it.Id);
 
                 if(edi != null)
                     it.EdiInfo = edi.Adapt<SeaExportEdiRes>();
+
+                it.CtnInfo = await tenantDb.Queryable<OpCtn>().ClearFilter(typeof(IOrgId)).Where(x => x.BSNO == it.Id.ToString()).Select<OpCtnRes>().ToListAsync();
+                it.CtnPriceInfo = await tenantDb.Queryable<BusinessCtnPrice>().Where(x => x.BusinessId == it.Id).Select<BusinessCtnPriceRes>().ToListAsync();
             })
-            .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

@@ -1296,6 +1296,10 @@ public class CommonService : ICommonService
         //if (db.Queryable<SysDataRule>()
         //    .Where(u => u.PermissionEntity.ToLower() == moduleName && u.Status == StatusEnum.Enable && u.RuleType == "user").Any())
         //{
+        //    //此处取第一个
+
+        //    var ruleUser = db.Queryable<SysRuleUser>()
+        //    .First(u => u.PermissionEntity.ToLower() == moduleName && u.Status == StatusEnum.Enable);
 
         //}
 

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;
     }