diff --git a/MDM/Controllers/Plant/PlantWorkstationController.cs b/MDM/Controllers/Plant/PlantWorkstationController.cs index 58c8fe3..ec01ba1 100644 --- a/MDM/Controllers/Plant/PlantWorkstationController.cs +++ b/MDM/Controllers/Plant/PlantWorkstationController.cs @@ -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) { diff --git a/MDM/Controllers/Process/ProcessOperationWorkstationMappingController.cs b/MDM/Controllers/Process/ProcessOperationWorkstationMappingController.cs index 0286a3d..bb8f2c6 100644 --- a/MDM/Controllers/Process/ProcessOperationWorkstationMappingController.cs +++ b/MDM/Controllers/Process/ProcessOperationWorkstationMappingController.cs @@ -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 获取工厂 + /// + /// 获取工厂 + /// + /// 工厂code + /// + [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); + } diff --git a/MDM/Services/Process/IService/IProcessOperationWorkstationMappingService.cs b/MDM/Services/Process/IService/IProcessOperationWorkstationMappingService.cs index 3304792..e2ee6aa 100644 --- a/MDM/Services/Process/IService/IProcessOperationWorkstationMappingService.cs +++ b/MDM/Services/Process/IService/IProcessOperationWorkstationMappingService.cs @@ -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 SelectRouting(string routing); + + + List SelectOperation(string routingcode); + + + + List GetFactorySite(string site_code); + + List GetWorkShop(string site_code, string workshop_code); + + List GetPlantProductlinebodies(string site_code, string workshop_code, string linecode); + int UpdateProcessOperationWorkstationMapping(ProcessOperationWorkstationMapping parm); diff --git a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs index 0aa14d9..cd08755 100644 --- a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs +++ b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs @@ -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 SelectOperation(string routingcode) + { + var response = Context.Queryable() + .WhereIF(!string.IsNullOrEmpty(routingcode), it => it.FkRoutingCode.Contains(routingcode)) + .ToList(); + return response; + } + + + public List GetFactorySite(string site_code) + { + return Context.Queryable().WhereIF(!string.IsNullOrEmpty(site_code), it => it.SiteCode.Contains(site_code)).ToList(); + } + + public List GetWorkShop(string site_code, string workshop_code) + { + return Context.Queryable() + .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 GetPlantProductlinebodies(string site_code, string workshop_code, string linecode) + { + return Context.Queryable() + .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(); + } /// /// 修改