修改

TeamAAS-VM/Core/FtpUploader.cs

@@ -216,13 +216,13 @@ namespace TeamAAS_VP.Core
         /// 上传文件到ftp
         /// </summary>
         /// <param name="path"></param>
-        public void UploadToFtp(string path)
+        public async void UploadToFtp(string path)
         {
             if (_config.Open)
             {
                 try
                 {
-                    Task.Run(() =>
+                    await Task.Run(() =>
                     {
                         List<string> files = new List<string>();
                         if (Directory.Exists(path))
@@ -361,17 +361,18 @@ namespace TeamAAS_VP.Core
 
         #region 压缩图片文件夹
 
-        public string CompressionImage(string name)
+        public async Task<string> CompressionImage(string sn,string currentPro)
         {
             if (_config.Open)
             {
                 try
                 {
                     string zipPath = "";
-                    Task.Run(() =>
+                    await Task.Run(() =>
                     {
-                        zipPath = $"{_config.ImagePath}\\{name}.zip";//生成的zip文件路径
-                        ZipFile.CreateFromDirectory(_config.ImagePath, zipPath);
+                        zipPath = $"{_config.ImagePath}\\{sn}_{DateTime.Now.ToString("yyyyMMddHHmmss")}.zip";//生成的zip文件路径
+                        string sourcePath = $"{_config.ImagePath}\\{DateTime.Now.ToString("yyyy-MM")}\\{DateTime.Now.ToString("MM-dd")}\\{currentPro}\\{sn}";//"D:\image\Recored\2026-02\02-28\产品1\CN0D0NDYCKJ006250103X02"
+                        ZipFile.CreateFromDirectory(sourcePath, zipPath);
                     });
                     return zipPath;
                 }

TeamAAS-VM/Core/Management.cs

@@ -2551,25 +2551,25 @@ namespace TeamAAS_VP.Core
                                                 {
                                                     SendTaskMessage($"{i}:{stationConfig.DeviceName}产品记录保存成功", MessageLevel.Debug);
 
-                                                    ftpService.UploadToFtp(stationConfig.SaveCsvPath);
-                                                    if (i == 0)
-                                                    {
-                                                        string name = $"{ProductMainSN[i]}_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
-                                                        string zippath = ftpService.CompressionImage(name);
-                                                        ftpService.UploadToFtp(zippath);
-
-                                                        (bool isSuc, string resp) = await _mesService.SendFtpFileAsync(ProductMainSN[i], name);
-                                                        if (isSuc)
-                                                        {
-                                                            LogHelper.WriteLogMes($"上传ftp成功");
-                                                            SendTaskMessage($"上传ftp成功", MessageLevel.Debug);
-                                                        }
-                                                        else
-                                                        {
-                                                            LogHelper.WriteLogMes($"上传ftp失败");
-                                                            SendTaskMessage($"上传ftp失败", MessageLevel.Error);
-                                                        }
-                                                    }
+                                                    //ftpService.UploadToFtp(stationConfig.SaveCsvPath);
+                                                    //if (i == 0)
+                                                    //{
+                                                    //    string name = $"{ProductMainSN[i]}_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
+                                                    //    string zippath = await ftpService.CompressionImage(name);
+                                                    //    ftpService.UploadToFtp(zippath);
+
+                                                    //    (bool isSuc, string resp) = await _mesService.SendFtpFileAsync(ProductMainSN[i], name);
+                                                    //    if (isSuc)
+                                                    //    {
+                                                    //        LogHelper.WriteLogMes($"上传ftp成功");
+                                                    //        SendTaskMessage($"上传ftp成功", MessageLevel.Debug);
+                                                    //    }
+                                                    //    else
+                                                    //    {
+                                                    //        LogHelper.WriteLogMes($"上传ftp失败");
+                                                    //        SendTaskMessage($"上传ftp失败", MessageLevel.Error);
+                                                    //    }
+                                                    //}
                                                 }
                                                 else
                                                 {

TeamAAS-VM/Data/SystemDatabaseService.cs

@@ -442,7 +442,7 @@ namespace TeamAAS_VP.Data
             todayEnd = todayEnd.AddDays(1);
             //按照产品名称和时间范围查询生产记录的总数
             var total = await _db.Queryable<ProductionRecord>()
-                .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd&&r.Category=="NG")
+                .Where(r => r.ProductName == productName && r.Timestamp >= todayStart && r.Timestamp < todayEnd && r.Category == "NG")
                 .SumAsync(r => r.Quantity);
             return total;
         }
@@ -1249,12 +1249,12 @@ namespace TeamAAS_VP.Data
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
-        public async Task<string> QueryProductFromMesAsync(string code,string color)
+        public async Task<string> QueryProductFromMesAsync(string code, string color)
         {
-            var v = await _db.Queryable<ProductWithMes>().Where(r => r.ProductCode == code&&r.ProductColor==color).FirstAsync();
-            if (v.ProductName==null)
+            var v = await _db.Queryable<ProductWithMes>().Where(r => r.ProductCode == code && r.ProductColor == color).FirstAsync();
+            if (v == null || v.ProductName == null)
             {
-                v.ProductName = "";
+                return "";
             }
             return v.ProductName;
         }

TeamAAS-VM/ViewModels/SettingViewModel.cs

@@ -19,6 +19,7 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection.Metadata;
 using System.Text;
+using System.Threading.Tasks;
 using System.Web;
 using System.Windows;
 using System.Windows.Controls;
@@ -1966,14 +1967,15 @@ namespace TeamAAS_VP.ViewModels
             _testCommand ?? (_testCommand = new DelegateCommand(Execute_testCommand));
         public FtpUploader ftpService { get; set; } = new FtpUploader();
 
-        private void Execute_testCommand()
+        private async void Execute_testCommand()
         {
-            var stationConfig = _configService.GetDeviceInfo(0);
+            //var stationConfig = _configService.GetDeviceInfo(0);
 
-            ftpService.UploadToFtp(stationConfig.SaveCsvPath);
-
-            string name = $"CN0D0NDYCKJ006260336X02_{DateTime.Now.ToString("yyyyMMddHHmmss")}";
-            string zippath = ftpService.CompressionImage(name);
+            //ftpService.UploadToFtp(stationConfig.SaveCsvPath);
+            var currentproduct = _productService.GetCurrentProduct();
+            
+            string sn = $"CN0D0NDYCKJ006260336X02";
+            string zippath = await ftpService.CompressionImage(sn, currentproduct.Name);
             ftpService.UploadToFtp(zippath);