diff --git a/DOAN.Service/MES/andon/AndonInteractionService.cs b/DOAN.Service/MES/andon/AndonInteractionService.cs index 9bc5a5e..4d96425 100644 --- a/DOAN.Service/MES/andon/AndonInteractionService.cs +++ b/DOAN.Service/MES/andon/AndonInteractionService.cs @@ -58,6 +58,7 @@ namespace DOAN.Service.MES.andon { //发送报警信息 string message = $"产线:{record.LineCode},\n故障类型:{record.FaultDict},\n故障内容:{record.FaultContext},\n报警人:{record.AskPerson}"; + //发送手表 Watchup.StartPush(message, _socketGateway); record.Id = SnowFlakeSingle.Instance.NextId().ToString(); diff --git a/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs b/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs index 77e9d0a..47f4653 100644 --- a/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs +++ b/MDM/Models/Process/Dto/ProcessOperationWorkstationMappingDto.cs @@ -14,6 +14,7 @@ namespace MDM.Model.Process.Dto public string? FkOperationCode { get; set; } public string? FkWorkstationCode { get; set; } + public string FkProductlinebodyCode { get; set; } } /// diff --git a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs index eb3c3c1..77b533a 100644 --- a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs +++ b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs @@ -25,6 +25,9 @@ namespace MDM.Services.Process .AndIF(!string.IsNullOrEmpty(parm.FkRoutingCode), m => m.FkRoutingCode.Contains(parm.FkRoutingCode)) .AndIF(!string.IsNullOrEmpty(parm.FkOperationCode), m => m.FkOperationCode.Contains(parm.FkOperationCode)) .AndIF(!string.IsNullOrEmpty(parm.FkWorkstationCode), m => m.FkWorkstationCode.Contains(parm.FkWorkstationCode)) + .AndIF(!string.IsNullOrEmpty(parm.FkProductlinebodyCode), m => m.FkProductlinebodyCode.Contains(parm.FkProductlinebodyCode)) + + ; var response = Queryable()