Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

报工查询调整

Browse Source
This commit is contained in:
qianhao.xu
2024-12-21 16:39:26 +08:00
parent ddde4eb9d7
commit 37146621c1
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
DOAN.Admin.WebApi/Controllers/MES/Product/ProReportworkController.cs
View File

@@ -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));
}
}
}

3
DOAN.Service/MES/Product/IService/IProReportworkService.cs
View File

@@ -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);

13
DOAN.Service/MES/Product/ProReportworkService.cs
View File

@@ -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>