海运出口列表添加订舱状态

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

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DS.WMS.Core.Op.Dtos
+{
+    /// <summary>
+    /// 订舱状态返回
+    /// </summary>
+    public class BookingStatusRes
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public long  Id { get; set; }
+        /// <summary>
+        /// 业务id
+        /// </summary>
+        public long? BusinessId { get; set; }
+        /// <summary>
+        /// 状态代码
+        /// </summary>
+        public string StatusCode { get; set; }
+        /// <summary>
+        /// 状态名称
+        /// </summary>
+        public string StatusName { get; set; }
+        /// <summary>
+        /// 状态时间 
+        /// </summary>
+        public DateTime? StatusTime { get; set; }
+
+        /// <summary>
+        /// 状态分组
+        /// </summary>
+        public string StatusGroup { get; set; }
+    }
+}

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

@@ -1,6 +1,7 @@
 using DS.Module.Core;
 using DS.Module.Core.Enums;
 using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Op.Entity;
 using Masuit.Tools.Systems;
 using SqlSugar;
 
@@ -36,6 +37,11 @@ public class SeaExportRes
     ///// </summary>
     //public List<CodeFormSetRes>? FormSetList { get; set; }
 
+    /// <summary>
+    /// 订舱状态
+    /// </summary>
+    public List<BookingStatusRes> BookingStatus { get; set; }
+
     /// <summary>
     /// 业务日志
     /// </summary>

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

@@ -90,12 +90,18 @@ public partial class SeaExportService : ISeaExportService
             //.LeftJoin<SysOrg>((a, b, c) => a.SaleOrgId == c.Id, "shippingweb8_dev.sys_org")
             //.LeftJoin<SysOrg>((a, b, c) => a.SaleDeptId == c.Id, "shippingweb8_dev.sys_org")
             .Select((a, b) => new SeaExportRes()
-            {
+            { 
                 //SaleDeptName = c.OrgName,
             },
                 true)//true表示 其余字段自动映射，根据字段名字
                      //.Select<SeaExportRes>()
-            .MergeTable()
+                     .MergeTable()
+                     .Mapper(it =>
+                     {
+                         
+                         it.BookingStatus = tenantDb.Queryable<BookingStatus>().Where(x => x.BusinessId == it.Id).Select<BookingStatusRes>().ToList();
+                         
+                     }) 
             .Where(whereList);
         //.ToQueryPageAsync(request.PageCondition);
         var list = result.ToList();