Merge branch 'master' of http://49.235.130.76/XXF_1122/DaisyNPILine

TeamAAS-VM/Core/Management.cs

@@ -2832,6 +2832,11 @@ namespace TeamAAS_VP.Core
                                                                 LogHelper.WriteLogMes($"上传数据成功");
                                                                 SendTaskMessage($"上传数据成功", MessageLevel.Debug);
                                                                 string filePath = $"D:\\image\\Recored\\{dt.ToString("yyyy-MM")}\\{dt.ToString("MM-dd")}\\{currentProduct.Name}\\{ProductMainSN[i]}";
+                                                                string source_csv2 = $"{stationConfig.SaveCsvPath}\\{dt.ToString("yyyy-MM")}\\{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}";
+                                                                if (!Directory.Exists(filePath))
+                                                                {
+                                                                    Directory.CreateDirectory(filePath);
+                                                                }
                                                                 string csvfilename = $"{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}";
                                                                 //复制csv
                                                                 string source_csv = $"{stationConfig.SaveCsvPath}\\{dt.ToString("yyyy-MM")}\\{i}_{stationConfig.DeviceName}_{dt.ToString("yyyy-MM-dd")}.csv";
@@ -2857,6 +2862,19 @@ namespace TeamAAS_VP.Core
                                                                             File.Copy(item, target_Torque, true);
                                                                         }
                                                                     }
+                                                                    //string target_Directory = Path.Combine(filePath, "扭力曲线");  待测试
+                                                                    //string source_Torque_Image = config.ScrewCurvePath + $"\\{dt.ToString("yyyy-MM")}\\{dt.ToString("yyyy-MM-dd")}\\{currentProduct.Name}\\{ProductMainSN[i]}";
+                                                                    //try
+                                                                    //{
+                                                                    //    var col = Directory.GetFiles(source_Torque_Image);
+                                                                    //    Directory.CreateDirectory(target_Directory);
+                                                                    //    foreach (var item in col)
+                                                                    //    {
+                                                                    //        string fileName = Path.GetFileName(item); // 获取文件名（带后缀）
+                                                                    //        string target_Torque = Path.Combine(target_Directory, fileName); // 拼路径（推荐）
+                                                                    //        File.Copy(item, target_Torque, true);
+                                                                    //    }
+                                                                    //}
                                                                     catch (Exception)
                                                                     {
                                                                         SendTaskMessage($"扭力曲线图读取失败", MessageLevel.Error);
@@ -2871,7 +2889,7 @@ namespace TeamAAS_VP.Core
                                                                 if (isAfter20 && isNewDay && !_hasCompressedToday)
                                                                 {
                                                                     // 执行压缩
-                                                                    CompressionImage(source_csv, csvfilename, device.Station, device.FixtureId);
+                                                                    CompressionImage(source_csv2, csvfilename, device.Station, device.FixtureId);
                                                                     _lastCompressDate = dt;
                                                                     _hasCompressedToday = true;
                                                                     LogHelper.WriteLogMes("csv上传数据成功");

TeamAAS-VM/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.4")]
-[assembly: AssemblyFileVersion("1.3.0.4")]
+[assembly: AssemblyVersion("1.3.0.2")]
+[assembly: AssemblyFileVersion("1.3.0.2")]

TeamAAS-VM/Views/MainWindowView.xaml

@@ -49,6 +49,10 @@
             </Grid.RowDefinitions>
 
             <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100" />
                     <ColumnDefinition Width="100" />
@@ -60,9 +64,11 @@
                     <ColumnDefinition Width="100" />
                 </Grid.ColumnDefinitions>
                 <Grid.Resources>
-
+                
                 </Grid.Resources>
+                <!--<TextBlock Text="运行窗口" HorizontalAlignment="Center"/>-->
                 <Button Grid.Column="0"
+                        Grid.Row="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 运行窗口}"
                         Width="90"
@@ -76,6 +82,7 @@
                                              Foreground="{Binding NavigationIndex,Converter={StaticResource _NavigationState1},ConverterParameter=0}" />
                 </Button>
                 <Button Grid.Column="1"
+                        Grid.Row="1"                        
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 产品管理}"
                         Width="90"
@@ -89,6 +96,7 @@
                                              Foreground="{Binding NavigationIndex,Converter={StaticResource _NavigationState1},ConverterParameter=1}" />
                 </Button>
                 <Button Grid.Column="2"
+                        Grid.Row="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 调试}"
                         Width="90"
@@ -102,6 +110,7 @@
                                              Foreground="{Binding NavigationIndex,Converter={StaticResource _NavigationState1},ConverterParameter=2}" />
                 </Button>
                 <Button Grid.Column="3"
+                        Grid.Row="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 设置}"
                         Width="90"
@@ -116,6 +125,7 @@
                 </Button>
                 <materialDesign:Card Grid.Column="4"
                                      Margin="10"
+                        Grid.Row="1"
                                      Background="{Binding management.StatusBackground}"
                                      UniformCornerRadius="15">
                     <TextBlock Text="{Binding MyTitle}"
@@ -125,6 +135,7 @@
                                FontWeight="Bold"/>
                 </materialDesign:Card>
                 <Button Grid.Column="5"
+                        Grid.Row="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 校准}"
                         Width="90"
@@ -138,6 +149,7 @@
                                              Foreground="{Binding NavigationIndex,Converter={StaticResource _NavigationState1},ConverterParameter=5}" />
                 </Button>
                 <Button Grid.Column="6"
+                        Grid.Row="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 统计}"
                         Width="90"
@@ -151,6 +163,7 @@
                                              Foreground="{Binding NavigationIndex,Converter={StaticResource _NavigationState1},ConverterParameter=6}" />
                 </Button>
                 <Button Grid.Column="7"
+                        Grid.Row="1"
                         Style="{StaticResource MaterialDesignIconButton}"
                         ToolTip="{lex:Loc 用户}"
                         Width="90"