1.修复LP3不能create job，ui界面显示错误的bug

2.添加登录界面

Venus/Venus_MainPages/Venus_MainPages.csproj

@@ -178,6 +178,7 @@
     <Compile Include="ViewModels\FAViewModel.cs" />
     <Compile Include="ViewModels\GasLeakCheckViewModel.cs" />
     <Compile Include="ViewModels\IOViewModel.cs" />
+    <Compile Include="ViewModels\LoginViewModel.cs" />
     <Compile Include="ViewModels\MFCVerificationViewModel.cs" />
     <Compile Include="ViewModels\OperationOverViewModel.cs" />
     <Compile Include="ViewModels\OverKepler2200BViewModel.cs" />
@@ -242,6 +243,9 @@
     <Compile Include="Views\IOView.xaml.cs">
       <DependentUpon>IOView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\LoginView.xaml.cs">
+      <DependentUpon>LoginView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MFCVerificationView.xaml.cs">
       <DependentUpon>MFCVerificationView.xaml</DependentUpon>
     </Compile>
@@ -406,6 +410,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\LoginView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MFCVerificationView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

Venus/Venus_MainPages/ViewModels/LoginViewModel.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Venus_MainPages.ViewModels
+{
+    internal class LoginViewModel
+    {
+    }
+}

Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -661,7 +661,7 @@ namespace Venus_MainPages.ViewModels
             List<string> slotSequence = new List<string>();
             info.ModuleData.WaferManager.Wafers.ForEach(key => { slotSequence.Insert(0, key.SequenceName); });
 
-            //string jobId = info.LotId.Trim();
+            string jobId = info.LotId.Trim();
             //if (string.IsNullOrEmpty(jobId))
             //    jobId = "CJ_Local_" + info.ModuleData.ModuleID;
             //info.LotId = jobId;
@@ -766,7 +766,7 @@ namespace Venus_MainPages.ViewModels
                 ControlJobInfo lp3Cj = CommonFunction.GetValue<ControlJobInfo>(RtDataValues, "LP3.CurrentControlJob");
                 if (lp3Cj != null)
                 {
-                    UPdateWaferAssociation(LP2WaferAssociation, lp3Cj);
+                    UPdateWaferAssociation(LP3WaferAssociation, lp3Cj);
                 }
             }
 
@@ -793,16 +793,16 @@ namespace Venus_MainPages.ViewModels
         {
             info.LotId = cjInfo.Name;
             info.JobID = cjInfo.Name;
-            info.JobStatus = cjInfo.State.ToString() ;
+            info.JobStatus = cjInfo.State.ToString();
             if (cjInfo.LotWafers != null)
             {
-                for (int i=0;i< cjInfo.LotWafers.Count;i++)
+                for (int i = 0; i < cjInfo.LotWafers.Count; i++)
                 {
-                    int index = cjInfo.LotWafers[i].Slot;
+                    int index =Math.Abs(24-cjInfo.LotWafers[i].Slot);
                     info.ModuleData.WaferManager.Wafers[index].SequenceName = cjInfo.LotWafers[i].SequenceName;
                 }
             }
-            info.PreCleanRecipeName = cjInfo.PreJobClean;
+            info.PreCleanRecipeName  = cjInfo.PreJobClean;
             info.PostCleanRecipeName = cjInfo.PostJobClean;
         }
         private async void RobotMoveInfoChanged(RobotMoveInfo oldValue, RobotMoveInfo newValue)

Venus/Venus_MainPages/Views/LoginView.xaml

@@ -0,0 +1,51 @@
+<Window x:Class="Venus_MainPages.Views.LoginView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Venus_MainPages.Views"
+             WindowStyle="None" AllowsTransparency="True"  Background="Transparent"
+             mc:Ignorable="d" 
+             ResizeMode="NoResize"
+             xmlns:userControl="clr-namespace:Venus_Themes.UserControls;assembly=Venus_Themes"
+             xmlns:customControls="clr-namespace:Venus_Themes.CustomControls;assembly=Venus_Themes"
+             WindowStartupLocation="CenterScreen"
+             Width="1920" Height="1080">
+    <Grid>
+        <Image   Source="Pack://application:,,,/Venus_Themes;Component/Resources/Login.png" Stretch="Fill"/>
+        <Border Width="500" Height="650" Background="#FFFFFF" Margin="100 200 0 0" HorizontalAlignment="Left" VerticalAlignment="Top" BorderThickness="1" BorderBrush="Silver" CornerRadius="15,15,15,15">
+            <Grid Margin="50 0 0 0">
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition/>
+                    <RowDefinition Height="30"/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                    <RowDefinition/>
+                </Grid.RowDefinitions>
+                <Image Source="Pack://application:,,,/Venus_Themes;Component/Resources/JetLogo.png" HorizontalAlignment="Left" Width="154" Height="14"></Image>
+                <TextBlock Grid.Row="1" Text="Login"                                       FontSize="42" FontFamily="D-DIN" Foreground="#222222" FontWeight="Bold"/>
+                <TextBlock Grid.Row="2" Text="Welcome back! Please login to your account." FontSize="16" FontFamily="D-DIN" Foreground="#999999"/>
+                <TextBlock Grid.Row="3" Text="UserName"                                    FontSize="16" FontFamily="D-DIN" Foreground="#666666"/>
+                <TextBox   Grid.Row="4" Height="30" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" BorderThickness="0 0 0 1" FontSize="16"/>
+                <TextBlock Grid.Row="5" Text="Password"                                    FontSize="16" FontFamily="D-DIN" Foreground="#666666"/>
+                <TextBox   Grid.Row="6" Height="30" Width="400" HorizontalAlignment="Left" VerticalAlignment="Center" BorderThickness="0 0 0 1" FontSize="16"/>
+                <TextBlock Grid.Row="7" Text="Role"                                    FontSize="16" FontFamily="D-DIN" Foreground="#666666"/>
+                <ComboBox  Grid.Row="8" Height="33" Width="400" HorizontalAlignment="Left" VerticalAlignment="Top"  Style="{StaticResource customeComboBoxStyle2}" Margin="0 -30 0 0"/>
+                <customControls:PathButton Grid.Row="9" Width="400" Height="40" Content="Login"          Command="{Binding LoginCommand}"   HorizontalAlignment="Left"    VerticalAlignment="Top"    />
+
+            </Grid>
+        </Border>
+
+        <userControl:PathButton Width="15" Height="15" Cursor="Hand"
+                                PathData="{StaticResource Icon_Close}" 
+                                Margin="1880 -1000 0 0" 
+                                DefaultFillBrush="White"
+                                MouseOverBrush="Yellow"
+                                IsPressedBrush="Blue" Command="{Binding CloseCommand}"/>
+    </Grid>
+</Window>

Venus/Venus_MainPages/Views/LoginView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Venus_MainPages.Views
+{
+    /// <summary>
+    /// LoginView.xaml 的交互逻辑
+    /// </summary>
+    public partial class LoginView : Window
+    {
+        public LoginView()
+        {
+            InitializeComponent();
+        }
+    }
+}

Venus/Venus_Themes/Venus_Themes.csproj

@@ -555,6 +555,12 @@
     <Resource Include="Resources\TurboPump.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\Login.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Resources\JetLogo.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Content Include="Styles\Folder_Close.png" />
     <Content Include="Styles\Folder_Open.png" />
     <Content Include="Styles\Folder_Unable.png" />

Venus/Venus_UI/App.xaml.cs

@@ -30,6 +30,9 @@ namespace Venus_UI
                 Environment.Exit(0);
             }
 
+
+            //LoginView loginView = new LoginView();
+            //loginView.ShowDialog();
             FrameworkCompatibilityPreferences.KeepTextBoxDisplaySynchronizedWithTextProperty = false;
 
             DispatcherUnhandledException += App_DispatcherUnhandledException;