完善费用录入列表字段

ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeCodeSelectRes.cs

@@ -43,7 +43,18 @@ public class FeeCodeSelectRes
     /// 默认付费客户类型
     /// </summary>
     public string DefaultCredit { get; set; }
-
+    /// <summary>
+    /// 默认计费标准名称
+    /// </summary>
+    public string DefaultUnitName { get; set; }
+    /// <summary>
+    /// 默认付费客户类型名称
+    /// </summary>
+    public string DefaultDebitName { get; set; }
+    /// <summary>
+    ///默认付费客户类型名称
+    /// </summary>
+    public string DefaultCreditName { get; set; }
     /// <summary>
     /// 海运 海运相关模块使用
     /// </summary>

ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordReq.cs

@@ -54,7 +54,7 @@ public class FeeRecordReq
     /// <summary>
     /// 费用对象类型
     /// </summary>
-    public CustomerTypeEnum? CustomerType { get; set; }
+    public string CustomerType { get; set; }
 
     /// <summary>
     /// 费用标准
@@ -78,6 +78,10 @@ public class FeeRecordReq
     /// </summary>
     public string Currency { get; set; }
 
+    public string CustomerTypeText { get; set; }
+    public string UnitText { get; set; }
+    public string CurrencyText { get; set; }
+
     /// <summary>
     /// 汇率
     /// </summary>
@@ -124,7 +128,7 @@ public class FeeRecordReq
     /// <summary>
     /// 审核人Id
     /// </summary>
-    public long AuditBy { get; set; }
+    public long? AuditBy { get; set; }
 
     /// <summary>
     /// 审核人
@@ -133,7 +137,7 @@ public class FeeRecordReq
     /// <summary>
     /// 审核日期
     /// </summary>
-    public DateTime AuditDate { get; set; }
+    public DateTime? AuditDate { get; set; }
 
     /// <summary>
     /// 是否机密费用

ds-wms-service/DS.WMS.Core/Fee/Dtos/FeeRecordRes.cs

@@ -58,9 +58,7 @@ public class FeeRecordRes
     /// <summary>
     /// 费用对象类型
     /// </summary>
-    public CustomerTypeEnum? CustomerType { get; set; }
+    public string CustomerType { get; set; }
-
-    public string CustomerTypeText { get { return CustomerType.HasValue ? CustomerType.Value.GetDescription() : string.Empty; } }
 
     /// <summary>
     /// 费用标准
@@ -84,6 +82,10 @@ public class FeeRecordRes
     /// </summary>
     public string Currency { get; set; }
 
+    public string CustomerTypeText { get; set; }
+    public string UnitText { get; set; }
+    public string CurrencyText { get; set; }
+
     /// <summary>
     /// 汇率
     /// </summary>
@@ -113,6 +115,12 @@ public class FeeRecordRes
     /// Desc:开票金额
     /// </summary>
     public decimal? InvoiceAmount { get; set; } = 0;
+
+    /// <summary>
+    /// 未开票金额
+    /// </summary>
+    public decimal? InvoiceAmountRest { get { return InvoiceAmount.HasValue ? Amount - InvoiceAmount.Value : null; } }
+
     /// <summary>
     /// Desc:申请金额
     /// </summary>
@@ -130,7 +138,7 @@ public class FeeRecordRes
     /// <summary>
     /// 审核人Id
     /// </summary>
-    public long AuditBy { get; set; }
+    public long? AuditBy { get; set; }
 
     /// <summary>
     /// 审核人
@@ -139,7 +147,7 @@ public class FeeRecordRes
     /// <summary>
     /// 审核日期
     /// </summary>
-    public DateTime AuditDate { get; set; }
+    public DateTime? AuditDate { get; set; }
 
     /// <summary>
     /// 是否机密费用
@@ -207,10 +215,20 @@ public class FeeRecordRes
     public decimal NoTaxAmount { get; set; }
 
     /// <summary>
-    /// 财务税率 
+    /// 财务税率 (销项税率)
     /// </summary>
     public decimal AccTaxRate { get; set; }
 
+    /// <summary>
+    /// 销项税额
+    /// </summary>
+    public decimal AccTax { get { return Amount.GetValueOrDefault() * AccTaxRate; } }
+
+    /// <summary>
+    /// 销项金额
+    /// </summary>
+    public decimal AccTaxValue { get { return Amount.GetValueOrDefault() - AccTax; } }
+
     /// <summary>
     /// 是否生成凭证 
     /// </summary>
@@ -310,9 +328,18 @@ public class FeeRecordRes
     /// </summary>
     public string Note { get; set; } = "";
 
+    /// <summary>
+    /// 修改人
+    /// </summary>
+    public long? UpdateBy { get; set; }
+
+    /// <summary>
+    /// 修改人名字
+    /// </summary>
+    public string UpdateByName { get; set; }
 
     /// <summary>
     /// 创建时间
     /// </summary>
-    public DateTime CreateTime { get; set; }
+    public DateTime UpdateTime { get; set; }
 }

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
+{
+    /// <summary>
+    /// 费用汇总统计模型
+    /// </summary>
+    public class FeeStatistics
+    {
+        readonly IEnumerable<FeeRecord> _source;
+
+        /// <summary>
+        /// 使用指定的数据源初始化统计。
+        /// </summary>
+        /// <param name="source">数据源</param>
+        public FeeStatistics(IEnumerable<FeeRecord> 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();
+        }
+
+        /// <summary>
+        /// 应收款总计
+        /// </summary>
+        public virtual decimal ReceivableTotal { get; private set; }
+
+        /// <summary>
+        /// 不含税应收款总计
+        /// </summary>
+        public virtual decimal NoTaxReceivableTotal { get; private set; }
+
+        /// <summary>
+        /// 应付款总计
+        /// </summary>
+        public virtual decimal PayableTotal { get; private set; }
+
+        /// <summary>
+        /// 不含税应付款总计
+        /// </summary>
+        public virtual decimal NoTaxPayableTotal { get; private set; }
+
+        /// <summary>
+        /// 利润总计
+        /// </summary>
+        public decimal ProfitTotal { get { return ReceivableTotal - PayableTotal; } }
+
+        /// <summary>
+        /// 不含税利润总计
+        /// </summary>
+        public decimal NoTaxProfitTotal { get { return NoTaxReceivableTotal - NoTaxPayableTotal; } }
+
+        /// <summary>
+        /// 人民币应收款
+        /// </summary>
+        public virtual decimal ReceivableCNY { get; private set; }
+
+        /// <summary>
+        /// 不含税人民币应收款
+        /// </summary>
+        public virtual decimal NoTaxReceivableCNY { get; private set; }
+
+        /// <summary>
+        /// 人民币应付款
+        /// </summary>
+        public virtual decimal PayableCNY { get; private set; }
+
+        /// <summary>
+        /// 不含税人民币应付款
+        /// </summary>
+        public virtual decimal NoTaxPayableCNY { get; private set; }
+
+        /// <summary>
+        /// 人民币利润
+        /// </summary>
+        public decimal ProfitCNY { get { return ReceivableCNY - PayableCNY; } }
+
+        /// <summary>
+        /// 不含税人民币利润
+        /// </summary>
+        public decimal NoTaxProfitCNY { get { return NoTaxReceivableCNY - NoTaxPayableCNY; } }
+
+        /// <summary>
+        /// 美元应收款
+        /// </summary>
+        public virtual decimal ReceivableUSD { get; private set; }
+
+        /// <summary>
+        /// 不含税美元应收款
+        /// </summary>
+        public virtual decimal NoTaxReceivableUSD { get; private set; }
+
+        /// <summary>
+        /// 美元应付款
+        /// </summary>
+        public virtual decimal PayableUSD { get; private set; }
+
+        /// <summary>
+        /// 不含税美元应付款
+        /// </summary>
+        public virtual decimal NoTaxPayableUSD { get; private set; }
+
+        /// <summary>
+        /// 美元利润
+        /// </summary>
+        public decimal ProfitUSD { get { return ReceivableUSD - PayableUSD; } }
+
+        /// <summary>
+        /// 不含税美元利润
+        /// </summary>
+        public decimal NoTaxProfitUSD { get { return NoTaxReceivableUSD - NoTaxPayableUSD; } }
+
+        /// <summary>
+        /// 其他币种应收款
+        /// </summary>
+        public virtual decimal ReceivableOther { get; private set; }
+
+        /// <summary>
+        /// 不含税其他币种应收款
+        /// </summary>
+        public virtual decimal NoTaxReceivableOther { get; private set; }
+
+        /// <summary>
+        /// 其他币种应付款
+        /// </summary>
+        public virtual decimal PayableOther { get; private set; }
+
+        /// <summary>
+        /// 不含税其他币种应付款
+        /// </summary>
+        public virtual decimal NoTaxPayableOther { get; private set; }
+
+        /// <summary>
+        /// 其他币种利润
+        /// </summary>
+        public decimal ProfitOther { get { return ReceivableOther - PayableOther; } }
+
+        /// <summary>
+        /// 不含税其他币种利润
+        /// </summary>
+        public decimal NoTaxProfitOther { get { return NoTaxReceivableOther - NoTaxPayableOther; } }
+
+        /// <summary>
+        /// 按客户统计
+        /// </summary>
+        public List<CustomerFeeStatistics> ByCustomers { get; private set; }
+    }
+
+    /// <summary>
+    /// 费用记录按客户统计
+    /// </summary>
+    public class CustomerFeeStatistics
+    {
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string CustomerName { get; set; }
+
+        /// <summary>
+        /// 应收款总计
+        /// </summary>
+        public virtual decimal ReceivableTotal { get; set; }
+
+        /// <summary>
+        /// 应付款总计
+        /// </summary>
+        public virtual decimal PayableTotal { get; set; }
+
+        /// <summary>
+        /// 人民币应收款
+        /// </summary>
+        public virtual decimal ReceivableCNY { get; set; }
+
+        /// <summary>
+        /// 人民币应付款
+        /// </summary>
+        public virtual decimal PayableCNY { get; set; }
+
+        /// <summary>
+        /// 美元应收款
+        /// </summary>
+        public virtual decimal ReceivableUSD { get; set; }
+
+        /// <summary>
+        /// 美元应付款
+        /// </summary>
+        public virtual decimal PayableUSD { get; set; }
+    }
+}

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; }
 
         /// <summary>
-        /// 客户类型
+        /// 客户类别
         /// </summary>
-        [SugarColumn(ColumnDescription = "客户类型", IsNullable = true)]
+        [SugarColumn(ColumnDescription = "客户类别", Length = 50, IsNullable = true)]
-        public CustomerTypeEnum? CustomerType { get; set; }
+        public string CustomerType { get; set; }
+        /// <summary>
+        /// 客户类别文本
+        /// </summary>
+        [SugarColumn(ColumnDescription = "客户类别文本", Length = 50, IsNullable = true)]
+        public string CustomerTypeText { get; set; }
 
         /// <summary>
         /// 费用标准
         /// </summary>
         [SugarColumn(ColumnDescription = "费用标准", Length = 20, IsNullable = true)]
         public string Unit { get; set; }
+        /// <summary>
+        /// 费用标准文本
+        /// </summary>
+        [SugarColumn(ColumnDescription = "费用标准文本", Length = 50, IsNullable = true)]
+        public string UnitText { get; set; }
+
         /// <summary>
         /// 单价
         /// </summary>
@@ -89,7 +100,13 @@ namespace DS.WMS.Core.Fee.Entity
         /// 币别
         /// </summary>
         [SugarColumn(ColumnDescription = "币别", Length = 20)]
-        public string Currency { get; set; } = "RMB";
+        public string Currency { get; set; }
+        /// <summary>
+        /// 币别文本
+        /// </summary>
+        [SugarColumn(ColumnDescription = "币别文本", Length = 50, IsNullable = true)]
+        public string CurrencyText { get; set; }
+
 
         /// <summary>
         /// 汇率
@@ -147,7 +164,7 @@ namespace DS.WMS.Core.Fee.Entity
         /// 审核人Id
         /// </summary>
         [SugarColumn(ColumnDescription = "审核人Id")]
-        public long AuditBy { get; set; }
+        public long? AuditBy { get; set; }
 
         /// <summary>
         /// 审核人

ds-wms-service/DS.WMS.Core/Fee/Interface/IFeeRecordService.cs

@@ -13,6 +13,13 @@ public interface IFeeRecordService
     /// <returns></returns>
     DataResult<List<FeeRecordRes>> GetListByPage(PageRequest request);
 
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="query">查询条件</param>
+    /// <returns></returns>
+    DataResult<List<FeeRecord>> GetList(string query);
+
     /// <summary>
     /// 提交
     /// </summary>
@@ -29,6 +36,13 @@ public interface IFeeRecordService
     /// <returns></returns>
     DataResult CreateByTemplate(long bid, params long[] tidArray);
 
+    /// <summary>
+    /// 根据费用明细转换为模板明细
+    /// </summary>
+    /// <param name="idArray">费用明细ID</param>
+    /// <returns></returns>
+    DataResult<List<FeeTemplateDetailRes>> ReadAsTemplate(params long[] idArray);
+
     /// <summary>
     /// 删除
     /// </summary>

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<FeeRecord>()
                 .Where(whereList)
-                .Select<FeeRecordRes>().ToQueryPage(request.PageCondition);
+                .Select<FeeRecordRes>()
+                .ToQueryPage(request.PageCondition);
+
+            //关联用户名称
+            var userIds = data.Data.Where(x => x.UpdateBy.HasValue).Select(x => x.UpdateBy.Value).Distinct().ToList();
+            var users = db.Queryable<SysUser>().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;
         }
 
+        /// <summary>
+        /// 列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public DataResult<List<FeeRecord>> GetList(string query)
+        {
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+            var src = tenantDb.Queryable<FeeRecord>();
+            if (!query.IsNullOrEmpty())
+            {
+                //序列化查询条件
+                var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(query);
+                src = src.Where(whereList);
+            }
+
+            var data = src.ToList();
+            return new DataResult<List<FeeRecord>>(ResultCode.Success) { Data = data };
+        }
+
         /// <summary>
         /// 提交
         /// </summary>
@@ -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);
+            var exRecords = records.FindAll(x => !x.ExchangeRate.HasValue && x.Currency != DefaultCurrency);
-            if (exDetails.Count > 0)
+            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<FeeCurrency>().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);
         }
 
+        /// <summary>
+        /// 根据费用明细转换为模板明细
+        /// </summary>
+        /// <param name="idArray">费用明细ID</param>
+        /// <returns></returns>
+        public DataResult<List<FeeTemplateDetailRes>> ReadAsTemplate(params long[] idArray)
+        {
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+            var list = tenantDb.Queryable<FeeRecord>().Where(x => idArray.Contains(x.Id)).Select<FeeTemplateDetailRes>().ToList();
+            return new DataResult<List<FeeTemplateDetailRes>>(ResultCode.Success) { Data = list };
+        }
+
         /// <summary>
         /// 删除（录入状态）
         /// </summary>

ds-wms-service/DS.WMS.FeeApi/Controllers/FeeRecordController.cs

@@ -37,6 +37,33 @@ namespace DS.WMS.FeeApi.Controllers
             return res;
         }
 
+        /// <summary>
+        /// 根据指定的查询条件获取统计信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        [HttpPost, Route("FeeStatistics")]
+        public DataResult<FeeStatistics> FeeStatistics([FromBody] string query)
+        {
+            var res = _invokeService.GetList(query);
+            if (!res.Succeeded)
+                return DataResult<FeeStatistics>.Error(res.Message);
+
+            var stat = new FeeStatistics(res.Data);
+            return DataResult<FeeStatistics>.Success(stat);
+        }
+
+        /// <summary>
+        /// 根据费用明细转换为模板明细
+        /// </summary>
+        /// <param name="idArray">费用明细ID</param>
+        /// <returns></returns>
+        //[HttpGet, Route("ReadAsTemplate")]
+        //public DataResult<List<FeeTemplateDetailRes>> ReadAsTemplate(params long[] idArray)
+        //{
+
+        //}
+
         /// <summary>
         /// 提交费用
         /// </summary>

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.

ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl>
-    <History>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;</History>
+    <History>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||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
+  </PropertyGroup>
+</Project>

ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>D:\Publish\DS8\Main</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <_TargetId>Folder</_TargetId>
+  </PropertyGroup>
+</Project>

ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <_PublishTargetUrl>D:\Publish\DS8\Main</_PublishTargetUrl>
+    <History>True|2024-05-21T09:32:52.9294009Z;</History>
+    <LastFailureDetails />
+  </PropertyGroup>
+</Project>