diff --git a/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs b/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs index 4f535b8..d86a6ac 100644 --- a/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs +++ b/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs @@ -67,6 +67,11 @@ namespace MDM.Model.Process.Dto public class ProcessOperationWorkstationMappingInfoDto : ProcessOperationWorkstationMappingDto { + /// + /// 绑定的plc地址 + /// + public string PlcAddress { get; set; } + /// /// 关联的流程 /// diff --git a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs index f9eaa8e..f194aa4 100644 --- a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs +++ b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs @@ -3,6 +3,7 @@ using DOAN.Model.MES.recipe; using DOAN.Model.MES.recipe.Dto; using Infrastructure.Attribute; using MDM.Model; +using MDM.Model.Plant; using MDM.Model.Process; using MDM.Model.Process.Dto; using MDM.Models.Process; @@ -68,6 +69,9 @@ namespace MDM.Services.Process UpdatedBy = it.UpdatedBy, + //绑定的工位PLC地址 + PlcAddress = SqlFunc.Subqueryable().Where(s => s.FkProductlinebody == it.FkProductlinebodyCode && s.WorkstationCode == it.FkWorkstationCode).Select(s=>s.PlcAddress), + //绑定的流程信息 OperationFlows = SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode).ToList(), @@ -89,7 +93,7 @@ namespace MDM.Services.Process // Remark = param.Remark //}), ////绑定的工序工位采集参数 - ProcessOperationWorkstationCollectParameters = SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode&&s.FkProductlinebodyCode==it.FkProductlinebodyCode&&s.FkWorkstationCode==it.FkWorkstationCode).ToList(), + ProcessOperationWorkstationCollectParameters = SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode && s.FkProductlinebodyCode == it.FkProductlinebodyCode && s.FkWorkstationCode == it.FkWorkstationCode).ToList(), // 绑定的物料参数 ProcessOperationFlowMaterialParamters = SqlFunc.Subqueryable().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode).ToList(),