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 根据工艺路线查询工序 + /// + /// + /// + /// 工艺路线id + /// + [HttpGet("get_process_by_route")] + public IActionResult GetProcessByRoute(int route_id) + { + var response = _ProReportworkService.GetProcessByRoute(route_id); + + return SUCCESS(response); + } + /// /// 查询报工列表 /// @@ -53,7 +75,7 @@ namespace DOAN.Admin.WebApi.Controllers public IActionResult GetProReportwork(string Id) { var response = _ProReportworkService.GetInfo(Id); - + var info = response.Adapt(); 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(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 /// public interface IProReportworkService : IBaseService { + List GetRoute(); + List GetProcessByRoute(int route_id); PagedInfo 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, IProReportworkService { + List GetRoute() + { + return Context.Queryable().ToList(); + + } + List GetProcessByRoute(int route_id) + { + return Context.Queryable() + .LeftJoin((rel,pro)=>rel.FkWorkProcesses==pro.Id) + .Where((rel,pro)=>rel.FkWorkRoute==route_id) + .Select((rel,pro)=>pro) + .ToList(); + } /// /// 查询报工列表 ///