1
This commit is contained in:
parent
a3344e8cd7
commit
67daad0113
@ -126,7 +126,6 @@ namespace MDM.Controllers.Plant
|
||||
|
||||
|
||||
//获取车间
|
||||
|
||||
[HttpGet("get_workshop")]
|
||||
public IActionResult GetWorkShop(string site_code,string workshop_code)
|
||||
{
|
||||
@ -136,7 +135,6 @@ namespace MDM.Controllers.Plant
|
||||
}
|
||||
|
||||
//获取产线
|
||||
|
||||
[HttpGet("get_productlinebody")]
|
||||
public IActionResult GetProductlinebody(string site_code, string workshop_code,string linecode)
|
||||
{
|
||||
|
||||
@ -122,17 +122,46 @@ namespace MDM.Controllers.Process
|
||||
|
||||
|
||||
//TODO 下拉工序
|
||||
[HttpGet("SelectOperation")]
|
||||
public IActionResult SelectOperation(string routingcode)
|
||||
{
|
||||
var response = _ProcessOperationWorkstationMappingService.SelectOperation(routingcode);
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
|
||||
//TODO 获取工厂
|
||||
/// <summary>
|
||||
/// 获取工厂
|
||||
/// </summary>
|
||||
/// <param name="site_code">工厂code</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("get_factory_site")]
|
||||
public IActionResult GetFactorySite(string site_code)
|
||||
{
|
||||
var response = _ProcessOperationWorkstationMappingService.GetFactorySite(site_code);
|
||||
|
||||
//TODO 下拉工厂
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
|
||||
//TODO 下拉产线
|
||||
//获取车间
|
||||
[HttpGet("get_workshop")]
|
||||
public IActionResult GetWorkShop(string site_code, string workshop_code)
|
||||
{
|
||||
var response = _ProcessOperationWorkstationMappingService.GetWorkShop(site_code, workshop_code);
|
||||
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
//TODO 下拉工站
|
||||
//获取产线
|
||||
[HttpGet("get_productlinebody")]
|
||||
public IActionResult GetProductlinebody(string site_code, string workshop_code, string linecode)
|
||||
{
|
||||
var response = _ProcessOperationWorkstationMappingService.GetPlantProductlinebodies(site_code, workshop_code, linecode);
|
||||
|
||||
return SUCCESS(response);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
|
||||
using DOAN.Model.MES.recipe.Dto;
|
||||
using MDM.Model;
|
||||
using MDM.Model.Plant;
|
||||
using MDM.Model.Process;
|
||||
using MDM.Model.Process.Dto;
|
||||
using MDM.Service;
|
||||
@ -19,6 +20,18 @@ namespace MDM.Services.IProcessService
|
||||
ProcessOperationWorkstationMapping AddProcessOperationWorkstationMapping(ProcessOperationWorkstationMapping parm);
|
||||
|
||||
List<ProcessRouting> SelectRouting(string routing);
|
||||
|
||||
|
||||
List<ProcessOperation> SelectOperation(string routingcode);
|
||||
|
||||
|
||||
|
||||
List<PlantFactorySite> GetFactorySite(string site_code);
|
||||
|
||||
List<PlantWorkshop> GetWorkShop(string site_code, string workshop_code);
|
||||
|
||||
List<PlantProductlinebody> GetPlantProductlinebodies(string site_code, string workshop_code, string linecode);
|
||||
|
||||
int UpdateProcessOperationWorkstationMapping(ProcessOperationWorkstationMapping parm);
|
||||
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
using DOAN.Model.MES.recipe;
|
||||
using DOAN.Model.MES.recipe.Dto;
|
||||
using Infrastructure.Attribute;
|
||||
using MathNet.Numerics;
|
||||
using MDM.Model;
|
||||
using MDM.Model.Plant;
|
||||
using MDM.Model.Process;
|
||||
@ -123,6 +124,38 @@ namespace MDM.Services.Process
|
||||
|
||||
}
|
||||
|
||||
public List<ProcessOperation> SelectOperation(string routingcode)
|
||||
{
|
||||
var response = Context.Queryable<ProcessOperation>()
|
||||
.WhereIF(!string.IsNullOrEmpty(routingcode), it => it.FkRoutingCode.Contains(routingcode))
|
||||
.ToList();
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
public List<PlantFactorySite> GetFactorySite(string site_code)
|
||||
{
|
||||
return Context.Queryable<PlantFactorySite>().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList();
|
||||
}
|
||||
|
||||
public List<PlantWorkshop> GetWorkShop(string site_code, string workshop_code)
|
||||
{
|
||||
return Context.Queryable<PlantWorkshop>()
|
||||
.WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkSiteCode.Contains(site_code))
|
||||
.WhereIF(!string.IsNullOrEmpty(workshop_code), it => it.WorkshopCode.Contains(workshop_code))
|
||||
.ToList();
|
||||
}
|
||||
public List<PlantProductlinebody> GetPlantProductlinebodies(string site_code, string workshop_code, string linecode)
|
||||
{
|
||||
return Context.Queryable<PlantProductlinebody>()
|
||||
.WhereIF(!string.IsNullOrEmpty(site_code), it => it.FkFactorySiteCode.Contains(site_code))
|
||||
.WhereIF(!string.IsNullOrEmpty(workshop_code), it => it.FkWorkshopCode.Contains(workshop_code))
|
||||
.WhereIF(!string.IsNullOrEmpty(linecode), it => it.LineCode.Contains(linecode))
|
||||
|
||||
|
||||
|
||||
.ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user