From 32deacc8fa9bce599aeada669d71765b6c2d8aea Mon Sep 17 00:00:00 2001 From: cjy Date: Thu, 7 Nov 2024 20:10:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BAEXCEL=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuarztJobs/WSLWeeklyReportJob.cs | 15 ++++++++++++++- ds-wms-service/DS.WMS.OpApi/appsettings.json | 3 ++- .../templates/SUNNINESS-CARGOO REPORT.xlsx | Bin 0 -> 10606 bytes 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 ds-wms-service/DS.WMS.OpApi/wwwroot/templates/SUNNINESS-CARGOO REPORT.xlsx diff --git a/ds-wms-service/DS.WMS.Core/QuarztJobs/WSLWeeklyReportJob.cs b/ds-wms-service/DS.WMS.Core/QuarztJobs/WSLWeeklyReportJob.cs index bab01c4d..d8dc4042 100644 --- a/ds-wms-service/DS.WMS.Core/QuarztJobs/WSLWeeklyReportJob.cs +++ b/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().Where(x => x.ContractClientName == "WSL" && SqlFunc.Between(x.ETD, startDate, endDate) && !x.Deleted && x.IsChangeETD == false) + var list = await tenantDb.Queryable().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(); diff --git a/ds-wms-service/DS.WMS.OpApi/appsettings.json b/ds-wms-service/DS.WMS.OpApi/appsettings.json index 9a9afc9f..05028fbc 100644 --- a/ds-wms-service/DS.WMS.OpApi/appsettings.json +++ b/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 * * * ?" } } diff --git a/ds-wms-service/DS.WMS.OpApi/wwwroot/templates/SUNNINESS-CARGOO REPORT.xlsx b/ds-wms-service/DS.WMS.OpApi/wwwroot/templates/SUNNINESS-CARGOO REPORT.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..73edf417c19c4a8c7287c36f0ea0fdd1122df611 GIT binary patch literal 10606 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 Vcql!78`44rbVI}ATZZ4h{XdKa-@E_- literal 0 HcmV?d00001