工艺路线 里带 工序

DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs

@@ -34,7 +34,7 @@ namespace DOAN.Admin.WebApi.Controllers
         [ActionPermissionFilter(Permission = "baseManagement:baseworkprocesses:list")]
         public IActionResult QueryBaseWorkProcesses([FromQuery] BaseWorkProcessesQueryDto parm)
         {
-            var response = _BaseWorkProcessesService.GetList(parm);
+            var response = _BaseWorkProcessesService.GetList(parm); 
             return SUCCESS(response);
         }
 

DOAN.Model/MES/base/BaseWorkRoute.cs

@@ -1,3 +1,5 @@
+using DOAN.Model.MES.base_.Dto;
+
 namespace DOAN.Model.MES.base_
 {
     /// <summary>
@@ -22,6 +24,9 @@ namespace DOAN.Model.MES.base_
         /// </summary>
         public string Code { get; set; }
 
+        [SugarColumn(IsIgnore =true)]
+        public List<BaseWorkProcessesDto3> BaseWorkProcessesList { get; set; }
+
         /// <summary>
         /// 工艺流程图原始json数据，用来进行复现
         /// </summary>

DOAN.Model/MES/base/Dto/BaseWorkProcessesDto.cs

@@ -70,5 +70,32 @@ namespace DOAN.Model.MES.base_.Dto
 
 
 
+    }
+
+    public class BaseWorkProcessesDto3
+    {
+        public int? Id { get; set; }
+
+        public string DictWorkType { get; set; }
+
+        public string Name { get; set; }
+
+        public int fk_id { get; set; }
+
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
     }
 }

DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs

@@ -40,4 +40,32 @@ namespace DOAN.Model.MES.base_.Dto
 
         public DateTime? UpdatedTime { get; set; }
     }
+
+    /// <summary>
+    /// 工艺路线输入输出对象  带工序的
+    /// </summary>
+    public class BaseWorkRouteDto_bind_process
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        public int Id { get; set; }
+
+        public  List<BaseWorkProcessesDto3> BaseWorkProcessesList { get; set; }
+        public string Name { get; set; }
+
+        public string Code { get; set; }
+
+        public string LogicFlowData { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+    }
 }

DOAN.Service/MES/base/BaseWorkRouteService.cs

@@ -22,8 +22,16 @@ namespace DOAN.Service.Business
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<BaseWorkRouteDto> GetList(BaseWorkRouteQueryDto parm)
+        public PagedInfo<BaseWorkRouteDto_bind_process> GetList(BaseWorkRouteQueryDto parm)
         {
+            List<BaseWorkProcessesDto3> baseWorks = Context.Queryable<BaseRelWorkRouteProcesses>()
+                  .LeftJoin<BaseWorkProcesses>((r, p) => r.FkWorkProcesses == p.Id)
+                  .Where((r, p) => r.FkWorkRoute != null)
+                  .Select((r, p) => new BaseWorkProcessesDto3()
+                  {
+                      fk_id = r.FkWorkRoute
+                  },true)
+                  .ToList();
             var predicate = Expressionable
                 .Create<BaseWorkRoute>()
                 .AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
@@ -31,7 +39,14 @@ namespace DOAN.Service.Business
                 .AndIF(parm.Status > -1, it => it.Status == parm.Status);
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .ToPage<BaseWorkRoute, BaseWorkRouteDto>(parm);
+                .ToPage<BaseWorkRoute, BaseWorkRouteDto_bind_process>(parm);
+            if(response != null && response.Result.Count > 0)
+            {
+                foreach (var item in response.Result) { 
+                    item.BaseWorkProcessesList= baseWorks.Where(it => it.fk_id == item.Id).ToList();
+                }
+             
+            }
 
             return response;
         }

DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs

@@ -11,11 +11,9 @@ namespace DOAN.Service.Business.IBusinessService
     /// </summary>
     public interface IBaseWorkRouteService : IBaseService<BaseWorkRoute>
     {
-        PagedInfo<BaseWorkRouteDto> GetList(BaseWorkRouteQueryDto parm);
-
-     
-
+        PagedInfo<BaseWorkRouteDto_bind_process> GetList(BaseWorkRouteQueryDto parm);
 
+    
         BaseWorkRoute GetInfo(int Id);
 
         BaseWorkRoute AddBaseWorkRoute(BaseWorkRoute parm);