From 508b4e504af7fa6446b6e57504839714830fd18e Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Thu, 11 Jul 2024 11:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=20?=
 =?UTF-8?q?=E9=87=8C=E5=B8=A6=20=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/base/BaseWorkProcessesController.cs   |  2 +-
 DOAN.Model/MES/base/BaseWorkRoute.cs          |  5 ++++
 .../MES/base/Dto/BaseWorkProcessesDto.cs      | 27 ++++++++++++++++++
 DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs   | 28 +++++++++++++++++++
 DOAN.Service/MES/base/BaseWorkRouteService.cs | 19 +++++++++++--
 .../base/IService/IBaseWorkRouteService.cs    |  6 ++--
 6 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs b/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs
index 16d9d3c..cdb788f 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/base/BaseWorkProcessesController.cs
+++ b/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);
         }
 
diff --git a/DOAN.Model/MES/base/BaseWorkRoute.cs b/DOAN.Model/MES/base/BaseWorkRoute.cs
index 6bde984..328d069 100644
--- a/DOAN.Model/MES/base/BaseWorkRoute.cs
+++ b/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>
diff --git a/DOAN.Model/MES/base/Dto/BaseWorkProcessesDto.cs b/DOAN.Model/MES/base/Dto/BaseWorkProcessesDto.cs
index 6baf0cf..f3390e4 100644
--- a/DOAN.Model/MES/base/Dto/BaseWorkProcessesDto.cs
+++ b/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; }
+
+
+
     }
 }
\ No newline at end of file
diff --git a/DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs b/DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs
index 42631c0..1b4f2c8 100644
--- a/DOAN.Model/MES/base/Dto/BaseWorkRouteDto.cs
+++ b/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; }
+    }
 }
diff --git a/DOAN.Service/MES/base/BaseWorkRouteService.cs b/DOAN.Service/MES/base/BaseWorkRouteService.cs
index e53aa16..bdfa3e0 100644
--- a/DOAN.Service/MES/base/BaseWorkRouteService.cs
+++ b/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;
         }
diff --git a/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs b/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs
index 29dc72f..cb392c6 100644
--- a/DOAN.Service/MES/base/IService/IBaseWorkRouteService.cs
+++ b/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);