From b1bba1d160857490121e05c310c7e9ac419a70d1 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 24 Jul 2024 09:32:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E3=80=81=E5=8D=95=E8=AF=81=E3=80=81=E6=8F=BD=E8=B4=A7=E4=BA=BA?= =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=9C=8D=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Info/Dtos/ClientInfoRes.cs | 21 ++++++++++++++++ .../DS.WMS.Core/Info/Entity/InfoClient.cs | 24 +++++++++++++++++++ .../PublishProfiles/FolderProfile.pubxml.user | 2 +- ds-wms-service/DS.WMS.Test/SaasTest.cs | 3 ++- 4 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs index 7a828e5e..a2e17010 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs @@ -1,4 +1,5 @@ using DS.Module.Core; +using SqlSugar; namespace DS.WMS.Core.Info.Dtos; @@ -405,4 +406,24 @@ public class ClientInfoRes /// 联系人列表 /// public List ClientContactList { get; set; } + + /// + /// 揽货人名字 + /// + public string SaleName { get; set; } + + /// + /// 操作名字 + /// + public string OpName { get; set; } + + /// + /// 单证名字 + /// + public string DocName { get; set; } + + /// + /// 客服名字 + /// + public string CustomerServiceName { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs index 97f285f2..ff389142 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Entity/InfoClient.cs @@ -457,4 +457,28 @@ public class InfoClient : BaseOrgModel /// [SugarColumn(ColumnDescription = "仓储费开始日期模式", Length = 50, IsNullable = true)] public string WMSFeeRateType { get; set; } + + /// + /// 揽货人名字 + /// + [SugarColumn(ColumnDescription = "揽货人名字", Length = 50, IsNullable = true)] + public string SaleName { get; set; } + + /// + /// 操作名字 + /// + [SugarColumn(ColumnDescription = "操作名字", Length = 50, IsNullable = true)] + public string OpName { get; set; } + + /// + /// 单证名字 + /// + [SugarColumn(ColumnDescription = "单证名字", Length = 50, IsNullable = true)] + public string DocName { get; set; } + + /// + /// 客服名字 + /// + [SugarColumn(ColumnDescription = "客服名字", Length = 50, IsNullable = true)] + public string CustomerServiceName { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user index efd89551..31f95e53 100644 --- a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi - True|2024-07-24T00:42:02.7606608Z||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||; + True|2024-07-24T00:47:26.1616069Z||;True|2024-07-24T08:42:02.7606608+08:00||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||; \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Test/SaasTest.cs b/ds-wms-service/DS.WMS.Test/SaasTest.cs index 3ae9f6db..1e1a38b8 100644 --- a/ds-wms-service/DS.WMS.Test/SaasTest.cs +++ b/ds-wms-service/DS.WMS.Test/SaasTest.cs @@ -212,7 +212,7 @@ public class SaasTest { var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 - tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); + //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); @@ -227,6 +227,7 @@ public class SaasTest //tenantDb.CodeFirst.InitTables(typeof(BookingLabel)); //tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation)); + tenantDb.CodeFirst.InitTables(typeof(InfoClient)); //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty)); //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail)); //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn)); From 50c0b2fc2f8c021966754e28f7da8982bc20f44b Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Wed, 24 Jul 2024 09:40:24 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=80=E6=9D=A5?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=A2=9E=E5=8A=A0=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ClientInfoController.cs | 12 ++++++++++++ .../PublishProfiles/FolderProfile.pubxml.user | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs index 6e04a3bb..ab46227f 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs @@ -61,4 +61,16 @@ public class ClientInfoController : ApiController var res = _invokeService.GetClientInfo(id); return res; } + + /// + /// 获取往来单位详情（含有联系人列表） + /// + /// 查询往来单位 + /// 返回往来单位详情 + [HttpPost] + [Route("GetClientInfoWithContact")] + public async Task> GetClientInfoWithContact([FromBody] QueryClientInfo query) + { + return await _invokeService.GetClientInfoWithContact(query); + } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 86d400ca..c2b160b0 100644 --- a/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>D:\Code\PublishCopy\ds8-mainapi - True|2024-07-19T04:03:03.1399057Z||;True|2024-07-19T11:47:36.2698405+08:00||;True|2024-07-18T15:59:36.7010783+08:00||;True|2024-07-16T18:17:43.9220347+08:00||;True|2024-06-18T17:36:34.9035076+08:00||;True|2024-06-18T16:25:54.2461596+08:00||;True|2024-06-18T10:09:37.3872162+08:00||;True|2024-06-18T10:00:43.4402179+08:00||;True|2024-06-18T08:55:07.3014083+08:00||;True|2024-06-18T08:40:51.6182342+08:00||;True|2024-06-13T19:48:34.0429148+08:00||;True|2024-06-13T19:09:39.6804400+08:00||;True|2024-06-13T15:41:56.9502735+08:00||;True|2024-06-13T15:23:59.4555910+08:00||;True|2024-06-13T15:12:55.6093356+08:00||;True|2024-06-11T17:08:01.8930314+08:00||;True|2024-06-07T15:23:11.1389680+08:00||;True|2024-06-07T10:23:59.6079620+08:00||;True|2024-06-06T17:42:56.1843783+08:00||;True|2024-06-04T14:20:46.7742295+08:00||;True|2024-05-31T17:57:35.6858600+08:00||;True|2024-05-31T15:25:20.8503086+08:00||;True|2024-05-30T17:22:52.2563382+08:00||;True|2024-05-30T17:05:35.7504154+08:00||;True|2024-05-29T17:17:39.6966826+08:00||; + True|2024-07-24T01:32:35.6165520Z||;True|2024-07-19T12:03:03.1399057+08:00||;True|2024-07-19T11:47:36.2698405+08:00||;True|2024-07-18T15:59:36.7010783+08:00||;True|2024-07-16T18:17:43.9220347+08:00||;True|2024-06-18T17:36:34.9035076+08:00||;True|2024-06-18T16:25:54.2461596+08:00||;True|2024-06-18T10:09:37.3872162+08:00||;True|2024-06-18T10:00:43.4402179+08:00||;True|2024-06-18T08:55:07.3014083+08:00||;True|2024-06-18T08:40:51.6182342+08:00||;True|2024-06-13T19:48:34.0429148+08:00||;True|2024-06-13T19:09:39.6804400+08:00||;True|2024-06-13T15:41:56.9502735+08:00||;True|2024-06-13T15:23:59.4555910+08:00||;True|2024-06-13T15:12:55.6093356+08:00||;True|2024-06-11T17:08:01.8930314+08:00||;True|2024-06-07T15:23:11.1389680+08:00||;True|2024-06-07T10:23:59.6079620+08:00||;True|2024-06-06T17:42:56.1843783+08:00||;True|2024-06-04T14:20:46.7742295+08:00||;True|2024-05-31T17:57:35.6858600+08:00||;True|2024-05-31T15:25:20.8503086+08:00||;True|2024-05-30T17:22:52.2563382+08:00||;True|2024-05-30T17:05:35.7504154+08:00||;True|2024-05-29T17:17:39.6966826+08:00||; \ No newline at end of file From 9a6773f49a29533e966794618e38427aec2576f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Tue, 23 Jul 2024 17:06:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=80=BB=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/Method/InvoiceApplicationService.cs | 3 ++- ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs | 5 ++++- .../DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs index 34989896..00e23034 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs @@ -555,12 +555,13 @@ namespace DS.WMS.Core.Application.Method ApplicationId = application.Id, Name = item.Name, TaxRate = application.TaxRate, + Quantity = 1, TaxUnitPrice = application.Details.FindAll(x => item.FeeIds.Contains(x.FeeId)).Sum(x => x.ApplyAmount), Category = DetailCategory.InvoiceApplication }; invDetail.TaxAmount = invDetail.TaxUnitPrice * application.TaxRate; invDetail.UnitPrice = invDetail.TaxUnitPrice - invDetail.TaxAmount; - + invDetail.Amount = invDetail.TaxUnitPrice * invDetail.Quantity; application.InvoiceDetails.Add(invDetail); } } diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs b/ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs index 7e2b4bce..6218840b 100644 --- a/ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs +++ b/ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs @@ -8,6 +8,9 @@ using Newtonsoft.Json; namespace DS.WMS.Core.Invoice.Method { + /// + /// 提供对HTTP请求的低级别访问 + /// internal class ApiFox { /// @@ -93,7 +96,7 @@ namespace DS.WMS.Core.Invoice.Method /// /// 请求结果的类型 /// 请求Url - /// 查询字符串的键值对 + /// 请求参数对象 /// /// 为null或空字符串 public async Task> PostAsync(string url, object? requestParams = null) diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs index af6b19b1..272695f5 100644 --- a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs +++ b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs @@ -70,6 +70,7 @@ namespace DS.WMS.Core.Invoice.Method goodsCode = "", //商品和服务税收分类合并编码 invoiceLineProperty = "00" }).ToList() + }).ToList(); var result = await api.PostAsync>("/api/Invoice/services", request); From c1bee4dfee4b70ce00b8a37f2cbe9f53db5f58ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Tue, 23 Jul 2024 17:40:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=90=88=E8=AE=A1=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.Module.Core/Data/DataResult.cs | 5 +++++ .../Application/Method/InvoiceApplicationService.cs | 10 ++++++++-- ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt | 7 +++++++ .../PublishProfiles/FolderProfile1.pubxml.user | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ds-wms-service/DS.Module.Core/Data/DataResult.cs b/ds-wms-service/DS.Module.Core/Data/DataResult.cs index 1bb9590a..f1a57846 100644 --- a/ds-wms-service/DS.Module.Core/Data/DataResult.cs +++ b/ds-wms-service/DS.Module.Core/Data/DataResult.cs @@ -266,6 +266,11 @@ public class DataResult : IDataResult public TData Data { get; set; } + /// + /// 附加数据 + /// + public Dictionary? AdditionalData { get; set; } + /// /// 返回成功的结果 /// diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs index 00e23034..8865dfe9 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs @@ -80,6 +80,12 @@ namespace DS.WMS.Core.Application.Method { item.CreateByName = users.Find(x => x.Id == item.CreateBy)?.UserName; } + + result.AdditionalData = new Dictionary + { + { "ApplyAmountSum", result.Data.Sum(x => x.ApplyAmount) }, + { "InvoiceAmountSum", result.Data.Sum(x => x.InvoiceAmount.GetValueOrDefault()) } + }; } return result; @@ -392,7 +398,7 @@ namespace DS.WMS.Core.Application.Method /// /// 发票明细ID /// - public async Task DeleteInvoiceDetailAsync(params long[] ids) + public async Task DeleteInvoiceDetailAsync(params long[] ids) { int rows = await TenantDb.Deleteable().Where(x => ids.Contains(x.Id)).ExecuteCommandAsync(); return rows > 0 ? DataResult.Success : DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed)); @@ -622,7 +628,7 @@ namespace DS.WMS.Core.Application.Method x.AmountUppercase }).ExecuteCommandAsync(); } - + } diff --git a/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt b/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt index 6588c064..57a0523b 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt @@ -3120,3 +3120,10 @@ 2024-07-22 08:57:09.9055 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config 2024-07-22 08:57:09.9055 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-07-22 08:57:09.9319 Info Configuration initialized. +2024-07-23 17:37:40.2936 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-23 17:37:40.3330 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-23 17:37:40.3386 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-23 17:37:40.3551 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-23 17:37:40.3551 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config +2024-07-23 17:37:40.3551 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-23 17:37:40.3714 Info Configuration initialized. diff --git a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index 82d1a4c9..68366bf1 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\DS8\FeeApi - True|2024-07-22T00:59:23.3235603Z||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||; + True|2024-07-23T09:25:11.8773492Z||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||; \ No newline at end of file From 4f815bdf729dab76ee4871d737bea73d9f967fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Wed, 24 Jul 2024 10:08:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=B0=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Method => DS.Module.Core/Utils}/ApiFox.cs | 76 ++++----- .../Invoice/Method/InvoiceApiFox.cs | 46 ++++++ .../Invoice/Method/InvoiceIssuanceService.cs | 14 +- .../Op/Dtos/TaskInteraction/TaskCreation.cs | 149 ++++++++++++++++++ .../FolderProfile1.pubxml.user | 2 +- 5 files changed, 240 insertions(+), 47 deletions(-) rename ds-wms-service/{DS.WMS.Core/Invoice/Method => DS.Module.Core/Utils}/ApiFox.cs (73%) create mode 100644 ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceApiFox.cs create mode 100644 ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreation.cs diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs b/ds-wms-service/DS.Module.Core/Utils/ApiFox.cs similarity index 73% rename from ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs rename to ds-wms-service/DS.Module.Core/Utils/ApiFox.cs index 6218840b..e595f31a 100644 --- a/ds-wms-service/DS.WMS.Core/Invoice/Method/ApiFox.cs +++ b/ds-wms-service/DS.Module.Core/Utils/ApiFox.cs @@ -1,48 +1,31 @@ using System.Collections.Specialized; -using System.Security; using System.Text; -using DS.Module.Core; using DS.Module.Core.Extensions; -using Microsoft.Extensions.Configuration; using Newtonsoft.Json; -namespace DS.WMS.Core.Invoice.Method +namespace DS.Module.Core { /// /// 提供对HTTP请求的低级别访问 /// - internal class ApiFox + public class ApiFox { /// - /// 发票API的基URL + /// 基URI /// - public string? BaseUrl { get; set; } + public Uri? BaseUri { get; set; } /// - /// 用户Key + /// 默认请求头 /// - public string? UserKey { get; set; } + public IDictionary DefaultHeaders { get; private set; } /// - /// 用户密钥 + /// 初始化 /// - public SecureString? UserSecret { get; private set; } - - public ApiFox(IConfiguration config) + public ApiFox() { - BaseUrl = config.GetValue("InvoiceApi:BaseUrl"); - UserKey = config.GetValue("InvoiceApi:UserKey"); - - string? us = config.GetValue("InvoiceApi:UserSecret"); - if (!us.IsNullOrEmpty()) - { - UserSecret = new SecureString(); - for (int i = 0; i < us.Length; i++) - UserSecret.AppendChar(us[i]); - - UserSecret.MakeReadOnly(); - } - us = null; + DefaultHeaders = new Dictionary(); } /// @@ -55,9 +38,7 @@ namespace DS.WMS.Core.Invoice.Method /// 为null或空字符串 public async Task> GetAsync(string url, NameValueCollection? keyValues = null) { - ArgumentException.ThrowIfNullOrEmpty(nameof(url)); - - string? queryString = null; + string queryString = string.Empty; if (keyValues != null && keyValues.Count > 0) { StringBuilder sb = new StringBuilder(); @@ -101,8 +82,6 @@ namespace DS.WMS.Core.Invoice.Method /// 为null或空字符串 public async Task> PostAsync(string url, object? requestParams = null) { - ArgumentException.ThrowIfNullOrEmpty(nameof(url)); - var result = await SendRequestAsync(HttpMethod.Post, url, requestParams); if (!result.Succeeded) return DataResult.Failed(result.Message, result.MultiCode); @@ -113,27 +92,42 @@ namespace DS.WMS.Core.Invoice.Method } /// - /// 发起请求 + /// 发起HTTP请求 /// /// 请求方法 /// 请求Url /// 请求参数 /// - public async Task> SendRequestAsync(HttpMethod method, string url, object? requestParams = null) + /// 为null + /// 为null或空字符串 + public virtual async Task> SendRequestAsync(HttpMethod method, string url, object? requestParams = null) { - if (!Uri.TryCreate(BaseUrl, UriKind.RelativeOrAbsolute, out Uri? uri)) - return DataResult.FailedWithDesc(nameof(MultiLanguageConst.InvoiceAPIUrlNull)); + ArgumentNullException.ThrowIfNull(method); + ArgumentException.ThrowIfNullOrEmpty(url); + + Uri? reqUri = default; + if (BaseUri == null) + { + if (!Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out Uri? uri)) + throw new ArgumentException("给定的URL格式无效", nameof(url)); + + reqUri = new Uri(url); + } + else + { + reqUri = new(BaseUri, url); + } HttpClient http = new(); - http.DefaultRequestHeaders.Add("User-Agent", "X-HttpClient"); + http.DefaultRequestHeaders.Add("User-Agent", $"X-{nameof(ApiFox)}"); - if (!UserKey.IsNullOrEmpty()) - http.DefaultRequestHeaders.Add("USER_KEY", UserKey); + if (DefaultHeaders.Count > 0) + foreach (var header in DefaultHeaders) + http.DefaultRequestHeaders.Add(header.Key, header.Value); - if (UserSecret != null) - http.DefaultRequestHeaders.Add("USER_SECRET", UserSecret.ToString()); + if (!http.DefaultRequestHeaders.Contains("Accept")) + http.DefaultRequestHeaders.Add("Accept", "application/json, text/plain"); - Uri reqUri = new(uri, url); try { HttpResponseMessage? response = null; diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceApiFox.cs b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceApiFox.cs new file mode 100644 index 00000000..6986cffc --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceApiFox.cs @@ -0,0 +1,46 @@ +using System.Security; +using DS.Module.Core; +using DS.Module.Core.Extensions; +using Microsoft.Extensions.Configuration; + +namespace DS.WMS.Core.Invoice.Method +{ + /// + /// 提供对HTTP请求的低级别访问 + /// + internal sealed class InvoiceApiFox : ApiFox + { + /// + /// 用户Key + /// + public string? UserKey { get; set; } + + /// + /// 用户密钥 + /// + public SecureString? UserSecret { get; private set; } + + + public InvoiceApiFox(IConfiguration config) + { + BaseUri = new Uri(config.GetValue("InvoiceApi:BaseUrl")); + UserKey = config.GetValue("InvoiceApi:UserKey"); + + string? us = config.GetValue("InvoiceApi:UserSecret"); + if (!us.IsNullOrEmpty()) + { + UserSecret = new SecureString(); + for (int i = 0; i < us.Length; i++) + UserSecret.AppendChar(us[i]); + + UserSecret.MakeReadOnly(); + } + us = null; + + DefaultHeaders.Add("USER_KEY", UserKey ?? string.Empty); + DefaultHeaders.Add("USER_SECRET", UserSecret?.ToString()); + } + + + } +} diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs index 272695f5..2d2bbb76 100644 --- a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs +++ b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs @@ -11,7 +11,7 @@ namespace DS.WMS.Core.Invoice.Method /// public sealed class InvoiceIssuanceService : ApplicationServiceBase { - readonly ApiFox api; + readonly InvoiceApiFox api; /// /// 初始化并加载配置 @@ -20,7 +20,7 @@ namespace DS.WMS.Core.Invoice.Method public InvoiceIssuanceService(IServiceProvider provider) : base(provider) { var config = provider.GetRequiredService(); - api = new ApiFox(config); + api = new InvoiceApiFox(config); } /// @@ -78,15 +78,19 @@ namespace DS.WMS.Core.Invoice.Method return DataResult.Failed(result.Message, result.MultiCode); var invResult = result.Data; - if (!invResult.Success) + if (invResult.Success) + { + + + return DataResult.Success(invResult.Data); + } + else { if (invResult.Code == 1) return await InitiateAsync(invoices); return DataResult.Failed(invResult.Message); } - - return DataResult.Success(invResult.Data); } /// diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreation.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreation.cs new file mode 100644 index 00000000..cb640fa0 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/TaskInteraction/TaskCreation.cs @@ -0,0 +1,149 @@ +using System.Runtime.Serialization; +using DS.Module.Core; + +namespace DS.WMS.Core.Op.Dtos.TaskInteraction +{ + /// + /// 任务台创建参数 + /// + public class TaskCreation + { + [DataMember(Name = "head")] + public TaskHeader Head { get; set; } + + [DataMember(Name = "main")] + public TaskMain Main { get; set; } + + public TaskCreation() + { + Head = new TaskHeader(); + Main = new TaskMain(); + } + } + + /// + /// 任务标头 + /// + public class TaskHeader + { + /// + /// 流水ID + /// + [DataMember(Name = "gid")] + public Guid GID { get; set; } = Guid.NewGuid(); + + /// + /// 订单Id + /// + [DataMember(Name = "bsno")] + public long BSNO { get; set; } + + /// + /// 消息类型 + /// + [DataMember(Name = "messageType")] + public string MessageType { get; set; } = "WORK_FLOW_TASK"; + + [DataMember(Name = "senderId")] + public string SenderId { get; set; } = "WorkFlow"; + + [DataMember(Name = "senderName")] + public string SenderName { get; set; } = "工作流平台"; + + [DataMember(Name = "receiverId")] + public string ReceiverId { get; set; } = "TaskManage"; + + [DataMember(Name = "receiverName")] + public string ReceiverName { get; set; } = "任务管理平台"; + + /// + /// 标识符 + /// + [DataMember(Name = "token")] + public string? Token { get; set; } + + /// + /// 版本 + /// + [DataMember(Name = "version")] + public string? Version { get; set; } = "1.0"; + + /// + /// 请求时间 + /// + [DataMember(Name = "requestDate")] + public DateTime RequestDate { get; set; } = DateTime.Now; + + [DataMember(Name = "senderKey")] + public string? SenderKey { get; set; } + + [DataMember(Name = "requestAction")] + public string? RequestAction { get; set; } = "Add"; + } + + /// + /// 任务主信息 + /// + public class TaskMain + { + /// + /// 任务类型 + /// + [DataMember(Name = "taskType")] + public TaskBaseTypeEnum TaskType { get; set; } + + /// + /// 任务来源 + /// + [DataMember(Name = "taskSource")] + public int TaskSource { get; set; } = 9; + + /// + /// 任务标题 + /// + [DataMember(Name = "taskTitle")] + public string TaskTitle { get; set; } = string.Empty; + + /// + /// 任务描述 + /// + [DataMember(Name = "taskDesp")] + public string? TaskDescription { get; set; } + + /// + /// 任务创建者ID + /// + [DataMember(Name = "taskUserId")] + public long TaskUserId { get; set; } + + /// + /// 任务创建者 + /// + [DataMember(Name = "taskUserName")] + public string? TaskUserName { get; set; } + + /// + /// 任务接收者ID + /// + [DataMember(Name = "recvUserId")] + public long RecvUserId { get; set; } + + /// + /// 任务创建者 + /// + [DataMember(Name = "recvUserName")] + public string? RecvUserName { get; set; } + + /// + /// 任务租户ID + /// + [DataMember(Name = "taskTenatId")] + public long TaskTenatId { get; set; } + + /// + /// 任务租户 + /// + [DataMember(Name = "taskTenatName")] + public string? TaskTenatName { get; set; } + } +} diff --git a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index 68366bf1..2b7bb4f0 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\DS8\FeeApi - True|2024-07-23T09:25:11.8773492Z||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||; + True|2024-07-23T09:41:01.7494842Z||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||; \ No newline at end of file