增加另外存储输入图片2的图片保存

TeamAAS-VM/Core/Management.cs

@@ -2710,7 +2710,6 @@ namespace TeamAAS_VP.Core
 
                                     Int16 resultIndex = plc.ReadNode<Int16>(string.Format(addressConfig.In_Result.Address, i));
                                     SendTaskMessage($"读取plc结果{resultIndex}", MessageLevel.Debug);
-                                    ShowMes_Result = resultIndex == 1 ? true : false;            
 
                                     //目前只记录当前站
                                     if (i == 0)
@@ -2796,6 +2795,8 @@ namespace TeamAAS_VP.Core
                                         }                                       
                                     }
 
+                                    ShowMes_Result = resultIndex == 1 ? true : false;
+
                                     //StringBuilder submitDataError2 = new StringBuilder();
                                     //foreach (var item in keyData)
                                     //{

TeamAAS-VM/Services/RemoteCommandService.cs

@@ -2035,6 +2035,28 @@ namespace TeamAAS_VP.Services
                         {
                             if (_configService.GetSystemConfiguration().PickPointNum == 0)
                             {
+                                if (procedure.ToolBlock.Inputs.Contains("InputImage2"))
+                                {
+                                    _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
+                                    {
+                                        Id = procedure.DisplayId,
+                                        DisplayName = procedure.DisplayName,
+                                        //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
+                                        Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage2"].Value,
+                                        Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
+                                        Record = record,
+                                        Result = Found,
+                                        IsShow = true,
+                                        IsSaveImage = procedure.IsSaveImage,
+                                        SaveImageModel = procedure.SaveImageModel,
+                                        SaveImagePathModel = procedure.SaveImagePathModel,
+                                        SavePath = procedure.SavePath,
+                                        IsCompress = procedure.IsCompress,
+                                        ProceductName = procedure.Name,
+                                        ImageFileName = imgName+"image2",
+                                        Is3DModel = is3dmodel,
+                                    });
+                                }
                                 _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                                 {
                                     Id = procedure.DisplayId,
@@ -2059,6 +2081,28 @@ namespace TeamAAS_VP.Services
                             }
                             else
                             {
+                                if (procedure.ToolBlock.Inputs.Contains("InputImage2"))
+                                {
+                                    _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
+                                    {
+                                        Id = procedure.DisplayId,
+                                        DisplayName = procedure.DisplayName,
+                                        //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
+                                        Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage2"].Value,
+                                        Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
+                                        Record = record,
+                                        Result = Found,
+                                        IsShow = true,
+                                        IsSaveImage = procedure.IsSaveImage,
+                                        SaveImageModel = procedure.SaveImageModel,
+                                        SaveImagePathModel = procedure.SaveImagePathModel,
+                                        SavePath = procedure.SavePath,
+                                        IsCompress = procedure.IsCompress,
+                                        ProceductName = procedure.Name,
+                                        ImageFileName = imgName + "image2",
+                                        Is3DModel = is3dmodel,
+                                    });
+                                }
                                 _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                                 {
                                     Id = procedure.DisplayId,
@@ -2084,6 +2128,28 @@ namespace TeamAAS_VP.Services
                         }
                         else
                         {
+                            if (procedure.ToolBlock.Inputs.Contains("InputImage2"))
+                            {
+                                _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
+                                {
+                                    Id = procedure.DisplayId,
+                                    DisplayName = procedure.DisplayName,
+                                    //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
+                                    Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage2"].Value,
+                                    Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
+                                    Record = record,
+                                    Result = Found,
+                                    IsShow = true,
+                                    IsSaveImage = procedure.IsSaveImage,
+                                    SaveImageModel = procedure.SaveImageModel,
+                                    SaveImagePathModel = procedure.SaveImagePathModel,
+                                    SavePath = procedure.SavePath,
+                                    IsCompress = procedure.IsCompress,
+                                    ProceductName = procedure.Name,
+                                    ImageFileName = imgName + "image2",
+                                    Is3DModel = is3dmodel,
+                                });
+                            }
                             _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                             {
                                 Id = procedure.DisplayId,
@@ -2132,6 +2198,27 @@ namespace TeamAAS_VP.Services
                         }
                         if (is3dmodel == true)
                         {
+                            if (procedure.ToolBlock.Inputs.Contains("InputImage2"))
+                            {
+                                _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
+                                {
+                                    Id = procedure.DisplayId,
+                                    DisplayName = procedure.DisplayName,
+                                    //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
+                                    Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage2"].Value,
+                                    Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
+                                    Result = false,
+                                    IsShow = true,
+                                    IsSaveImage = procedure.IsSaveImage,
+                                    SaveImageModel = procedure.SaveImageModel,
+                                    SaveImagePathModel = procedure.SaveImagePathModel,
+                                    SavePath = procedure.SavePath,
+                                    IsCompress = procedure.IsCompress,
+                                    ProceductName = procedure.Name,
+                                    ImageFileName = imgName + "image2",
+                                    Is3DModel = is3dmodel,
+                                });
+                            }
                             _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                             {
                                 Id = procedure.DisplayId,
@@ -2154,6 +2241,27 @@ namespace TeamAAS_VP.Services
                         }
                         else
                         {
+                            if (procedure.ToolBlock.Inputs.Contains("InputImage2"))
+                            {
+                                _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
+                                {
+                                    Id = procedure.DisplayId,
+                                    DisplayName = procedure.DisplayName,
+                                    //Image = (ICogImage)procedure.ToolBlock.Outputs["OriImage"].Value,
+                                    Image = (ICogImage)procedure.ToolBlock.Inputs["InputImage2"].Value,
+                                    Graphic = outputCollection["Graphic"].Value as CogGraphicCollection,
+                                    Result = false,
+                                    IsShow = true,
+                                    IsSaveImage = procedure.IsSaveImage,
+                                    SaveImageModel = procedure.SaveImageModel,
+                                    SaveImagePathModel = procedure.SaveImagePathModel,
+                                    SavePath = procedure.SavePath,
+                                    IsCompress = procedure.IsCompress,
+                                    ProceductName = procedure.Name,
+                                    ImageFileName = imgName + "image2",
+                                    Is3DModel = is3dmodel,
+                                });
+                            }
                             _eventAggregator.GetEvent<RenderUpdateNotification>().Publish(new ShowRender()
                             {
                                 Id = procedure.DisplayId,