WSL报表

ds-wms-service/DS.Module.Quartz/QuartzModuleInstall.cs

@@ -71,6 +71,7 @@ namespace DS.Module.QuartzModuleInstall
                     .ForJob(jobKey1)
                     .WithIdentity(nameof(WSLReportJob) + "-trigger")
                     .WithCronSchedule("0 0 1 * * ?")
+                    //.WithSimpleSchedule(s => s.WithIntervalInMinutes(1).WithRepeatCount(1)) //测试用
                     );
             });
 

ds-wms-service/DS.WMS.Core/QuarztJobs/WSLReportJob.cs

@@ -39,21 +39,27 @@ namespace DS.WMS.Core.QuarztJobs
         public async Task Execute(IJobExecutionContext context)
         {
             string path = Path.Combine(hostEnvironment.WebRootPath, "templates", "WSL.xlsx");
-            FileInfo templateFile = new FileInfo(path);
+            FileInfo templateFile = new(path);
             if (!templateFile.Exists)
-                throw new ApplicationException("未能在下列路径找到模板文件：" + path);
+            {
+                var ex = new ApplicationException("【WSL报表服务】未能在下列路径找到模板文件：" + path);
+                await ex.LogAsync(db);
+                throw ex;
+            }
+
+            //时间计算
+            var today = DateTime.Now.Date;
+            var yesterday = today.AddDays(-1).Date;
+
+            var lastMonth = today.AddMonths(-1);
+            var nextMonth = today.AddMonths(1);
+
+            var startDate = new DateTime(lastMonth.Year, lastMonth.Month, 1);
+            var endDate = new DateTime(nextMonth.Year, nextMonth.Month, DateTime.DaysInMonth(nextMonth.Year, nextMonth.Month), 23, 59, 59);
 
             db.QueryFilter.Clear();
             var dbLinks = await db.Queryable<Module.SqlSugar.SysTenantLink>().ToListAsync();
             SqlSugarClient? tenantDb = null;
-            var today = DateTime.Now;
-            var today0 = new DateTime(today.Year, today.Month, today.Day);
-            var yesterday0 = today0.AddDays(-1).Date;
-            var yesterday = new DateTime(yesterday0.Year, yesterday0.Month, yesterday0.Day, 23, 59, 59);
-            var lastMonth = today.AddMonths(-1);
-            var nextMonth = today.AddMonths(1);
-            var startDate = new DateTime(lastMonth.Year, lastMonth.Month, lastMonth.Day);
-            var endDate = new DateTime(nextMonth.Year, nextMonth.Month, nextMonth.Day, 23, 59, 59);
             try
             {
                 foreach (var dbLink in dbLinks)
@@ -68,6 +74,7 @@ namespace DS.WMS.Core.QuarztJobs
                         DbType = dbLink.DbType,
                         IsAutoCloseConnection = true
                     });
+                    tenantDb.QueryFilter.Clear();
 
                     WSLModel model = new()
                     {
@@ -75,7 +82,7 @@ namespace DS.WMS.Core.QuarztJobs
                         Month = today.ToString("yyyy.MM")
                     };
 
-                    var list = await tenantDb.Queryable<SeaExport>().Where(x => x.SourceCode == SOURCE_CODE && SqlFunc.Between(x.ETD, startDate, endDate))
+                    var list = await tenantDb.Queryable<SeaExport>().Where(x => x.SourceCode == SOURCE_CODE && SqlFunc.Between(x.ETD, startDate, endDate) && !x.Deleted)
                         .Select(x => new
                         {
                             x.Id,
@@ -90,7 +97,7 @@ namespace DS.WMS.Core.QuarztJobs
 
                     var ids = list.Select(x => x.Id.ToString());
                     var ctnList = await tenantDb.Queryable<OpCtn>().Where(x => ids.Contains(x.BSNO) &&
-                        !SqlFunc.IsNullOrEmpty(x.CntrNo) && !SqlFunc.IsNullOrEmpty(x.SealNo))
+                        !SqlFunc.IsNullOrEmpty(x.CntrNo) && !SqlFunc.IsNullOrEmpty(x.SealNo) && !x.Deleted)
                         .Select(x => new
                         {
                             x.BSNO,
@@ -102,8 +109,8 @@ namespace DS.WMS.Core.QuarztJobs
                         CustomerId = x.Key.CustomerId,
                         CustomerName = x.Key.CustomerName,
                         Date = model.Date,
-                        YesterdayTeu = x.Where(x => x.ETD >= yesterday0 && x.ETD <= yesterday).Sum(x => x.TEU),
+                        YesterdayTeu = x.Where(x => x.ETD >= yesterday && x.ETD <= yesterday).Sum(x => x.TEU),
-                        TodayTeu = x.Where(x => x.ETD >= today0 && x.ETD <= today).Sum(x => x.TEU),
+                        TodayTeu = x.Where(x => x.ETD >= today && x.ETD <= today).Sum(x => x.TEU),
                         NextMonthTEU = x.Where(x => x.ETD.Value.Year == nextMonth.Year && x.ETD.Value.Month == nextMonth.Month).Sum(x => x.TEU),
                         LastMonthTEU = x.Where(x => x.ETD.Value.Year == lastMonth.Year && x.ETD.Value.Month == lastMonth.Month).Sum(x => x.TEU),
                     }).ToList();
@@ -114,33 +121,26 @@ namespace DS.WMS.Core.QuarztJobs
                         item.TodayTeuCTNPickup = ctnList.Where(x => ids2.Contains(x.BSNO)).Sum(x => x.TEU);
                     }
 
-                    MemoryStream ms = new MemoryStream();
+                    MemoryStream ms = new();
                     await MiniExcel.SaveAsByTemplateAsync(ms, path, model);
                     string base64Str = Convert.ToBase64String(ms.ToArray());
                     ms.Dispose();
                     var attaches = new List<Attachment>
                     {
-                        new() { AttachName = "WSL Volume Daily Increase Report.xlsx", AttachContent = base64Str}
+                        new() { AttachName = config["TaskMail:DefaultSetting:Title"] + ".xlsx", AttachContent = base64Str}
                     };
 
                     dynamic[] mailParams = [new
                         {
                             SendTo = config["TaskMail:DefaultSetting:Receivers"],
-                            Title = "WSL Volume Daily Increase Report",
+                            CCTo = config["TaskMail:DefaultSetting:CCTo"],
-                            Body = @"<article class='4ever-article'>
+                            Title = config["TaskMail:DefaultSetting:Title"],
-                                    <p style='line-height: 1;'>Dear WSL Team,</p>
+                            Body = config["TaskMail:DefaultSetting:Body"],
-                                    <p style='line-height: 1;'>Pls kindly check the daily report for your member's nomination booking:&nbsp;</p>
-                                    <p style='line-height: 1;'>&nbsp;</p>
-                                    <p style='line-height: 1;'>Thanks &amp; Best regards</p>
-                                    <p style='line-height: 1;'>Candy SHAO 邵芳</p>
-                                    <p style='line-height: 1;'>General Manager| <strong><span style='color: #e67e23;'>SUNNINESS LOGISTICS CO.,LTD.</span></strong></p>
-                                    <p style='line-height: 1;'>TEL: +(86) (0532-80688387)1 MB./We chat: +(86)(18866622731) | QQ:2853083553|Email:candy@sunniness. net |WCA ID: 60272</p>
-                                    </article>",
                             Account = config["TaskMail:DefaultSetting:Account"],
                             Password = config["TaskMail:DefaultSetting:Password"],
                             Server = config["TaskMail:DefaultSetting:Host"],
                             Port = config["TaskMail:DefaultSetting:Port"],
-                            UseSSL = config["TaskMail:DefaultSetting:UseSSL"],
+                            UseSSL = config["TaskMail:DefaultSetting:UseSSL"]?.ToLowerInvariant(),
                             Attaches = attaches
                     }];
 
@@ -149,29 +149,16 @@ namespace DS.WMS.Core.QuarztJobs
                         throw new ApplicationException("发送邮件失败");
                 }
             }
+            catch (Exception ex)
+            {
+                await ex.LogAsync(db);
+            }
             finally
             {
                 tenantDb?.Dispose();
             }
         }
 
-        class DefaultSetting
-        {
-            public long Tenant { get; set; }
-
-            public string? Account { get; set; }
-
-            public string? Password { get; set; }
-
-            public string? Host { get; set; }
-
-            public int? Port { get; set; }
-
-            public bool UseSSL { get; set; }
-
-            public string? Receivers { get; set; }
-        }
-
         class Attachment
         {
             public string? AttachName { get; set; }

ds-wms-service/DS.WMS.OpApi/appsettings.json

@@ -119,8 +119,10 @@
       "Host": "smtp.mxhichina.com",
       "Port": 465,
       "UseSSL": true,
-      "Receivers": "daisusu@dongshengsoft.com",
+      "Receivers": "candy@sunniness.net",
-      "Content": ""
+      "CCTo": "yee@sunniness.net,daisusu@dongshengsoft.com",
+      "Title": "WSL Volume Daily Increase Report",
+      "Body": "<article class='4ever-article'><p style='line-height: 1;'>Dear WSL Team,</p><p style='line-height: 1;'>Pls kindly check the daily report for your member's nomination booking:&nbsp;</p><p style='line-height: 1;'>&nbsp;</p><p style='line-height: 1;'>Thanks &amp; Best regards</p><p style='line-height: 1;'>Candy SHAO 邵芳</p><p style='line-height: 1;'>General Manager| <strong><span style='color: #e67e23;'>SUNNINESS LOGISTICS CO.,LTD.</span></strong></p><p style='line-height: 1;'>TEL: +(86) (0532-80688387)1 MB./We chat: +(86)(18866622731) | QQ:2853083553|Email:candy@sunniness. net |WCA ID: 60272</p></article>"
     }
   },
   "FeeService": {