From 37146621c1a9009599f7f25f71a1be4e110f82fa Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sat, 21 Dec 2024 16:39:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=9F=A5=E8=AF=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MES/Product/ProReportworkController.cs    | 28 +++++++++++++++++--
 .../Product/IService/IProReportworkService.cs |  3 ++
 .../MES/Product/ProReportworkService.cs       | 13 +++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
index 4220c92..e0e3e61 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
@@ -27,6 +27,28 @@ namespace DOAN.Admin.WebApi.Controllers
             _ProReportworkService = ProReportworkService;
         }
 
+        //TODO 查询工艺路线
+        [HttpGet("get_route")]
+        public IActionResult GetRoute()
+        {
+            var response = _ProReportworkService.GetRoute();
+
+            return SUCCESS(response);
+        }
+        //TODO  根据工艺路线查询工序
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="route_id">工艺路线id</param>
+        /// <returns></returns>
+        [HttpGet("get_process_by_route")]
+        public IActionResult GetProcessByRoute(int route_id)
+        {
+            var response = _ProReportworkService.GetProcessByRoute(route_id);
+
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 查询报工列表
         /// </summary>
@@ -53,7 +75,7 @@ namespace DOAN.Admin.WebApi.Controllers
         public IActionResult GetProReportwork(string Id)
         {
             var response = _ProReportworkService.GetInfo(Id);
-            
+
             var info = response.Adapt<ProReportworkDto>();
             return SUCCESS(info);
         }
@@ -96,14 +118,14 @@ namespace DOAN.Admin.WebApi.Controllers
         [HttpPost("delete/{ids}")]
         [ActionPermissionFilter(Permission = "proreportwork:delete")]
         [Log(Title = "报工", BusinessType = BusinessType.DELETE)]
-        public IActionResult DeleteProReportwork([FromRoute]string ids)
+        public IActionResult DeleteProReportwork([FromRoute] string ids)
         {
             var idArr = Tools.SplitAndConvert<string>(ids);
 
             return ToResponse(_ProReportworkService.Delete(idArr));
         }
 
-        
+
 
     }
 }
\ No newline at end of file
diff --git a/DOAN.Service/MES/Product/IService/IProReportworkService.cs b/DOAN.Service/MES/Product/IService/IProReportworkService.cs
index 74cd1a1..545270c 100644
--- a/DOAN.Service/MES/Product/IService/IProReportworkService.cs
+++ b/DOAN.Service/MES/Product/IService/IProReportworkService.cs
@@ -1,6 +1,7 @@
 using DOAN.Model.BZFM.Dto;
 using DOAN.Model.BZFM;
 using DOAN.Model.MES.product;
+using DOAN.Model.MES.base_;
 
 namespace DOAN.Service.MES.product.IService
 {
@@ -9,6 +10,8 @@ namespace DOAN.Service.MES.product.IService
     /// </summary>
     public interface IProReportworkService : IBaseService<ProReportwork01>
     {
+        List<BaseWorkRoute> GetRoute();
+        List<BaseWorkProcesses>  GetProcessByRoute(int route_id);
         PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm);
 
         ProReportwork01 GetInfo(string Id);
diff --git a/DOAN.Service/MES/Product/ProReportworkService.cs b/DOAN.Service/MES/Product/ProReportworkService.cs
index 60d10fa..ecff780 100644
--- a/DOAN.Service/MES/Product/ProReportworkService.cs
+++ b/DOAN.Service/MES/Product/ProReportworkService.cs
@@ -15,6 +15,19 @@ namespace DOAN.Service.MES.product;
 [AppService(ServiceType = typeof(IProReportworkService), ServiceLifetime = LifeTime.Transient)]
 public class ProReportworkService : BaseService<ProReportwork01>, IProReportworkService
 {
+    List<BaseWorkRoute> GetRoute()
+    {
+        return Context.Queryable<BaseWorkRoute>().ToList();
+    
+    }
+    List<BaseWorkProcesses> GetProcessByRoute(int route_id)
+    {
+       return  Context.Queryable<BaseRelWorkRouteProcesses>()
+            .LeftJoin<BaseWorkProcesses>((rel,pro)=>rel.FkWorkProcesses==pro.Id)
+            .Where((rel,pro)=>rel.FkWorkRoute==route_id)
+            .Select((rel,pro)=>pro)
+            .ToList();
+    }
     /// <summary>
     ///     查询报工列表
     /// </summary>