Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Aucma.Core.BoxFoam/Views/IndexPageView.xaml

@@ -86,7 +86,7 @@
                 </Grid.RowDefinitions>
 
                 <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="#1157b9" Margin="1,1,3,5" >
-                    <TextBlock Text="扫描信息" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Bold"/>
+                    <TextBlock Text="扫描信息" FontSize="20" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" FontWeight="Bold"/>
                 </Border>
                 <!--扫描信息-->
                 <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,3,5">
@@ -111,7 +111,7 @@
                                     <RowDefinition/>
                                 </Grid.RowDefinitions>
                                 <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
-                                    <TextBlock Text="物料条码" FontSize="15" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 30 0"/>
+                                    <TextBlock Text="物料条码" FontSize="18" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0 0 30 0"/>
                                     <TextBox FontSize="18" Text="{Binding MaterialBarCode,Mode=TwoWay}" BorderBrush="White"  Foreground="White" Width="200" IsReadOnly="True" Margin="0 0 10 0"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
                                     <TextBox FontSize="18" Text="{Binding BeginTime,Mode=TwoWay}" BorderBrush="White"  Foreground="White" Width="200" IsReadOnly="True" Margin="10 0 0 0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
                                 </StackPanel>
@@ -155,13 +155,13 @@
                     <RowDefinition Height="9*"/>
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,1,5" >
-                    <TextBlock Text="设备监控" FontSize="18" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
+                    <TextBlock Text="设备监控" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center" />
                 </Border>
 
                 <!--设备监控-->
                 <Border x:Name="HeightHelperPanel" Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="25,1,5,5">
                     <ListBox  MinHeight="60"
-                        Height="{Binding Path=ActualHeight, ElementName=HeightHelperPanel}"  x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" Foreground="White" Background="Transparent" BorderBrush="Transparent"  ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
+                        Height="{Binding Path=ActualHeight, ElementName=HeightHelperPanel}"  x:Name="listBox" ItemsSource="{Binding LogInfoListBox}" FontSize="18" Foreground="White" Background="Transparent" BorderBrush="Transparent"  ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden"/>
                 </Border>
             </Grid>
         </Border>
@@ -174,7 +174,7 @@
                     <RowDefinition Height="9*"/>
                 </Grid.RowDefinitions>
                 <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0,0,0,1" CornerRadius="0" Background="Transparent" Margin="1,1,5,5" >
-                    <TextBlock Text="扫描记录" FontSize="18" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"  />
+                    <TextBlock Text="扫描记录" FontSize="20" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"  />
                 </Border>
 
                 <!--计划列表-->
@@ -187,7 +187,7 @@
 
                         <DataGrid Grid.Row="0" ItemsSource="{Binding PlanInfoDataGrid}" Background="#00000000" 
                        ColumnHeaderHeight="35"   Height="{Binding Path=ActualHeight, ElementName=ScanPanel}" 
-                      RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"  FontSize="18"
+                      RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"  FontSize="20"
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto" 
                       ScrollViewer.VerticalScrollBarVisibility="Auto"  BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
                       Foreground="White"  >

Aucma.Core.BoxFoam/Views/MainWindow.xaml

@@ -33,7 +33,7 @@
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <TextBlock Text="澳柯玛箱体发泡控制系统" FontSize="45" Foreground="White" FontWeight="Bold"/>
+                        <TextBlock Text="澳柯玛箱体发泡控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">

Aucma.Core.SheetMetal/Views/IndexPageView.xaml

@@ -319,8 +319,9 @@
                                                 <Button Content="上移" FontSize="12" CommandParameter="{Binding ID}"   Margin="0 2 0 2"   Command="{Binding DataContext.MoveUpCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
                                                 <Button Content="下移" FontSize="12" CommandParameter="{Binding ID}"   Margin="2 2 0 2"   Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"  />
                                                 <Button Content="取消" FontSize="12" CommandParameter="{Binding ID}"   Margin="2 2 0 2" Background="#df4642" BorderBrush="#df4642"  Command="{Binding DataContext.DeletePlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"  />
-                                                <Button Content="下传" FontSize="12" CommandParameter="{Binding ID}"   Margin="2 2 0 2"   Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"  />
+                                                <!--<Button Content="下传" FontSize="12" CommandParameter="{Binding ID}"   Margin="2 2 0 2"   Command="{Binding DataContext.MoveDownCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"  />-->
-                                               </WrapPanel>
+                                              
+                                            </WrapPanel>
                                         </DataTemplate>
                                     </DataGridTemplateColumn.CellTemplate>
                                 </DataGridTemplateColumn>
@@ -341,7 +342,7 @@
                                     <!--<ComboBoxItem Content="手动" IsSelected="True"/>
                                     <ComboBoxItem Content="自动" />-->
                                 </ComboBox>
-                                <Button Content="计划维护" Command="{Binding SplitPlanCommand}"  Margin="20,0,0,0"   BorderThickness="1"  />
+                                <Button Content="计划创建" Command="{Binding SplitPlanCommand}"  Margin="20,0,0,0"   BorderThickness="1"  />
                                 <Button Content="物料库存" Command="{Binding InventoryStatisticsCommand}"  Margin="20,0,0,0"   BorderThickness="1"  />
                             </StackPanel>
                         </Border>

Aucma.Core.SheetMetal/Views/MainWindow.xaml

@@ -32,7 +32,7 @@
                     </Grid.ColumnDefinitions>
 
                     <StackPanel Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center">
-                        <TextBlock Text="箱壳钣金生产控制系统" FontSize="45" Foreground="White" FontWeight="Bold"/>
+                        <TextBlock Text="箱壳自动生产控制系统" FontSize="42" Foreground="White" FontWeight="Bold"/>
                     </StackPanel>
 
                     <StackPanel Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right">
@@ -63,7 +63,7 @@
                             <RowDefinition Height="2*" />
                         </Grid.RowDefinitions>
                         <StackPanel  Grid.Row="1" Height="60" Orientation="Horizontal"  Margin="5 0" HorizontalAlignment="Left">
-                            <Button Content="计划下发" x:Name="FirstPage"  Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}"  />
+                            <Button Content="生产计划" x:Name="FirstPage"  Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FirstPage}"  />
                             <Button Content="设备监控" x:Name="LogPage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=LogPage}" />
                             <Button Content="统    计" x:Name="StatisticsPage" Margin="5 0" Command="{Binding SwitchPagesCommand}"  CommandParameter="{Binding Name,ElementName=StatisticsPage}" />
                             <Button Content="键    盘" x:Name="TabTip" Margin="5 0"  Command="{Binding FormControlCommand}"  CommandParameter="{Binding Name,ElementName=TabTip}"  />

Aucma.Core.SheetMetal/Views/SplitPlanView.xaml

@@ -166,7 +166,7 @@
                         <RowDefinition/>
                     </Grid.RowDefinitions>
                     <WrapPanel Grid.Row="0"  Margin="5" VerticalAlignment="Center">
-                        <Label Content="工单编号" VerticalAlignment="Center" Foreground="White" FontSize="18" />
+                        <Label Content="查询条件" VerticalAlignment="Center" Foreground="White" FontSize="18" />
                         <TextBox x:Name="queryParam" PreviewMouseDoubleClick="queryParam_PreviewMouseDoubleClick"  Text="{Binding Search,Mode=TwoWay}" Style="{x:Null}" Width="300" HorizontalAlignment="Left" VerticalContentAlignment="Center"  Margin="10 0 5 0"/>
                         <Button Content="查    询" Command="{Binding QueryPlanCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" Margin="5 0" />
                         <Button Content="重    置" Command="{Binding ResetCommand}" Margin="5 0"  />

Aucma.Core.SheetMetal/Views/StatisticsPageView.xaml

@@ -142,7 +142,7 @@
                             <DataGrid.Columns>
                                 <DataGridTextColumn Binding="{Binding No}" Header="序号" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="计划编号" Width="1*"    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="成品名称" Width="3*"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="3*"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                                 <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="3*"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>
                                 <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="1*"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" Visibility="Collapsed"/>
                                 <DataGridTextColumn Binding="{Binding PlanAmount}" Header="计划数量" Width="*"          ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>