From 1420ab0fa1b9b0ec7567803bfa96597001041028 Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Thu, 28 May 2026 11:33:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B0=94=E8=B7=AF=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E4=BF=9D=E5=AD=98=20=E4=BF=AE=E6=94=B9=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SicRT/Properties/AssemblyInfo.cs      |   2 +-
 SicUI/Models/PMs/PMOperationView.xaml | 180 ++++++++++++++------------
 SicUI/Properties/AssemblyInfo.cs      |   2 +-
 3 files changed, 102 insertions(+), 82 deletions(-)

diff --git a/SicRT/Properties/AssemblyInfo.cs b/SicRT/Properties/AssemblyInfo.cs
index 55505b9..d323e7e 100644
--- a/SicRT/Properties/AssemblyInfo.cs
+++ b/SicRT/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@ using System.Windows;
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 
-[assembly: AssemblyVersion("1.1.1.60324")]
+[assembly: AssemblyVersion("1.1.1.60528")]
 [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]
 
 
diff --git a/SicUI/Models/PMs/PMOperationView.xaml b/SicUI/Models/PMs/PMOperationView.xaml
index 35982c9..246255d 100644
--- a/SicUI/Models/PMs/PMOperationView.xaml
+++ b/SicUI/Models/PMs/PMOperationView.xaml
@@ -1647,7 +1647,7 @@
                         Canvas.Top="279"
                         Content="V58s" />
                     <Label
-                        Canvas.Left="1419"
+                        Canvas.Left="1407"
                         Canvas.Top="51"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -1661,36 +1661,36 @@
                         Visibility="{Binding VisbleOnlyIdle}" />
 
                     <Label
-                        Canvas.Left="1579"
+                        Canvas.Left="1569"
                         Canvas.Top="62"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V96 HW"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1579"
+                        Canvas.Left="1569"
                         Canvas.Top="102"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V95 ST"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1578"
+                        Canvas.Left="1568"
                         Canvas.Top="138"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V94 RO"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1578"
+                        Canvas.Left="1568"
                         Canvas.Top="173"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V93 CH"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1578"
-                        Canvas.Top="268"
+                        Canvas.Left="1549"
+                        Canvas.Top="315"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="V92 RP"
@@ -3551,7 +3551,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="1113"
                         Canvas.Top="79"
-                        Width="113"
+                        Width="310"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3563,9 +3563,9 @@
                         RightDirection="None" />
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1181"
+                        Canvas.Left="1192"
                         Canvas.Top="132"
-                        Width="237"
+                        Width="215"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3645,7 +3645,7 @@
                         RightDirection="None" />
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1449"
+                        Canvas.Left="1439"
                         Canvas.Top="83"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -3658,7 +3658,7 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1449"
+                        Canvas.Left="1439"
                         Canvas.Top="121"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -3671,7 +3671,7 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1449"
+                        Canvas.Left="1439"
                         Canvas.Top="158"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -3684,7 +3684,7 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1449"
+                        Canvas.Left="1439"
                         Canvas.Top="196"
                         Width="186"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -3697,9 +3697,9 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1449"
-                        Canvas.Top="288"
-                        Width="167"
+                        Canvas.Left="1421"
+                        Canvas.Top="234"
+                        Width="125"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -3710,9 +3710,22 @@
                         MoveSpeed="0"
                         RightDirection="None" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1538"
-                        Canvas.Top="319"
-                        Width="78"
+                        Canvas.Left="1421"
+                        Canvas.Top="272"
+                        Width="125"
+                        Height="{StaticResource ResourceKey=Pipe_Height}"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
+                        CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
+                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        FlowDirection="RightToLeft"
+                        LeftDirection="None"
+                        MoveSpeed="0"
+                        RightDirection="None" />
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="1421"
+                        Canvas.Top="310"
+                        Width="125"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -4216,9 +4229,9 @@
 
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1366.31" Canvas.Top="158" Height="178.99" PipeType="Vertical" Width="19.994" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1451"
+                        Canvas.Left="1439"
                         Canvas.Top="43"
-                        Width="232"
+                        Width="155"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -4239,8 +4252,28 @@
                     </industrialcontrol:PipeLine>
                     <industrialcontrol:PipeLine
                         Canvas.Left="1408"
-                        Canvas.Top="92"
-                        Width="263"
+                        Canvas.Top="132"
+                        Width="223"
+                        Height="{StaticResource ResourceKey=Pipe_Height}"
+                        CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
+                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
+                        FlowDirection="RightToLeft"
+                        LeftDirection="None"
+                        MoveSpeed="0"
+                        RightDirection="None" HorizontalAlignment="Left" VerticalAlignment="Center">
+                        <industrialcontrol:PipeLine.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform />
+                                <SkewTransform />
+                                <RotateTransform Angle="90" />
+                                <TranslateTransform />
+                            </TransformGroup>
+                        </industrialcontrol:PipeLine.RenderTransform>
+                    </industrialcontrol:PipeLine>
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="1423"
+                        Canvas.Top="79"
+                        Width="233"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
                         EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
@@ -4284,9 +4317,9 @@
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1514" Canvas.Top="158" Height="276" PipeType="Vertical" Width="19.994" />-->
                     <!--<control:PipeControl GasColor="White" Canvas.Left="1540" Canvas.Top="159" Height="304" PipeType="Vertical" Width="19.994" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1635"
-                        Canvas.Top="132"
-                        Width="255"
+                        Canvas.Left="1625"
+                        Canvas.Top="83"
+                        Width="304"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -4307,32 +4340,9 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1616"
-                        Canvas.Top="290"
-                        Width="31"
-                        Height="{StaticResource ResourceKey=Pipe_Height}"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        CenterColor="{StaticResource ResourceKey=CenterColorPurple}"
-                        EdgeColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        FlowDirection="RightToLeft"
-                        LeftDirection="None"
-                        MoveSpeed="0"
-                        RightDirection="None">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform />
-                                <SkewTransform />
-                                <RotateTransform Angle="90" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>
-
-                    <industrialcontrol:PipeLine
-                        Canvas.Left="1540"
-                        Canvas.Top="320"
-                        Width="35"
+                        Canvas.Left="1546"
+                        Canvas.Top="234"
+                        Width="120"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -4356,7 +4366,7 @@
                     <!--<control:PipeControl GasColor="White"  Canvas.Left="1459" Canvas.Top="424" Height="19.994" PipeType="Horizontal" Width="65" />-->
                     <!--<control:PipeControl GasColor="White"  Canvas.Left="1460" Canvas.Top="453" Height="19.994" PipeType="Horizontal" Width="90" />-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="1578"
+                        Canvas.Left="1568"
                         Canvas.Top="385"
                         Width="55"
                         Height="{StaticResource ResourceKey=Pipe_Height}"
@@ -5026,7 +5036,7 @@
 
 
                     <controlRT:ValveBig
-                        Canvas.Left="1444"
+                        Canvas.Left="1432"
                         Canvas.Top="50"
                         Width="16"
                         Height="15"
@@ -5636,7 +5646,7 @@
                         ValveName="{Binding V91.DisplayName}" />
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="217"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5646,7 +5656,7 @@
                         OperationName="SetMfcFlowValue" />
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="255"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5656,7 +5666,7 @@
                         OperationName="SetMfcFlowValue" />
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="293"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5667,7 +5677,7 @@
 
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="179"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5677,7 +5687,7 @@
                         OperationName="SetMfcFlowValue" />
 
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="141"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5686,7 +5696,7 @@
                         DeviceData="{Binding Mfc36Data}"
                         OperationName="SetMfcFlowValue" />
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="103"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5695,7 +5705,7 @@
                         DeviceData="{Binding Mfc37Data}"
                         OperationName="SetMfcFlowValue" />
                     <controlRT:AnalogControl2
-                        Canvas.Left="1465"
+                        Canvas.Left="1449"
                         Canvas.Top="66"
                         Width="62"
                         HorizontalAlignment="Left"
@@ -5704,7 +5714,7 @@
                         DeviceData="{Binding Mfc38Data}"
                         OperationName="SetMfcFlowValue" />
                     <controlRT:ValveBig
-                        Canvas.Left="1565"
+                        Canvas.Left="1555"
                         Canvas.Top="75"
                         Width="16"
                         Height="15"
@@ -5717,7 +5727,7 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V96.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1565"
+                        Canvas.Left="1555"
                         Canvas.Top="113"
                         Width="16"
                         Height="15"
@@ -5730,7 +5740,7 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V95.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1565"
+                        Canvas.Left="1555"
                         Canvas.Top="150"
                         Width="16"
                         Height="15"
@@ -5743,7 +5753,7 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V94.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1565"
+                        Canvas.Left="1555"
                         Canvas.Top="188"
                         Width="16"
                         Height="15"
@@ -5756,17 +5766,17 @@
                         ValveDirection="ToRight"
                         ValveName="{Binding V93.DisplayName}" />
                     <controlRT:ValveBig
-                        Canvas.Left="1565"
-                        Canvas.Top="280"
+                        Canvas.Left="1539"
+                        Canvas.Top="321"
                         Width="16"
                         Height="15"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         Command="{Binding CmdTurnGasValve}"
                         HideBlinding="True"
                         OnOff="{Binding V92.Feedback}"
                         Tag="V92"
-                        ValveDirection="ToRight"
+                        ValveDirection="ToBottom"
                         ValveName="{Binding V92.DisplayName}" />
 
                     <Canvas>
@@ -6766,41 +6776,51 @@
                         RenderTransformOrigin="5.071,0.609" />
 
                     <Label
-                        Canvas.Left="1520"
+                        Canvas.Left="1504"
                         Canvas.Top="98"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M38"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1520"
+                        Canvas.Left="1504"
                         Canvas.Top="138"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M37"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1520"
+                        Canvas.Left="1504"
                         Canvas.Top="61"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M36"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1520"
+                        Canvas.Left="1504"
                         Canvas.Top="173"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         Content="M35"
                         RenderTransformOrigin="5.071,0.609" />
                     <Label
-                        Canvas.Left="1519"
-                        Canvas.Top="269"
+                        Canvas.Left="1504"
+                        Canvas.Top="216"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Content="M32"
-                        RenderTransformOrigin="5.071,0.609" />
-
+                        Content="M32"/>
+                    <Label
+                        Canvas.Left="1504"
+                        Canvas.Top="254"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="M32"/>
+                    <Label
+                        Canvas.Left="1505"
+                        Canvas.Top="292"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        Content="M32"/>
                     <Label
                         Canvas.Left="1258"
                         Canvas.Top="345"
diff --git a/SicUI/Properties/AssemblyInfo.cs b/SicUI/Properties/AssemblyInfo.cs
index d5c175d..7f87705 100644
--- a/SicUI/Properties/AssemblyInfo.cs
+++ b/SicUI/Properties/AssemblyInfo.cs
@@ -55,6 +55,6 @@ using System.Windows;
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("1.1.1.60324")]
+[assembly: AssemblyVersion("1.1.1.60528")]
 [assembly: AssemblyInformationalVersion("氮化硅12寸（无EFEM）")]