导出EXCEL修改

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

@@ -90,7 +90,7 @@ namespace DS.WMS.Core.QuarztJobs
                         Month = today.ToString("yyyy.MM")
                     };
 
-                    var list = await tenantDb.Queryable<SeaExport>().Where(x => x.ContractClientName == "WSL" && SqlFunc.Between(x.ETD, startDate, endDate) && !x.Deleted && x.IsChangeETD == false)
+                    var list = await tenantDb.Queryable<SeaExport>().Where(x => !x.Deleted && x.IsChangeETD == false)//x.ContractClientName == "WSL"  && && SqlFunc.Between(x.ETD, startDate, endDate)
                         .OrderBy(x=>x.ETD)
                         .Select(x => new WSLWeeklyItem()
                         { 
@@ -104,6 +104,19 @@ namespace DS.WMS.Core.QuarztJobs
                             CustomerNo = x.CustomerNo,
                             ETD = x.ETD.HasValue ? x.ETD.Value.ToString("yyyy-MM-dd") : string.Empty,
                             //Weeks = x.ETD.HasValue ? x.ETD.Value.GetWeekOfYear(CultureInfo.CurrentCulture),
+                            LoadPort = x.LoadPort,
+                            DischargePort = x.DischargePort,
+                            MBLFrt = x.MBLFrt,
+                            Sale = x.Sale,
+                            CustomerServiceName = x.CustomerServiceName,
+                            OperatorName = x.OperatorName,
+                            Laner = x.Laner,
+                            Vessel = x.Vessel,
+                            Voyno = x.Voyno,
+                            Shipper = x.Shipper,
+                            Consignee = x.Consignee,
+                            NotifyParty = x.NotifyParty,
+                            CreateTime  =  x.CreateTime.ToString("yyyy-MM-dd")
 
 
                         }).ToListAsync();

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

@@ -149,6 +149,7 @@
   },
   "JobConfig": {
     "WSLReportJob": "0 0 17 * * ?",
-    "WSLWeeklyReportJob": "0 30 16 * * ?"
+    //"WSLWeeklyReportJob": "0 30 16 * * ?" ,
+    "WSLWeeklyReportJob": "0 */1 * * * ?"
   }
 }