diff --git a/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs b/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs
index 39b9919d..f7601827 100644
--- a/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs
+++ b/Myshipping.Application/Entity/TrackingSystem/ServiceProjectBaseInfo.cs
@@ -28,12 +28,12 @@ namespace Myshipping.Application.Entity
         }
 
         /// <summary>
-        /// 产品代码
+        /// 服务项代码
         /// </summary>
         public string SERVICE_PROJECT_CODE { get; set; }
 
         /// <summary>
-        /// 产品名称
+        /// 服务项名称
         /// </summary>
         public string SERVICE_PROJECT_NAME { get; set; }
 
diff --git a/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowRunInfo.cs b/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowRunInfo.cs
index 24fb6591..dd082c78 100644
--- a/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowRunInfo.cs
+++ b/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowRunInfo.cs
@@ -64,6 +64,16 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string STATUS { get; set; }
 
+        /// <summary>
+        /// 服务项代码
+        /// </summary>
+        public string SERVICE_PROJECT_CODE { get; set; }
+
+        /// <summary>
+        /// 服务项名称
+        /// </summary>
+        public string SERVICE_PROJECT_NAME { get; set; }
+
         /// <summary>
         /// 活动数量
         /// </summary>
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingQueryMessageInfo.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingQueryMessageInfo.cs
new file mode 100644
index 00000000..42b73403
--- /dev/null
+++ b/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingQueryMessageInfo.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    public class TrackingQueryMessageInfo
+    {
+        /// <summary>
+        /// 表头
+        /// </summary>
+        public TrackingMessageHeadInfo Head { get; set; }
+
+        /// <summary>
+        /// 表体
+        /// </summary>
+        public TrackingMessageQueryMainInfo Main { get; set; }
+    }
+
+    public class TrackingMessageQueryMainInfo
+    {
+        /// <summary>
+        /// 服务项目代码
+        /// </summary>
+        public List<string> ServiceProjectCodeList { get; set; }
+
+        /// <summary>
+        /// 业务系统代码
+        /// </summary>
+        [Required(ErrorMessage = "必填")]
+        public string BusiSystemCode { get; set; }
+
+        /// <summary>
+        /// 业务主键
+        /// </summary>
+        public string BusiId { get; set; }
+
+        /// <summary>
+        /// 提单号
+        /// </summary>
+        public string MBlNo { get; set; }
+
+        /// <summary>
+        /// 船名航次
+        /// </summary>
+        public string VesselVoyno { get; set; }
+
+        /// <summary>
+        /// 订舱编号
+        /// </summary>
+        public string OrderNo { get; set; }
+    }
+}
diff --git a/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowManageService.cs b/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowManageService.cs
index cdc0c7f1..55ddb2e3 100644
--- a/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowManageService.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Interface/IServiceWorkFlowManageService.cs
@@ -20,18 +20,18 @@ namespace Myshipping.Application
 
 
         /// <summary>
-        /// 查询单票业务单服务项目查询
+        /// 单票单服务项目查询
         /// </summary>
-        /// <param name="info">服务流程详情</param>
+        /// <param name="info">查询服务流程详情</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> QuerySingleBusinessPerServiceProject(ServiceWorkFlowBaseDto info);
+        Task<TaskManageOrderResultDto> QuerySingleBusinessPerServiceProject(TrackingQueryMessageInfo info);
 
 
         /// <summary>
-        /// 查询单票所有相关服务项目查询
+        /// 单票所有相关服务项目查询
         /// </summary>
-        /// <param name="info">服务流程详情</param>
+        /// <param name="info">查询服务流程详情</param>
         /// <returns>返回回执</returns>
-        Task<TaskManageOrderResultDto> QuerySingleBusinessAll(ServiceWorkFlowBaseDto info);
+        Task<TaskManageOrderResultDto> QuerySingleBusinessAll(TrackingQueryMessageInfo info);
     }
 }
diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowManageService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowManageService.cs
index 02e7162d..20c6e3ee 100644
--- a/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowManageService.cs
+++ b/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowManageService.cs
@@ -40,6 +40,7 @@ namespace Myshipping.Application
         private readonly SqlSugarRepository<ServiceWorkFlowRunActivitiesInfo> _serviceWorkFlowRunActivitiesInfoRepository;
         private readonly SqlSugarRepository<StatusSkuBaseInfo> _statusSkuBaseInfoRepository;
         private readonly SqlSugarRepository<SysUser> _sysUserRepository;
+        private readonly SqlSugarRepository<ServiceProjectBaseInfo> _serviceProjectBaseInfoRepository;
 
         private readonly IServiceWorkFlowBaseService _serviceWorkFlowBaseService;
 
@@ -53,7 +54,8 @@ namespace Myshipping.Application
             SqlSugarRepository<ServiceWorkFlowRunInfo> serviceWorkFlowRunInfoRepository,
             SqlSugarRepository<ServiceWorkFlowRunActivitiesInfo> serviceWorkFlowRunActivitiesInfoRepository, 
             SqlSugarRepository<StatusSkuBaseInfo> statusSkuBaseInfoRepository,
-            IServiceWorkFlowBaseService serviceWorkFlowBaseService, SqlSugarRepository<SysUser> sysUserRepository)
+            IServiceWorkFlowBaseService serviceWorkFlowBaseService, SqlSugarRepository<SysUser> sysUserRepository,
+            SqlSugarRepository<ServiceProjectBaseInfo> serviceProjectBaseInfoRepository)
         {
             _serviceWorkFlowBaseRepository = serviceWorkFlowBaseRepository;
             _serviceWorkFlowActivitiesInfoRepository = serviceWorkFlowActivitiesInfoRepository;
@@ -68,6 +70,7 @@ namespace Myshipping.Application
             _statusSkuBaseInfoRepository = statusSkuBaseInfoRepository;
             _serviceWorkFlowBaseService = serviceWorkFlowBaseService;
             _sysUserRepository = sysUserRepository;
+            _serviceProjectBaseInfoRepository = serviceProjectBaseInfoRepository;
         }
 
         #region 推送状态
@@ -224,7 +227,9 @@ namespace Myshipping.Application
                             CreatedUserId = userTendInfo.userId,
                             CreatedUserName = userTendInfo.userName,
                             TenantId = userTendInfo.tendId,
-                            TenantName = userTendInfo.tenantName
+                            TenantName = userTendInfo.tenantName,
+                            SERVICE_PROJECT_CODE = wf.ServiceProject.ServiceProjectCode,
+                            SERVICE_PROJECT_NAME = wf.ServiceProject.ServiceProjectName,
                         };
 
                         await _serviceWorkFlowRunInfoRepository.InsertAsync(serviceWorkFlowRunInfo);
@@ -251,7 +256,7 @@ namespace Myshipping.Application
                                 SHOW_NAME = sku.ShowName,
                                 IS_SUB = 0,
                                 IS_SUB_JUST = 0,
-                                IS_YIELD = 1,
+                                IS_YIELD = 0,
                                 CreatedTime = nowDate,
                                 UpdatedTime = nowDate,
                                 CreatedUserId = userTendInfo.userId,
@@ -266,6 +271,7 @@ namespace Myshipping.Application
                             {
                                 activitiesRunInfo.ACT_DATE = currReq.Req.StatusDate;
                                 activitiesRunInfo.ACT_VAL = currReq.Req.StatusVal;
+                                activitiesRunInfo.IS_YIELD = 1;
                             }
                             
 
@@ -298,7 +304,7 @@ namespace Myshipping.Application
                                         SHOW_NAME = sub.ShowName,
                                         IS_SUB = 1,
                                         IS_SUB_JUST = 1,
-                                        IS_YIELD = 1,
+                                        IS_YIELD = 0,
                                         CreatedTime = nowDate,
                                         UpdatedTime = nowDate,
                                         CreatedUserId = userTendInfo.userId,
@@ -306,13 +312,15 @@ namespace Myshipping.Application
                                         TenantId = userTendInfo.tendId,
                                         TenantName = userTendInfo.tenantName,
                                         IsDeleted = false,
-                                        SOURCE_TYPE = "AUTO"
+                                        SOURCE_TYPE = "AUTO",
+                                        PARENT_ID = activitiesRunInfo.PK_ID
                                     };
 
                                     if(currSubReq != null)
                                     {
                                         activitiesSubRunInfo.ACT_DATE = currSubReq.Req.StatusDate;
                                         activitiesSubRunInfo.ACT_VAL = currSubReq.Req.StatusVal;
+                                        activitiesSubRunInfo.IS_YIELD = 1;
                                     }
 
                                     if (!string.IsNullOrWhiteSpace(lastSubActId))
@@ -343,28 +351,238 @@ namespace Myshipping.Application
         }
         #endregion
 
+        #region 单票单服务项目查询
         /// <summary>
-        /// 查询单票业务单服务项目查询
+        /// 单票单服务项目查询
         /// </summary>
-        /// <param name="info">服务流程详情</param>
+        /// <param name="info">查询服务流程详情</param>
         /// <returns>返回回执</returns>
         [HttpPost("/ServiceWorkFlowManage/QuerySingleBusinessPerServiceProject")]
-        public async Task<TaskManageOrderResultDto> QuerySingleBusinessPerServiceProject(ServiceWorkFlowBaseDto info)
+        public async Task<TaskManageOrderResultDto> QuerySingleBusinessPerServiceProject(TrackingQueryMessageInfo info)
         {
-            return new TaskManageOrderResultDto();
-        }
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            string batchNo = IDGen.NextID().ToString();
 
+            _logger.LogInformation("批次={no} 单票单服务项目查询 msg={msg}", batchNo, JSON.Serialize(info));
 
+            try
+            {
+                
+
+                var runList = _serviceWorkFlowRunInfoRepository.AsQueryable().Filter(null, true)
+                    .LeftJoin<ServiceWorkFlowRunActivitiesInfo>((m, s) => m.PK_ID == s.RUN_ID)
+                    .LeftJoin<ServiceWorkFlowProjectRelation>((m, s, rela) =>
+                        m.SERVICE_WF_ID == rela.SERVICE_WORKFLOW_ID && m.RELEASE_VERSION == rela.WF_VERSION)
+                    .LeftJoin<ServiceProjectBaseInfo>((m, s, rela, p) =>
+                        rela.SERVICE_PROJECT_ID == p.PK_ID)
+                    .Where((m, s, rela, p)
+                        => m.BUSI_SYSTEM_CODE == info.Main.BusiSystemCode && m.BUSI_ID == info.Main.BusiId &&
+                        info.Main.ServiceProjectCodeList.Contains(p.SERVICE_PROJECT_CODE))
+                    .Select((m, s) => new { Run = m, Sub = s }).ToList();
+
+
+                var resultList = runList.GroupBy(a=>a.Run.PK_ID)
+                    .Select(a => {
+                        var currList = a.ToList();
+
+                        var runInfo = currList.FirstOrDefault().Run;
+
+                        var showModel = new ServiceWorkFlowRunDto();
+
+                        showModel.PKId = runInfo.PK_ID;
+                        showModel.ServiceProjectCode = runInfo.SERVICE_PROJECT_CODE;
+                        showModel.ServiceProjectName = runInfo.SERVICE_PROJECT_NAME;
+
+                        showModel.ActivitiesList = currList.Where(t => t.Sub.IS_SUB == 0)
+                            .Select(t =>
+                            {
+                                var runModel = new ServiceWorkFlowActivitiesRunDto
+                                {
+                                    PKId = t.Sub.PK_ID,
+                                    ActDate = t.Sub.ACT_DATE,
+                                    ActId = t.Sub.ACT_ID,
+                                    ExecSortNo = t.Sub.EXEC_SORT_NO,
+                                    ActVal = t.Sub.ACT_VAL,
+                                    IsStart = t.Sub.IS_START,
+                                    IsEnd = t.Sub.IS_END,
+                                    IsYield = t.Sub.IS_YIELD,
+                                    RunId = t.Sub.RUN_ID,
+                                    ShowName = t.Sub.SHOW_NAME,
+                                    SourceType = t.Sub.SOURCE_TYPE,
+                                    StatusSKUCode = t.Sub.STATUS_SKU_CODE,
+                                    StatusSKUId = t.Sub.STATUS_SKU_ID
+                                };
+
+                                return runModel;
+                            }).ToList();
+
+                        var subList =
+                            currList.Where(t => t.Sub.IS_SUB == 1)
+                            .Select(t => t.Sub).ToList();
+
+                        showModel.ActivitiesList = showModel.ActivitiesList.GroupJoin(subList, 
+                            l => l.PKId, r => r.PARENT_ID,
+                            (l, r) =>
+                        {
+                            var currList = r.ToList();
+
+                            if (currList.Count > 0)
+                            {
+                                l.SubList = currList.Select(x => {
+
+                                    var subModel = new ServiceWorkFlowActivitiesRunSubDto
+                                    {
+                                        PKId = x.PK_ID,
+                                        ActDate = x.ACT_DATE,
+                                        ActId = x.ACT_ID,
+                                        ExecSortNo = x.EXEC_SORT_NO,
+                                        ActVal = x.ACT_VAL,
+                                        IsStart = x.IS_START,
+                                        IsEnd = x.IS_END,
+                                        IsYield = x.IS_YIELD,
+                                        RunId = x.RUN_ID,
+                                        ShowName = x.SHOW_NAME,
+                                        SourceType = x.SOURCE_TYPE,
+                                        StatusSKUCode = x.STATUS_SKU_CODE,
+                                        StatusSKUId = x.STATUS_SKU_ID
+                                    };
+
+                                    return subModel;
+                                }).OrderBy(x=>x.ExecSortNo).ToList();
+                            }
+
+                            return l;
+                        }).OrderBy(t => t.ExecSortNo).ToList();
+
+                        return showModel;
+                    }).ToList();
+
+                result.succ = true;
+                result.ext = resultList;
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"单票单服务项目查询失败，原因：{ex.Message}";
+            }
+
+            return result;
+        }
+        #endregion
+
+        #region 单票所有相关服务项目查询
         /// <summary>
-        /// 查询单票所有相关服务项目查询
+        /// 单票所有相关服务项目查询
         /// </summary>
-        /// <param name="info">服务流程详情</param>
+        /// <param name="info">查询服务流程详情</param>
         /// <returns>返回回执</returns>
         [HttpPost("/ServiceWorkFlowManage/QuerySingleBusinessAll")]
-        public async Task<TaskManageOrderResultDto> QuerySingleBusinessAll(ServiceWorkFlowBaseDto info)
+        public async Task<TaskManageOrderResultDto> QuerySingleBusinessAll(TrackingQueryMessageInfo info)
         {
-            return new TaskManageOrderResultDto();
+            TaskManageOrderResultDto result = new TaskManageOrderResultDto();
+
+            string batchNo = IDGen.NextID().ToString();
+
+            _logger.LogInformation("批次={no} 单票所有相关服务项目查询 msg={msg}", batchNo, JSON.Serialize(info));
+
+            try
+            {
+                var runList = _serviceWorkFlowRunInfoRepository.AsQueryable().Filter(null, true)
+                    .LeftJoin<ServiceWorkFlowRunActivitiesInfo>((m, s) => m.PK_ID == s.RUN_ID)
+                    .Where((m, s)
+                        => m.BUSI_SYSTEM_CODE == info.Main.BusiSystemCode && m.BUSI_ID == info.Main.BusiId)
+                    .Select((m, s) => new { Run = m, Sub = s }).ToList();
+
+
+                var resultList = runList.GroupBy(a => a.Run.PK_ID)
+                    .Select(a => {
+                        var currList = a.ToList();
+
+                        var runInfo = currList.FirstOrDefault().Run;
+
+                        var showModel = new ServiceWorkFlowRunDto();
+
+                        showModel.PKId = runInfo.PK_ID;
+                        showModel.ServiceProjectCode = runInfo.SERVICE_PROJECT_CODE;
+                        showModel.ServiceProjectName = runInfo.SERVICE_PROJECT_NAME;
+
+                        showModel.ActivitiesList = currList.Where(t => t.Sub.IS_SUB == 0)
+                            .Select(t =>
+                            {
+                                var runModel = new ServiceWorkFlowActivitiesRunDto
+                                {
+                                    PKId = t.Sub.PK_ID,
+                                    ActDate = t.Sub.ACT_DATE,
+                                    ActId = t.Sub.ACT_ID,
+                                    ExecSortNo = t.Sub.EXEC_SORT_NO,
+                                    ActVal = t.Sub.ACT_VAL,
+                                    IsStart = t.Sub.IS_START,
+                                    IsEnd = t.Sub.IS_END,
+                                    IsYield = t.Sub.IS_YIELD,
+                                    RunId = t.Sub.RUN_ID,
+                                    ShowName = t.Sub.SHOW_NAME,
+                                    SourceType = t.Sub.SOURCE_TYPE,
+                                    StatusSKUCode = t.Sub.STATUS_SKU_CODE,
+                                    StatusSKUId = t.Sub.STATUS_SKU_ID
+                                };
+
+                                return runModel;
+                            }).ToList();
+
+                        var subList =
+                            currList.Where(t => t.Sub.IS_SUB == 1)
+                            .Select(t => t.Sub).ToList();
+
+                        showModel.ActivitiesList = showModel.ActivitiesList.GroupJoin(subList,
+                            l => l.PKId, r => r.PARENT_ID,
+                            (l, r) =>
+                            {
+                                var currList = r.ToList();
+
+                                if (currList.Count > 0)
+                                {
+                                    l.SubList = currList.Select(x => {
+
+                                        var subModel = new ServiceWorkFlowActivitiesRunSubDto
+                                        {
+                                            PKId = x.PK_ID,
+                                            ActDate = x.ACT_DATE,
+                                            ActId = x.ACT_ID,
+                                            ExecSortNo = x.EXEC_SORT_NO,
+                                            ActVal = x.ACT_VAL,
+                                            IsStart = x.IS_START,
+                                            IsEnd = x.IS_END,
+                                            IsYield = x.IS_YIELD,
+                                            RunId = x.RUN_ID,
+                                            ShowName = x.SHOW_NAME,
+                                            SourceType = x.SOURCE_TYPE,
+                                            StatusSKUCode = x.STATUS_SKU_CODE,
+                                            StatusSKUId = x.STATUS_SKU_ID
+                                        };
+
+                                        return subModel;
+                                    }).OrderBy(x => x.ExecSortNo).ToList();
+                                }
+
+                                return l;
+                            }).OrderBy(t => t.ExecSortNo).ToList();
+
+                        return showModel;
+                    }).ToList();
+
+                result.succ = true;
+                result.ext = resultList;
+            }
+            catch (Exception ex)
+            {
+                result.succ = false;
+                result.msg = $"单票所有相关服务项目查询失败，原因：{ex.Message}";
+            }
+
+            return result;
         }
+        #endregion
 
         #region 查询订舱表查询用户和租户信息
         /// <summary>