diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs index 871cd943..443ff380 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs @@ -43,7 +43,18 @@ public class FeeCodeSelectRes /// 默认付费客户类型 /// public string DefaultCredit { get; set; } - + /// + /// 默认计费标准名称 + /// + public string DefaultUnitName { get; set; } + /// + /// 默认付费客户类型名称 + /// + public string DefaultDebitName { get; set; } + /// + ///默认付费客户类型名称 + /// + public string DefaultCreditName { get; set; } /// /// 海运 海运相关模块使用 /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs index e3990324..4eb9510f 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs @@ -54,7 +54,7 @@ public class FeeRecordReq /// /// 费用对象类型 /// - public CustomerTypeEnum? CustomerType { get; set; } + public string CustomerType { get; set; } /// /// 费用标准 @@ -78,6 +78,10 @@ public class FeeRecordReq /// public string Currency { get; set; } + public string CustomerTypeText { get; set; } + public string UnitText { get; set; } + public string CurrencyText { get; set; } + /// /// 汇率 /// @@ -124,7 +128,7 @@ public class FeeRecordReq /// /// 审核人Id /// - public long AuditBy { get; set; } + public long? AuditBy { get; set; } /// /// 审核人 @@ -133,7 +137,7 @@ public class FeeRecordReq /// /// 审核日期 /// - public DateTime AuditDate { get; set; } + public DateTime? AuditDate { get; set; } /// /// 是否机密费用 diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs index 052d982e..a30e8828 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs @@ -58,9 +58,7 @@ public class FeeRecordRes /// /// 费用对象类型 /// - public CustomerTypeEnum? CustomerType { get; set; } - - public string CustomerTypeText { get { return CustomerType.HasValue ? CustomerType.Value.GetDescription() : string.Empty; } } + public string CustomerType { get; set; } /// /// 费用标准 @@ -84,6 +82,10 @@ public class FeeRecordRes /// public string Currency { get; set; } + public string CustomerTypeText { get; set; } + public string UnitText { get; set; } + public string CurrencyText { get; set; } + /// /// 汇率 /// @@ -113,6 +115,12 @@ public class FeeRecordRes /// Desc:开票金额 /// public decimal? InvoiceAmount { get; set; } = 0; + + /// + /// 未开票金额 + /// + public decimal? InvoiceAmountRest { get { return InvoiceAmount.HasValue ? Amount - InvoiceAmount.Value : null; } } + /// /// Desc:申请金额 /// @@ -130,7 +138,7 @@ public class FeeRecordRes /// /// 审核人Id /// - public long AuditBy { get; set; } + public long? AuditBy { get; set; } /// /// 审核人 @@ -139,7 +147,7 @@ public class FeeRecordRes /// /// 审核日期 /// - public DateTime AuditDate { get; set; } + public DateTime? AuditDate { get; set; } /// /// 是否机密费用 @@ -207,10 +215,20 @@ public class FeeRecordRes public decimal NoTaxAmount { get; set; } /// - /// 财务税率 + /// 财务税率 (销项税率) /// public decimal AccTaxRate { get; set; } + /// + /// 销项税额 + /// + public decimal AccTax { get { return Amount.GetValueOrDefault() * AccTaxRate; } } + + /// + /// 销项金额 + /// + public decimal AccTaxValue { get { return Amount.GetValueOrDefault() - AccTax; } } + /// /// 是否生成凭证 /// @@ -310,9 +328,18 @@ public class FeeRecordRes /// public string Note { get; set; } = ""; + /// + /// 修改人 + /// + public long? UpdateBy { get; set; } + + /// + /// 修改人名字 + /// + public string UpdateByName { get; set; } /// /// 创建时间 /// - public DateTime CreateTime { get; set; } + public DateTime UpdateTime { get; set; } } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeStatistics.cs b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeStatistics.cs new file mode 100644 index 00000000..2a94e53c --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeStatistics.cs @@ -0,0 +1,225 @@ +using DS.WMS.Core.Fee.Entity; + +namespace DS.WMS.Core.Fee.Dtos +{ + /// + /// 费用汇总统计模型 + /// + public class FeeStatistics + { + readonly IEnumerable _source; + + /// + /// 使用指定的数据源初始化统计。 + /// + /// 数据源 + public FeeStatistics(IEnumerable source) + { + _source = source; + + //合计 + ReceivableTotal = _source.Where(x => x.FeeType == 1).Sum(x => x.Amount).GetValueOrDefault(); + PayableTotal = _source.Where(x => x.FeeType == 2).Sum(x => x.Amount).GetValueOrDefault(); + NoTaxReceivableTotal = _source.Where(x => x.FeeType == 1).Sum(x => x.NoTaxAmount); + NoTaxPayableTotal = _source.Where(x => x.FeeType == 2).Sum(x => x.NoTaxAmount); + + //人民币 + ReceivableCNY = _source.Where(x => x.FeeType == 1 && x.Currency == "CNY").Sum(x => x.Amount).GetValueOrDefault(); + PayableCNY = _source.Where(x => x.FeeType == 2 && x.Currency == "CNY").Sum(x => x.Amount).GetValueOrDefault(); + NoTaxReceivableCNY = _source.Where(x => x.FeeType == 1 && x.Currency == "CNY").Sum(x => x.NoTaxAmount); + NoTaxPayableCNY = _source.Where(x => x.FeeType == 2 && x.Currency == "CNY").Sum(x => x.NoTaxAmount); + + //美元 + ReceivableUSD = _source.Where(x => x.FeeType == 1 && x.Currency == "USD").Sum(x => x.Amount).GetValueOrDefault(); + PayableUSD = _source.Where(x => x.FeeType == 2 && x.Currency == "USD").Sum(x => x.Amount).GetValueOrDefault(); + NoTaxReceivableUSD = _source.Where(x => x.FeeType == 1 && x.Currency == "USD").Sum(x => x.NoTaxAmount); + NoTaxPayableUSD = _source.Where(x => x.FeeType == 2 && x.Currency == "USD").Sum(x => x.NoTaxAmount); + + //其他 + ReceivableOther = _source.Where(x => x.FeeType == 1 && x.Currency != "USD" && x.Currency != "CNY").Sum(x => x.Amount).GetValueOrDefault(); + PayableOther = _source.Where(x => x.FeeType == 2 && x.Currency == "USD" && x.Currency != "CNY").Sum(x => x.Amount).GetValueOrDefault(); + NoTaxReceivableOther = _source.Where(x => x.FeeType == 1 && x.Currency == "USD" && x.Currency != "CNY").Sum(x => x.NoTaxAmount); + NoTaxPayableOther = _source.Where(x => x.FeeType == 2 && x.Currency == "USD" && x.Currency != "CNY").Sum(x => x.NoTaxAmount); + + //按客户统计 + ByCustomers = (from s in _source + group s by s.CustomerName into g + select new CustomerFeeStatistics + { + CustomerName = g.Key, + ReceivableTotal = g.Where(x => x.FeeType == 1).Sum(x => x.Amount).GetValueOrDefault(), + PayableTotal = g.Where(x => x.FeeType == 2).Sum(x => x.Amount).GetValueOrDefault(), + ReceivableCNY = g.Where(x => x.FeeType == 1 && x.Currency == "CNY").Sum(x => x.Amount).GetValueOrDefault(), + PayableCNY = g.Where(x => x.FeeType == 2 && x.Currency == "CNY").Sum(x => x.Amount).GetValueOrDefault(), + ReceivableUSD = g.Where(x => x.FeeType == 1 && x.Currency == "USD").Sum(x => x.Amount).GetValueOrDefault(), + PayableUSD = g.Where(x => x.FeeType == 2 && x.Currency == "USD").Sum(x => x.Amount).GetValueOrDefault() + }).ToList(); + } + + /// + /// 应收款总计 + /// + public virtual decimal ReceivableTotal { get; private set; } + + /// + /// 不含税应收款总计 + /// + public virtual decimal NoTaxReceivableTotal { get; private set; } + + /// + /// 应付款总计 + /// + public virtual decimal PayableTotal { get; private set; } + + /// + /// 不含税应付款总计 + /// + public virtual decimal NoTaxPayableTotal { get; private set; } + + /// + /// 利润总计 + /// + public decimal ProfitTotal { get { return ReceivableTotal - PayableTotal; } } + + /// + /// 不含税利润总计 + /// + public decimal NoTaxProfitTotal { get { return NoTaxReceivableTotal - NoTaxPayableTotal; } } + + /// + /// 人民币应收款 + /// + public virtual decimal ReceivableCNY { get; private set; } + + /// + /// 不含税人民币应收款 + /// + public virtual decimal NoTaxReceivableCNY { get; private set; } + + /// + /// 人民币应付款 + /// + public virtual decimal PayableCNY { get; private set; } + + /// + /// 不含税人民币应付款 + /// + public virtual decimal NoTaxPayableCNY { get; private set; } + + /// + /// 人民币利润 + /// + public decimal ProfitCNY { get { return ReceivableCNY - PayableCNY; } } + + /// + /// 不含税人民币利润 + /// + public decimal NoTaxProfitCNY { get { return NoTaxReceivableCNY - NoTaxPayableCNY; } } + + /// + /// 美元应收款 + /// + public virtual decimal ReceivableUSD { get; private set; } + + /// + /// 不含税美元应收款 + /// + public virtual decimal NoTaxReceivableUSD { get; private set; } + + /// + /// 美元应付款 + /// + public virtual decimal PayableUSD { get; private set; } + + /// + /// 不含税美元应付款 + /// + public virtual decimal NoTaxPayableUSD { get; private set; } + + /// + /// 美元利润 + /// + public decimal ProfitUSD { get { return ReceivableUSD - PayableUSD; } } + + /// + /// 不含税美元利润 + /// + public decimal NoTaxProfitUSD { get { return NoTaxReceivableUSD - NoTaxPayableUSD; } } + + /// + /// 其他币种应收款 + /// + public virtual decimal ReceivableOther { get; private set; } + + /// + /// 不含税其他币种应收款 + /// + public virtual decimal NoTaxReceivableOther { get; private set; } + + /// + /// 其他币种应付款 + /// + public virtual decimal PayableOther { get; private set; } + + /// + /// 不含税其他币种应付款 + /// + public virtual decimal NoTaxPayableOther { get; private set; } + + /// + /// 其他币种利润 + /// + public decimal ProfitOther { get { return ReceivableOther - PayableOther; } } + + /// + /// 不含税其他币种利润 + /// + public decimal NoTaxProfitOther { get { return NoTaxReceivableOther - NoTaxPayableOther; } } + + /// + /// 按客户统计 + /// + public List ByCustomers { get; private set; } + } + + /// + /// 费用记录按客户统计 + /// + public class CustomerFeeStatistics + { + /// + /// 客户名称 + /// + public string CustomerName { get; set; } + + /// + /// 应收款总计 + /// + public virtual decimal ReceivableTotal { get; set; } + + /// + /// 应付款总计 + /// + public virtual decimal PayableTotal { get; set; } + + /// + /// 人民币应收款 + /// + public virtual decimal ReceivableCNY { get; set; } + + /// + /// 人民币应付款 + /// + public virtual decimal PayableCNY { get; set; } + + /// + /// 美元应收款 + /// + public virtual decimal ReceivableUSD { get; set; } + + /// + /// 美元应付款 + /// + public virtual decimal PayableUSD { get; set; } + } +} diff --git a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs index de31ea46..1546a915 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs @@ -59,16 +59,27 @@ namespace DS.WMS.Core.Fee.Entity public long CustomerId { get; set; } /// - /// 客户类型 + /// 客户类别 /// - [SugarColumn(ColumnDescription = "客户类型", IsNullable = true)] - public CustomerTypeEnum? CustomerType { get; set; } + [SugarColumn(ColumnDescription = "客户类别", Length = 50, IsNullable = true)] + public string CustomerType { get; set; } + /// + /// 客户类别文本 + /// + [SugarColumn(ColumnDescription = "客户类别文本", Length = 50, IsNullable = true)] + public string CustomerTypeText { get; set; } /// /// 费用标准 /// [SugarColumn(ColumnDescription = "费用标准", Length = 20, IsNullable = true)] public string Unit { get; set; } + /// + /// 费用标准文本 + /// + [SugarColumn(ColumnDescription = "费用标准文本", Length = 50, IsNullable = true)] + public string UnitText { get; set; } + /// /// 单价 /// @@ -89,7 +100,13 @@ namespace DS.WMS.Core.Fee.Entity /// 币别 /// [SugarColumn(ColumnDescription = "币别", Length = 20)] - public string Currency { get; set; } = "RMB"; + public string Currency { get; set; } + /// + /// 币别文本 + /// + [SugarColumn(ColumnDescription = "币别文本", Length = 50, IsNullable = true)] + public string CurrencyText { get; set; } + /// /// 汇率 @@ -147,7 +164,7 @@ namespace DS.WMS.Core.Fee.Entity /// 审核人Id /// [SugarColumn(ColumnDescription = "审核人Id")] - public long AuditBy { get; set; } + public long? AuditBy { get; set; } /// /// 审核人 diff --git a/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeRecordService.cs b/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeRecordService.cs index 33038463..574e31d8 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeRecordService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeRecordService.cs @@ -13,6 +13,13 @@ public interface IFeeRecordService /// DataResult> GetListByPage(PageRequest request); + /// + /// 列表 + /// + /// 查询条件 + /// + DataResult> GetList(string query); + /// /// 提交 /// @@ -29,6 +36,13 @@ public interface IFeeRecordService /// DataResult CreateByTemplate(long bid, params long[] tidArray); + /// + /// 根据费用明细转换为模板明细 + /// + /// 费用明细ID + /// + DataResult> ReadAsTemplate(params long[] idArray); + /// /// 删除 /// diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs index 4796e535..4b978bd1 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs @@ -6,6 +6,7 @@ using DS.Module.UserModule; 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 Mapster; using Microsoft.Extensions.DependencyInjection; using SqlSugar; @@ -14,7 +15,7 @@ namespace DS.WMS.Core.Fee.Method { public class FeeRecordService : IFeeRecordService { - readonly string DefaultCurrency = "RMB"; + readonly string DefaultCurrency = "CNY"; private readonly IServiceProvider _serviceProvider; private readonly ISqlSugarClient db; @@ -42,10 +43,43 @@ namespace DS.WMS.Core.Fee.Method var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition); var data = tenantDb.Queryable() .Where(whereList) - .Select().ToQueryPage(request.PageCondition); + .Select() + .ToQueryPage(request.PageCondition); + + //关联用户名称 + var userIds = data.Data.Where(x => x.UpdateBy.HasValue).Select(x => x.UpdateBy.Value).Distinct().ToList(); + var users = db.Queryable().Where(x => userIds.Contains(x.Id)).Select(x => new { x.Id, x.UserName }).ToList(); + foreach (var item in data.Data) + { + if (item.UpdateBy.HasValue) + { + item.UpdateByName = users.Find(x => x.Id == item.UpdateBy.Value)?.UserName; + } + } + return data; } + /// + /// 列表 + /// + /// + /// + public DataResult> GetList(string query) + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var src = tenantDb.Queryable(); + if (!query.IsNullOrEmpty()) + { + //序列化查询条件 + var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(query); + src = src.Where(whereList); + } + + var data = src.ToList(); + return new DataResult>(ResultCode.Success) { Data = data }; + } + /// /// 提交 /// @@ -58,10 +92,12 @@ namespace DS.WMS.Core.Fee.Method try { tenantDb.Ado.BeginTran(); + DateTime dtNow = DateTime.Now; foreach (var item in items) { item.BusinessId = bid; item.FeeStatus = FeeStatusEnum.Entering; + item.SubmitDate = dtNow; if (item.Id == 0) { @@ -69,7 +105,16 @@ namespace DS.WMS.Core.Fee.Method } else { - tenantDb.Updateable(item).ExecuteCommand(); + tenantDb.Updateable(item).IgnoreColumns(x => new + { + x.FeeStatus, + x.CreateBy, + x.CreateTime, + x.BusinessId, + x.DeleteBy, + x.Deleted, + x.DeleteTime + }).ExecuteCommand(); } } tenantDb.Ado.CommitTran(); @@ -137,13 +182,13 @@ namespace DS.WMS.Core.Fee.Method } //若计价货币单位不等于默认货币则尝试获取最新汇率 - var exDetails = records.FindAll(x => !x.ExchangeRate.HasValue && x.Currency != DefaultCurrency); - if (exDetails.Count > 0) + var exRecords = records.FindAll(x => !x.ExchangeRate.HasValue && x.Currency != DefaultCurrency); + if (exRecords.Count > 0) { - var codes = exDetails.Select(x => x.Currency).Distinct().ToList(); + var codes = exRecords.Select(x => x.Currency).Distinct().ToList(); var currencies = tenantDb.Queryable().Where(x => codes.Contains(x.CodeName)).Includes(x => x.Exchanges).ToList(); DateTime dtNow = DateTime.Now; - foreach (var item in exDetails) + foreach (var item in exRecords) { var currency = currencies.Find(x => x.CodeName == item.Currency); if (currency != null) @@ -156,9 +201,7 @@ namespace DS.WMS.Core.Fee.Method x.StartDate >= dtNow && x.EndDate <= dtNow).OrderByDescending(x => x.UpdateTime).FirstOrDefault(); if (exchange != null) - { item.ExchangeRate = item.FeeType == 1 ? exchange.DRValue : exchange.CRValue; - } } } } @@ -168,6 +211,18 @@ namespace DS.WMS.Core.Fee.Method return result > 0 ? DataResult.Successed("保存成功", records, MultiLanguageConst.DataCreateSuccess) : DataResult.Successed("操作失败!", MultiLanguageConst.Operation_Failed); } + /// + /// 根据费用明细转换为模板明细 + /// + /// 费用明细ID + /// + public DataResult> ReadAsTemplate(params long[] idArray) + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var list = tenantDb.Queryable().Where(x => idArray.Contains(x.Id)).Select().ToList(); + return new DataResult>(ResultCode.Success) { Data = list }; + } + /// /// 删除（录入状态） /// diff --git a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs index 45ed4c90..aa7a3c0f 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs +++ b/ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs @@ -37,6 +37,33 @@ namespace DS.WMS.FeeApi.Controllers return res; } + /// + /// 根据指定的查询条件获取统计信息 + /// + /// 查询条件 + /// + [HttpPost, Route("FeeStatistics")] + public DataResult FeeStatistics([FromBody] string query) + { + var res = _invokeService.GetList(query); + if (!res.Succeeded) + return DataResult.Error(res.Message); + + var stat = new FeeStatistics(res.Data); + return DataResult.Success(stat); + } + + /// + /// 根据费用明细转换为模板明细 + /// + /// 费用明细ID + /// + //[HttpGet, Route("ReadAsTemplate")] + //public DataResult> ReadAsTemplate(params long[] idArray) + //{ + + //} + /// /// 提交费用 /// 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 6b18922b..280adbab 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt @@ -145,3 +145,38 @@ 2024-05-21 16:09:52.7043 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-05-21 16:09:52.7043 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-05-21 16:09:52.7043 Info Configuration initialized. +2024-05-22 11:39:40.1451 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-05-22 11:39:40.1451 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-05-22 11:39:40.1571 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-05-22 11:39:40.1571 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-05-22 11:39:40.1734 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-05-22 11:39:40.1734 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-05-22 11:39:40.1734 Info Configuration initialized. +2024-05-22 11:47:05.3022 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-05-22 11:47:05.3022 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-05-22 11:47:05.3146 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-05-22 11:47:05.3146 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-05-22 11:47:05.3277 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-05-22 11:47:05.3277 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-05-22 11:47:05.3277 Info Configuration initialized. +2024-05-22 15:03:15.9626 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-05-22 15:03:15.9730 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-05-22 15:03:15.9730 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-05-22 15:03:15.9861 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-05-22 15:03:15.9861 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-05-22 15:03:15.9861 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-05-22 15:03:15.9861 Info Configuration initialized. +2024-05-22 15:06:38.3138 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-05-22 15:06:38.3138 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-05-22 15:06:38.3138 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-05-22 15:06:38.3343 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-05-22 15:06:38.3343 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-05-22 15:06:38.3343 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-05-22 15:06:38.3462 Info Configuration initialized. +2024-05-22 15:10:43.9722 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-05-22 15:10:43.9850 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-05-22 15:10:43.9850 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-05-22 15:10:43.9850 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-05-22 15:10:44.0059 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-05-22 15:10:44.0059 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-05-22 15:10:44.0059 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 83d6dfd9..20492d7c 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-05-21T09:13:36.4091775Z;True|2024-05-21T14:41:18.8486299+08:00;True|2024-05-21T11:04:27.3649637+08:00; + True|2024-05-22T05:29:02.1355808Z||;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 diff --git a/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user new file mode 100644 index 00000000..bf592b7b --- /dev/null +++ b/ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user @@ -0,0 +1,6 @@ + + + + D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile1.pubxml + + \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml b/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml new file mode 100644 index 00000000..f6f29431 --- /dev/null +++ b/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml @@ -0,0 +1,17 @@ + + + + + false + false + true + Release + Any CPU + FileSystem + D:\Publish\DS8\Main + FileSystem + <_TargetId>Folder + + \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml.user new file mode 100644 index 00000000..25157a6e --- /dev/null +++ b/ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -0,0 +1,11 @@ + + + + + <_PublishTargetUrl>D:\Publish\DS8\Main + True|2024-05-21T09:32:52.9294009Z; + + + \ No newline at end of file