From 70983287ff6b134d7540fee65a2f2de3326cd294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Wed, 26 Jun 2024 14:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=A4=E7=A7=8D=E5=B8=81?= =?UTF-8?q?=E5=88=AB=E4=B9=8B=E9=97=B4=E7=9A=84=E6=B1=87=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Application/Dtos/InvoiceApplicationDto.cs | 10 ++ .../Interface/IApplicationService`1.cs | 1 - .../Interface/IInvoiceApplicationService.cs | 2 +- .../Method/InvoiceApplicationAuditService.cs | 143 ++++++++++++++++++ .../Method/InvoiceApplicationService.cs | 2 +- .../DS.WMS.Core/Fee/Dtos/ExchangeInfo.cs | 35 +++++ .../Interface/IFeeCurrencyExchangeService.cs | 7 + .../DS.WMS.Core/Fee/Method/FeeAuditService.cs | 2 +- .../Fee/Method/FeeCurrencyExchangeService.cs | 115 ++++++++++---- .../FeeCurrencyExchangeController.cs | 18 +++ .../DS.WMS.FeeApi/Logs/internal-nlog.txt | 49 ++++++ .../FolderProfile1.pubxml.user | 2 +- 12 files changed, 355 insertions(+), 31 deletions(-) create mode 100644 ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs create mode 100644 ds-wms-service/DS.WMS.Core/Fee/Dtos/ExchangeInfo.cs diff --git a/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs b/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs index 8c7ae4ad..affaa1cd 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Dtos/InvoiceApplicationDto.cs @@ -121,6 +121,11 @@ namespace DS.WMS.Core.Application.Dtos /// public DateTime CreateTime { get; set; } + /// + /// 申请开票日期 + /// + public DateTime ApplyDate => CreateTime.Date; + /// /// 原币金额 /// @@ -128,5 +133,10 @@ namespace DS.WMS.Core.Application.Dtos public List Details { get; set; } + /// + /// 是否已审核(仅用于查询) + /// + public bool? IsAudited { get; set; } + } } diff --git a/ds-wms-service/DS.WMS.Core/Application/Interface/IApplicationService`1.cs b/ds-wms-service/DS.WMS.Core/Application/Interface/IApplicationService`1.cs index 7027ddff..308be2c8 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Interface/IApplicationService`1.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Interface/IApplicationService`1.cs @@ -1,7 +1,6 @@ using DS.Module.Core; using DS.WMS.Core.Application.Dtos; using DS.WMS.Core.Application.Entity; -using DS.WMS.Core.Fee.Dtos; namespace DS.WMS.Core.Application.Interface { diff --git a/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationService.cs b/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationService.cs index f6bd9ce5..ba514c40 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Interface/IInvoiceApplicationService.cs @@ -6,7 +6,7 @@ using DS.WMS.Core.Fee.Dtos; namespace DS.WMS.Core.Application.Interface { /// - /// 付费申请 + /// 发票申请 /// public interface IInvoiceApplicationService : IApplicationService { diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs new file mode 100644 index 00000000..62219f3f --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs @@ -0,0 +1,143 @@ +using DS.Module.Core; +using DS.Module.Core.Enums; +using DS.Module.Core.Extensions; +using DS.WMS.Core.Application.Dtos; +using DS.WMS.Core.Application.Entity; +using DS.WMS.Core.Flow.Dtos; +using DS.WMS.Core.Info.Entity; +using DS.WMS.Core.Op.Entity; +using DS.WMS.Core.Sys.Entity; +using SqlSugar; + +namespace DS.WMS.Core.Application.Method +{ + /// + /// 费用申请单审核服务 + /// + public class InvoiceApplicationAuditService : ApplicationAuditService + { + /// + /// 初始化 + /// + /// + public InvoiceApplicationAuditService(IServiceProvider serviceProvider) : base(serviceProvider) + { + } + + /// + /// 获取待审核列表 + /// + /// + /// + public async Task>> GetListAsync(PageRequest request) + { + var query = CreateListQuery(); + + if (!request.QueryCondition.IsNullOrEmpty()) + { + var whereList = Db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); + + int? index = null; + foreach (var item in whereList) + { + ConditionalModel? model = item as ConditionalModel; + if (model == null) + continue; + + //设置了状态筛选 + if (string.Equals(model.FieldName, nameof(InvoiceApplicationDto.IsAudited)) && bool.TryParse(model.FieldValue, out bool isAudited)) + { + if (isAudited) + { + query = query.Where(x => x.Status == InvoiceApplicationStatus.AuditPassed || x.Status == InvoiceApplicationStatus.AuditRejected); + } + else + { + query = query.Where(x => x.Status == InvoiceApplicationStatus.AuditSubmittd); + } + + index = whereList.IndexOf(item); + break; + } + } + if (index.HasValue) + whereList.RemoveAt(index.Value); + + + query = query.Where(whereList); + } + + var result = await query.GroupBy(x => x.Id).ToQueryPageAsync(request.PageCondition); + if (result.Data.Count > 0) + { + var orgIds = result.Data.Select(x => x.SaleDeptId).Distinct().ToList(); + var orgs = await Db.Queryable().Where(x => orgIds.Contains(x.Id)).Select(x => new { x.Id, x.OrgName }).ToListAsync(); + foreach (var item in result.Data) + { + item.SaleDeptName = orgs.Find(x => x.Id == item.SaleDeptId)?.OrgName; + } + } + + return result; + } + + internal ISugarQueryable CreateListQuery() + { + var query1 = TenantDb.Queryable().Where(x => x.Status == InvoiceApplicationStatus.AuditSubmittd) + .InnerJoin((a, d) => a.Id == d.ApplicationId) + .LeftJoin((a, d, s) => d.BusinessId == s.Id) + .LeftJoin((a, d, s, b) => a.CustomerBankId == b.Id) + .Select((a, d, s, b) => new InvoiceApplicationDto + { + Id = a.Id, + ApplicationNO = a.ApplicationNO, + Status = a.Status, + CustomerId = a.CustomerId, + CustomerName = a.CustomerName, //委托单位 + InvoiceHeader = a.InvoiceHeader, + Currency = a.Currency, + ApplyAmount = a.ApplyAmount, + InvoiceAmount = a.InvoiceAmount, + InvoiceCurrency = a.InvoiceCurrency, + OriginalAmountList = a.Details.Select(y => y.OriginalCurrency + " " + y.OriginalAmount).ToList(), + CreateTime = a.CreateTime,//申请开票日期+申请时间 + CreateBy = a.CreateBy, //申请人 + Category = a.Category, //申请类型 + Rate = a.Rate, //发票税率 + InvoiceNO = a.InvoiceNO, //发票号 + Note = a.Note, + InvoiceRemark = a.InvoiceRemark, //开票要求 + SaleDeptId = a.SaleDeptId + }); + + return TenantDb.UnionAll(new List> { query1 }); + } + + + + protected override DataResult PreAudit(List applications) + { + if (applications.Exists(x => x.Status != InvoiceApplicationStatus.AuditSubmittd)) + return DataResult.Failed("提交数据中包含不在待审批状态的申请单"); + + return DataResult.Success; + } + + protected override async Task OnUpdateStatusAsync(FlowCallback callback, InvoiceApplication application) + { + var auditType = callback.AuditType.ToEnum(); + if (auditType != AuditType.PaidApplication) + return; + + if (callback.FlowStatus == FlowStatusEnum.Approve) + { + application.Status = InvoiceApplicationStatus.AuditPassed; + application.Reason = string.Empty; + } + else if (callback.FlowStatus == FlowStatusEnum.Reject) + application.Status = InvoiceApplicationStatus.AuditRejected; + + await base.OnUpdateStatusAsync(callback, application); + } + } +} 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 5a2d3a68..4de65090 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs @@ -269,7 +269,7 @@ namespace DS.WMS.Core.Application.Method } /// - /// 获取申请单详情 + /// 获取发票申请详情 /// /// 申请单ID /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/ExchangeInfo.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/ExchangeInfo.cs new file mode 100644 index 00000000..fe9b0df6 --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/ExchangeInfo.cs @@ -0,0 +1,35 @@ +using DS.Module.Core; + +namespace DS.WMS.Core.Fee.Dtos +{ + /// + /// 汇率转换信息 + /// + public class ExchangeRate + { + /// + /// 原币别 + /// + public string CurrencyFrom { get; set; } + + /// + /// 目标币别 + /// + public string CurrencyTo { get; set; } + + /// + /// 费用类型(用于指定应收/应付汇率) + /// + public FeeType? FeeType { get; set; } + + /// + /// 转换汇率 + /// + public decimal Rate { get; set; } + + /// + /// 反向汇率 + /// + public decimal ReverseRate { get; set; } + } +} diff --git a/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeCurrencyExchangeService.cs b/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeCurrencyExchangeService.cs index 147b9dbc..4def35a7 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeCurrencyExchangeService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeCurrencyExchangeService.cs @@ -27,4 +27,11 @@ public interface IFeeCurrencyExchangeService /// /// DataResult GetFeeCurrencyExchangeInfo(string id); + + /// + /// 获取两种币别之间的汇率 + /// + /// 币别信息 + /// + DataResult GetExchangeRate(ExchangeRate exchange); } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs index 96b6a19e..ce090630 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs @@ -381,7 +381,7 @@ namespace DS.WMS.Core.Fee.Method SourceId = s.SourceId, AccountDate = s.AccountDate, OperatorId = s.OperatorId - }); + }).MergeTable(); var queryList = TenantDb.UnionAll(new List> { query1 }); diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeCurrencyExchangeService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeCurrencyExchangeService.cs index 59ee1a8d..4e72b618 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeCurrencyExchangeService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeCurrencyExchangeService.cs @@ -1,33 +1,24 @@ using DS.Module.Core; -using DS.Module.SqlSugar; -using DS.Module.UserModule; +using DS.Module.Core.Extensions; using DS.WMS.Core.Fee.Dtos; using DS.WMS.Core.Fee.Entity; using DS.WMS.Core.Fee.Interface; using DS.WMS.Core.Sys.Entity; -using Microsoft.Extensions.DependencyInjection; -using SqlSugar; using Mapster; -using DS.Module.Core.Extensions; namespace DS.WMS.Core.Fee.Method { - public class FeeCurrencyExchangeService : IFeeCurrencyExchangeService + /// + /// 汇率服务 + /// + public class FeeCurrencyExchangeService : FeeServiceBase, IFeeCurrencyExchangeService { - private readonly IServiceProvider _serviceProvider; - private readonly ISqlSugarClient db; - private readonly IUser user; - private readonly ISaasDbService saasService; /// /// /// /// - public FeeCurrencyExchangeService(IServiceProvider serviceProvider) + public FeeCurrencyExchangeService(IServiceProvider serviceProvider) : base(serviceProvider) { - _serviceProvider = serviceProvider; - db = _serviceProvider.GetRequiredService(); - user = _serviceProvider.GetRequiredService(); - saasService = _serviceProvider.GetRequiredService(); } /// @@ -37,11 +28,9 @@ namespace DS.WMS.Core.Fee.Method /// public DataResult> GetListByPage(PageRequest request) { - var tenantDb = saasService.GetBizDbScopeById(user.TenantId); - //序列化查询条件 - var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); - var data = tenantDb.Queryable() + var whereList = Db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); + var data = TenantDb.Queryable() .Where(whereList) .Select().ToQueryPage(request.PageCondition); return data; @@ -54,10 +43,9 @@ namespace DS.WMS.Core.Fee.Method /// public DataResult EditFeeCurrencyExchange(FeeCurrencyExchangeReq req) { - var tenantDb = saasService.GetBizDbScopeById(user.TenantId); if (req.Id == 0) { - if (tenantDb.Queryable() + if (TenantDb.Queryable() .Where(x => x.CurrencyCode == req.CurrencyCode && x.LocalCurrency == req.LocalCurrency).Any()) { return DataResult.Failed("汇率设置已存在!", MultiLanguageConst.FeeCurrencyExchangeExist); @@ -65,17 +53,17 @@ namespace DS.WMS.Core.Fee.Method var data = req.Adapt(); - var entity = tenantDb.Insertable(data).ExecuteReturnEntity(); + var entity = TenantDb.Insertable(data).ExecuteReturnEntity(); return DataResult.Successed("添加成功!", entity.Id, MultiLanguageConst.DataCreateSuccess); } else { - var info = tenantDb.Queryable().Where(x => x.Id == req.Id).First(); + var info = TenantDb.Queryable().Where(x => x.Id == req.Id).First(); info = req.Adapt(info); - tenantDb.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); + TenantDb.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); return DataResult.Successed("更新成功!", MultiLanguageConst.DataUpdateSuccess); } } @@ -87,12 +75,87 @@ namespace DS.WMS.Core.Fee.Method /// public DataResult GetFeeCurrencyExchangeInfo(string id) { - var tenantDb = saasService.GetBizDbScopeById(user.TenantId); - var data = tenantDb.Queryable() + var data = TenantDb.Queryable() .Where(x => x.Id == long.Parse(id)) .Select() .First(); return DataResult.Success(data, MultiLanguageConst.DataQuerySuccess); } + + /// + /// 获取两种币别之间的汇率 + /// + /// 币别信息 + /// + public DataResult GetExchangeRate(ExchangeRate exchange) + { + if (exchange.CurrencyFrom == exchange.CurrencyTo) + { + exchange.ReverseRate = exchange.Rate = 1m; + return DataResult.Success(exchange); + } + + long id = long.Parse(User.OrgId); + //获取本位币,默认=人民币 + string localCurrency = Db.Queryable().Where(x => x.Id == id).Select(x => x.LocalCurrency).First() ?? RMB_CODE; + + //需要做二次转换 + if (exchange.CurrencyFrom != localCurrency && exchange.CurrencyTo != localCurrency) + { + //获取中间汇率 + var middleRate = GetLocalRate(exchange.CurrencyFrom, localCurrency, exchange.FeeType); + if (middleRate == null) + return DataResult.FailedData(exchange, message: $"尚未维护币别:{exchange.CurrencyFrom}"); + + var rate = GetLocalRate(exchange.CurrencyTo, localCurrency, exchange.FeeType); + exchange.Rate = Math.Round(1 / (rate ?? 1m) * middleRate.GetValueOrDefault(), 4, MidpointRounding.AwayFromZero); + exchange.ReverseRate = Math.Round(1 / exchange.Rate, 4, MidpointRounding.AwayFromZero); + } + else + { + string currency = exchange.CurrencyFrom == RMB_CODE ? exchange.CurrencyTo : exchange.CurrencyFrom; + var rate = GetLocalRate(currency, localCurrency, exchange.FeeType); + + if (currency == exchange.CurrencyFrom) + { + exchange.Rate = rate ?? 1m; + exchange.ReverseRate = Math.Round(1 / exchange.Rate, 4, MidpointRounding.AwayFromZero); + } + else + { + exchange.ReverseRate = rate ?? 1m; + exchange.Rate = Math.Round(1 / exchange.ReverseRate, 4, MidpointRounding.AwayFromZero); + } + } + + return DataResult.Success(exchange); + } + + + internal decimal? GetLocalRate(string currency, string localCurrency, FeeType? type) + { + var entity = TenantDb.Queryable().Where(x => + x.CodeName == currency).Includes(x => x.Exchanges).First(); + + if (entity == null) + return null; + + var rate = entity.DefaultRate; + DateTime dtNow = DateTime.Now; + if (type.HasValue && entity.Exchanges != null && entity.Exchanges.Count > 0) + { + //取当前时间范围内的最新一条,优先获取本位币 + var item = entity.Exchanges.FindAll(x => x.Status == StatusEnum.Enable && x.LocalCurrency == localCurrency && + x.StartDate >= dtNow && x.EndDate <= dtNow).OrderByDescending(x => x.CreateTime).FirstOrDefault(); + + item ??= entity.Exchanges.FindAll(x => x.Status == StatusEnum.Enable && + x.StartDate >= dtNow && x.EndDate <= dtNow).OrderByDescending(x => x.CreateTime).FirstOrDefault(); + + if (item != null) + rate = type.Value == FeeType.Receivable ? item.DRValue : item.CRValue; + } + + return rate; + } } } diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCurrencyExchangeController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCurrencyExchangeController.cs index ac0aabda..0d4dee5e 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCurrencyExchangeController.cs +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeCurrencyExchangeController.cs @@ -62,5 +62,23 @@ namespace DS.WMS.FeeApi.Controllers var res = _invokeService.GetFeeCurrencyExchangeInfo(id); return res; } + + /// + /// 获取两种币别之间的汇率 + /// + /// 原币别 + /// 目标币别 + /// 费用类型 + /// + [HttpGet, Route("GetExchangeRate")] + public DataResult GetExchangeRate([FromQuery] string currencyFrom, [FromQuery] string currencyTo, [FromQuery] FeeType? feeType) + { + return _invokeService.GetExchangeRate(new ExchangeRate + { + CurrencyFrom = currencyFrom, + CurrencyTo = currencyTo, + FeeType = feeType + }); + } } } 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 c4b85265..34c32941 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt @@ -1545,3 +1545,52 @@ 2024-06-25 17:17:52.9453 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-06-25 17:17:52.9453 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-06-25 17:17:52.9612 Info Configuration initialized. +2024-06-26 13:51:38.5103 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 13:51:38.5445 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 13:51:38.5478 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 13:51:38.5478 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-06-26 13:51:38.5677 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-06-26 13:51:38.5677 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 13:51:38.5677 Info Configuration initialized. +2024-06-26 14:12:47.4877 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 14:12:47.5208 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 14:12:47.5208 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 14:12:47.5428 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-06-26 14:12:47.5493 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-06-26 14:12:47.5493 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 14:12:47.5493 Info Configuration initialized. +2024-06-26 14:14:55.7367 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 14:14:55.7626 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 14:14:55.7626 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 14:14:55.7754 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-06-26 14:14:55.7754 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-06-26 14:14:55.7826 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 14:14:55.7826 Info Configuration initialized. +2024-06-26 14:15:51.7061 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 14:15:51.7364 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 14:15:51.7364 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 14:15:51.7364 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-06-26 14:15:51.7560 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-06-26 14:15:51.7560 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 14:15:51.7560 Info Configuration initialized. +2024-06-26 14:16:04.0317 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 14:16:04.0561 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 14:16:04.0726 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 14:16:04.0837 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-06-26 14:16:04.0837 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-06-26 14:16:04.0837 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 14:16:04.0962 Info Configuration initialized. +2024-06-26 14:26:07.1847 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 14:26:07.2139 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 14:26:07.2191 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 14:26:07.2351 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-06-26 14:26:07.2351 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-06-26 14:26:07.2351 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 14:26:07.2573 Info Configuration initialized. +2024-06-26 14:29:47.2415 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-06-26 14:29:47.3036 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-06-26 14:29:47.3135 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-06-26 14:29:47.3135 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-06-26 14:29:47.3328 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-06-26 14:29:47.3328 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-06-26 14:29:47.3328 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 a1728b25..8b359e1a 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-06-25T07:45:57.6052473Z||;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-06-26T01:45:24.4055568Z||;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