Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

# Conflicts:
#	ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile.pubxml.user

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

@@ -1,14 +1,18 @@
-using DS.Module.Core.Enums;
-using SqlSugar;
+using DS.Module.Core;
+using System.Runtime.Serialization;
+using DS.Module.Core.Enums;
+using DS.WMS.Core.Op.Entity;
 
 namespace DS.WMS.Core.Fee.Dtos
 {
+    /// <summary>
+    /// 费用申请单
+    /// </summary>
     public class FeeApplicationDto
     {
         /// <summary>
         /// 申请单编号
         /// </summary>
-        [SugarColumn(ColumnDescription = "申请单编号", IsNullable = false, Length = 20)]
         public string ApplicationNO { get; set; }
 
         /// <summary>
@@ -29,12 +33,12 @@ namespace DS.WMS.Core.Fee.Dtos
         /// <summary>
         /// 申请币别
         /// </summary>
-        public string Currency { get; set; }
+        public string? Currency { get; set; }
 
         /// <summary>
         /// 折算汇率
         /// </summary>
-        public decimal ExchangeRate { get; set; }
+        public decimal? ExchangeRate { get; set; }
 
         /// <summary>
         /// 审核人
@@ -44,7 +48,6 @@ namespace DS.WMS.Core.Fee.Dtos
         /// <summary>
         /// 审核人名称
         /// </summary>
-        [SugarColumn(ColumnDescription = "审核人名称")]
         public string? AuditerName { get; set; }
 
         /// <summary>
@@ -160,5 +163,154 @@ namespace DS.WMS.Core.Fee.Dtos
         public long CreateBy { get; set; }
 
         public string CreateByName { get; set; }
+
+        public List<FeeApplicationDetailDto>? Details { get; set; }
+    }
+
+    /// <summary>
+    /// 费用申请单明细
+    /// </summary>
+    public class FeeApplicationDetailDto
+    {
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        [IgnoreDataMember]
+        public long BusinessId { get; set; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        [IgnoreDataMember]
+        public BusinessType BusinessType { get; set; }
+
+        /// <summary>
+        /// 主提单号
+        /// </summary>
+        public string? MBLNO { get; set; }
+
+        /// <summary>
+        /// 委托编号
+        /// </summary>
+        public string? CustomerNo { get; set; }
+
+        /// <summary>
+        /// 委托单位
+        /// </summary>
+        public string? CustomerName { get; set; }
+
+        /// <summary>
+        /// 业务锁定
+        /// </summary>
+        public bool? IsBusinessLocking { get; set; }
+        /// <summary>
+        /// 费用锁定
+        /// </summary>
+        public bool? IsFeeLocking { get; set; }
+
+        /// <summary>
+        /// 开船日期
+        /// </summary>
+        public DateTime? ETD { get; set; }
+
+        /// <summary>
+        /// 业务来源
+        /// </summary>
+        public string? SourceName { get; set; }
+
+        /// <summary>
+        /// 揽货人
+        /// </summary>
+        public string? SaleName { get; set; }
+
+        /// <summary>
+        /// 集装箱
+        /// </summary>
+        public string? CntrTotal { get; set; }
+
+        /// <summary>
+        /// 会计期间
+        /// </summary>
+        public string? AccountDate { get; set; }
+
+        /// <summary>
+        /// 所属分部
+        /// </summary>
+        public string? SaleDeptName { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string? FeeName { get; set; }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public FeeType FeeType { get; set; }
+
+        /// <summary>
+        /// 费用对象
+        /// </summary>
+        public string? FeeObject { get; set; }
+
+        /// <summary>
+        /// 申请金额
+        /// </summary>
+        public decimal Amount { get; set; }
+
+        /// <summary>
+        /// 原始币别
+        /// </summary>
+        public string OriginalCurrency { get; set; }
+
+        /// <summary>
+        /// 原始汇率
+        /// </summary>
+        public decimal? OriginalRate { get; set; }
+
+        /// <summary>
+        /// 折算汇率
+        /// </summary>
+        public decimal? ExchangeRate { get; set; }
+
+        /// <summary>
+        /// 原始金额
+        /// </summary>
+        public decimal OriginalAmount { get; set; }
+
+        /// <summary>
+        /// 销项税率
+        /// </summary>
+        public decimal AccTaxRate { get; set; }
+
+        /// <summary>
+        /// 更改单
+        /// </summary>
+        public string? ChangeOrder { get; set; }
+
+        /// <summary>
+        /// 操作
+        /// </summary>
+        public string? Operator { get; set; }
+
+        /// <summary>
+        /// 船名
+        /// </summary>
+        public string? Vessel { get; set; }
+
+        /// <summary>
+        /// 航次
+        /// </summary>
+        public string? Voyage { get; set; }
+
+        /// <summary>
+        /// 船公司 
+        /// </summary>
+        public string? Carrier { get; set; }
+
+        /// <summary>
+        /// 订舱代理
+        /// </summary>
+        public string? Forwarder { get; set; }
     }
 }

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

@@ -17,16 +17,31 @@ namespace DS.WMS.Core.Fee.Dtos
         /// </summary>
         public BusinessType BusinessType { get; set; }
 
+        /// <summary>
+        /// 业务类型描述
+        /// </summary>
+        public string BusinessTypeText => BusinessType.GetDescription();
+
         /// <summary>
         /// 应收费用状态
         /// </summary>
         public BillFeeStatus? ARFeeStatus { get; set; }
 
+        /// <summary>
+        /// 应收费用状态描述
+        /// </summary>
+        public string ARFeeStatusText => ARFeeStatus?.GetDescription();
+
         /// <summary>
         /// 应付费用状态
         /// </summary>
         public BillFeeStatus? APFeeStatus { get; set; }
 
+        /// <summary>
+        /// 应付费用状态描述
+        /// </summary>
+        public string APFeeStatusText => APFeeStatus?.GetDescription();
+
         /// <summary>
         /// 更改单
         /// </summary>
@@ -96,7 +111,7 @@ namespace DS.WMS.Core.Fee.Dtos
         /// <summary>
         /// 会计期间
         /// </summary>
-        public DateTime? AccountDate { get; set; }
+        public string? AccountDate { get; set; }
 
         /// <summary>
         /// 业务来源

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

@@ -0,0 +1,173 @@
+using System.Runtime.Serialization;
+using DS.Module.Core;
+using DS.WMS.Core.Op.Entity;
+
+namespace DS.WMS.Core.Fee.Dtos
+{
+    /// <summary>
+    /// 按业务展示的费用信息
+    /// </summary>
+    public class FeeDto
+    {
+        readonly IEnumerable<FeeRecordDto> _items;
+
+        /// <summary>
+        /// 费用记录项
+        /// </summary>
+        public IEnumerable<FeeRecordDto> Items => _items;
+
+        /// <summary>
+        /// 使用指定的数据源初始化统计。
+        /// </summary>
+        /// <param name="source">数据源</param>
+        public FeeDto(IEnumerable<FeeRecordDto> source)
+        {
+            _items = source;
+            //人民币
+            ReceivableCNY = _items.Where(x => x.FeeType == FeeType.Receivable && x.Currency == "CNY").Sum(x => x.Amount).GetValueOrDefault();
+            PayableCNY = _items.Where(x => x.FeeType == FeeType.Payable && x.Currency == "CNY").Sum(x => x.Amount).GetValueOrDefault();
+
+            //美元
+            ReceivableUSD = _items.Where(x => x.FeeType == FeeType.Receivable && x.Currency == "USD").Sum(x => x.Amount).GetValueOrDefault();
+            PayableUSD = _items.Where(x => x.FeeType == FeeType.Payable && x.Currency == "USD").Sum(x => x.Amount).GetValueOrDefault();
+
+            //其他
+            ReceivableOther = _items.Where(x => x.FeeType == FeeType.Receivable && x.Currency != "USD" && x.Currency != "CNY").Sum(x => x.Amount).GetValueOrDefault();
+            PayableOther = _items.Where(x => x.FeeType == FeeType.Payable && x.Currency == "USD" && x.Currency != "CNY").Sum(x => x.Amount).GetValueOrDefault();
+        }
+
+        /// <summary>
+        /// 人民币应收款
+        /// </summary>
+        public decimal ReceivableCNY { get; private set; }
+
+        /// <summary>
+        /// 人民币应付款
+        /// </summary>
+        public decimal PayableCNY { get; private set; }
+
+        /// <summary>
+        /// 美元应收款
+        /// </summary>
+        public decimal ReceivableUSD { get; private set; }
+
+        /// <summary>
+        /// 美元应付款
+        /// </summary>
+        public decimal PayableUSD { get; private set; }
+
+        /// <summary>
+        /// 其他币种应收款
+        /// </summary>
+        public decimal ReceivableOther { get; private set; }
+
+        /// <summary>
+        /// 其他币种应付款
+        /// </summary>
+        public decimal PayableOther { get; private set; }
+    }
+
+    /// <summary>
+    /// 费用记录
+    /// </summary>
+    public class FeeRecordDto
+    {
+        /// <summary>
+        /// 申请单ID
+        /// </summary>
+        public long ApplicationId { get; set; }
+
+        /// <summary>
+        /// 费用记录ID
+        /// </summary>
+        public long RecordId { get; set; }
+
+        /// <summary>
+        /// 业务ID
+        /// </summary>
+        public long BusinessId { get; set; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public BusinessType BusinessType { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string? CustomerName { get; set; }
+
+        /// <summary>
+        /// 费用ID
+        /// </summary>
+        public long FeeId { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string? FeeName { get; set; }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public FeeType FeeType { get; set; }
+
+        /// <summary>
+        /// 费用总金额
+        /// </summary>
+        public decimal? Amount { get; set; }
+
+        /// <summary>
+        /// 币别
+        /// </summary>
+        public string Currency { get; set; }
+
+        /// <summary>
+        /// 原始币别
+        /// </summary>
+        public string OriginalCurrency { get; set; }
+
+        /// <summary>
+        /// 原始汇率
+        /// </summary>
+        public decimal? OriginalRate { get; set; }
+
+        /// <summary>
+        /// 折算汇率
+        /// </summary>
+        public decimal? ExchangeRate { get; set; }
+
+        /// <summary>
+        /// 未结金额
+        /// </summary>
+        public decimal? RestAmount { get; set; }
+
+        /// <summary>
+        /// 本次申请金额
+        /// </summary>
+        public decimal? ApplyAmount { get; set; }
+
+        /// <summary>
+        /// 本次申请原始金额
+        /// </summary>
+        public decimal? OriginalApplyAmount { get; set; }
+
+        /// <summary>
+        /// 开票金额
+        /// </summary>
+        public decimal? InvoiceAmount { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; }
+
+        [IgnoreDataMember]
+        public long CreateBy { get; set; }
+
+        /// <summary>
+        /// 录入人
+        /// </summary>
+        public string? CreateByName { get; set; }
+    }
+}

ds-wms-service/DS.WMS.Core/Fee/Entity/ApplicationBase.cs

@@ -12,7 +12,7 @@ namespace DS.WMS.Core.Fee.Entity
         /// <summary>
         /// 申请单编号
         /// </summary>
-        [SugarColumn(ColumnDescription = "申请单编号", IsNullable = false, Length = 20)]
+        [SugarColumn(ColumnDescription = "申请单编号", Length = 20)]
         public string ApplicationNO { get; set; }
 
         /// <summary>
@@ -24,49 +24,49 @@ namespace DS.WMS.Core.Fee.Entity
         /// <summary>
         /// 人民币申请金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "人民币申请金额")]
+        [SugarColumn(ColumnDescription = "人民币申请金额", IsNullable = true)]
         public decimal? AmountRMB { get; set; }
 
         /// <summary>
         /// 美元申请金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "美元申请金额")]
+        [SugarColumn(ColumnDescription = "美元申请金额", IsNullable = true)]
         public decimal? AmountUSD { get; set; }
 
         /// <summary>
         /// 申请币别
         /// </summary>
-        [SugarColumn(ColumnDescription = "申请币别", IsNullable = false, Length = 3)]
-        public string Currency { get; set; }
+        [SugarColumn(ColumnDescription = "申请币别", IsNullable = true, Length = 3)]
+        public string? Currency { get; set; }
 
         /// <summary>
         /// 折算汇率
         /// </summary>
-        [SugarColumn(ColumnDescription = "折算汇率")]
-        public decimal ExchangeRate { get; set; }
+        [SugarColumn(ColumnDescription = "折算汇率", IsNullable = true)]
+        public decimal? ExchangeRate { get; set; }
 
         /// <summary>
         /// 审核人
         /// </summary>
-        [SugarColumn(ColumnDescription = "审核人")]
+        [SugarColumn(ColumnDescription = "审核人", IsNullable = true)]
         public long? AuditerId { get; set; }
 
         /// <summary>
         /// 审核人名称
         /// </summary>
-        [SugarColumn(ColumnDescription = "审核人名称")]
+        [SugarColumn(ColumnDescription = "审核人名称", IsNullable = true)]
         public string? AuditerName { get; set; }
 
         /// <summary>
         /// 审核时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "审核时间")]
+        [SugarColumn(ColumnDescription = "审核时间", IsNullable = true)]
         public DateTime? AuditTime { get; set; }
 
         /// <summary>
         /// 审核备注
         /// </summary>
-        [SugarColumn(ColumnDescription = "审核备注", Length = 200)]
+        [SugarColumn(ColumnDescription = "审核备注", Length = 200, IsNullable = true)]
         public string? AuditRemark { get; set; }
 
         /// <summary>
@@ -84,25 +84,25 @@ namespace DS.WMS.Core.Fee.Entity
         /// <summary>
         /// 打印人
         /// </summary>
-        [SugarColumn(ColumnDescription = "打印人")]
+        [SugarColumn(ColumnDescription = "打印人", IsNullable = true)]
         public long? PrinterId { get; set; }
 
         /// <summary>
         /// 打印人名称
         /// </summary>
-        [SugarColumn(ColumnDescription = "打印人名称")]
+        [SugarColumn(ColumnDescription = "打印人名称", IsNullable = true)]
         public string? PrinterName { get; set; }
 
         /// <summary>
         /// 打印时间
         /// </summary>
-        [SugarColumn(ColumnDescription = "打印时间")]
+        [SugarColumn(ColumnDescription = "打印时间", IsNullable = true)]
         public DateTime? PrintTime { get; set; }
 
         /// <summary>
         /// 驳回原因
         /// </summary>
-        [SugarColumn(ColumnDescription = "驳回原因", Length = 200)]
+        [SugarColumn(ColumnDescription = "驳回原因", Length = 200, IsNullable = true)]
         public string? Reason { get; set; }
 
         /// <summary>

ds-wms-service/DS.WMS.Core/Fee/Entity/FeeApplication.cs

@@ -8,6 +8,12 @@ namespace DS.WMS.Core.Fee.Entity
     [SugarTable("fee_application", TableDescription = "付费申请")]
     public class FeeApplication : ApplicationBase
     {
+        /// <summary>
+        /// 客户ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "客户ID", IsNullable = false)]
+        public long CustomerId { get; set; }
+
         /// <summary>
         /// 客户名称
         /// </summary>
@@ -18,7 +24,7 @@ namespace DS.WMS.Core.Fee.Entity
         /// 结算方式
         /// </summary>
         [SugarColumn(ColumnDescription = "结算方式")]
-        public int? Type { get; set; }
+        public long? SettlementType { get; set; }
 
         /// <summary>
         /// 结算人

ds-wms-service/DS.WMS.Core/Fee/Entity/FeeApplicationDetail.cs

@@ -1,4 +1,5 @@
-using DS.Module.Core.Data;
+using DS.Module.Core;
+using DS.Module.Core.Data;
 using DS.Module.Core.Enums;
 using DS.WMS.Core.Op.Entity;
 using SqlSugar;
@@ -29,17 +30,23 @@ namespace DS.WMS.Core.Fee.Entity
         [SugarColumn(ColumnDescription = "业务类型")]
         public BusinessType BusinessType { get; set; }
 
+        /// <summary>
+        /// 费用记录ID
+        /// </summary>
+        [SugarColumn(ColumnDescription = "费用记录ID")]
+        public long RecordId { get; set; }
+
         /// <summary>
         /// 结算对象名称
         /// </summary>
-        [SugarColumn(ColumnDescription = "结算对象名称", Length = 200)]
+        [SugarColumn(ColumnDescription = "结算对象名称", Length = 200, IsNullable = true)]
         public string? CustomerName { get; set; }
 
         /// <summary>
         /// 收付类型（收、付） 1应收 2 应付
         /// </summary>
         [SugarColumn(ColumnDescription = "收付类型（收、付）", DefaultValue = "1")]
-        public int FeeType { get; set; }
+        public FeeType FeeType { get; set; }
 
         /// <summary>
         /// 费用Id
@@ -54,15 +61,15 @@ namespace DS.WMS.Core.Fee.Entity
         public string? FeeName { get; set; }
 
         /// <summary>
-        /// 类别（//1-付费申请结算 2-收费自由结算 3-发票结算 4-收费申请 5-付费申请 6-发票申请 7-发票开出 8-付费自由结算 9-收费申请结算）
+        /// 类别（1-付费申请结算 2-收费自由结算 3-发票结算 4-收费申请 5-付费申请 6-发票申请 7-发票开出 8-付费自由结算 9-收费申请结算）
         /// </summary>
-        [SugarColumn(ColumnDescription = "类别")]
-        public FeeCategory Category { get; set; }
+        [SugarColumn(ColumnDescription = "类别", IsNullable = true)]
+        public FeeCategory? Category { get; set; }
 
         /// <summary>
-        /// 金额
+        /// 申请金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "金额")]
+        [SugarColumn(ColumnDescription = "申请金额")]
         public decimal Amount { get; set; }
 
         /// <summary>
@@ -80,8 +87,8 @@ namespace DS.WMS.Core.Fee.Entity
         /// <summary>
         /// 折算汇率
         /// </summary>
-        [SugarColumn(ColumnDescription = "折算汇率")]
-        public decimal ExchangeRate { get; set; }
+        [SugarColumn(ColumnDescription = "折算汇率", IsNullable = true)]
+        public decimal? ExchangeRate { get; set; }
 
         /// <summary>
         /// 原始币别
@@ -90,16 +97,21 @@ namespace DS.WMS.Core.Fee.Entity
         public string OriginalCurrency { get; set; }
 
         /// <summary>
-        /// 金额
+        /// 原始申请金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "原始金额")]
-        public decimal? OriginalAmount { get; set; }
+        [SugarColumn(ColumnDescription = "原始申请金额")]
+        public decimal OriginalAmount { get; set; }
 
         /// <summary>
         /// 原始已处理金额
         /// </summary>
         [SugarColumn(ColumnDescription = "原始已处理金额")]
-        public decimal? OriginalProcessedAmount { get; set; }
+        public decimal OriginalProcessedAmount { get; set; }
 
+        /// <summary>
+        /// 费用记录
+        /// </summary>
+        [Navigate(NavigateType.ManyToOne, nameof(FeeRecord.Id))]
+        public FeeRecord? Record { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Fee/Entity/FeeRecord.cs

@@ -133,8 +133,6 @@ namespace DS.WMS.Core.Fee.Entity
         /// </summary>
         [SugarColumn(ColumnDescription = "备注", Length = 1000, IsNullable = true)]
         public string Remark { get; set; }
-
-
         /// <summary>
         /// Desc:佣金比率
         /// </summary>
@@ -142,19 +140,19 @@ namespace DS.WMS.Core.Fee.Entity
         public decimal? CommissionRate { get; set; } = 0;
 
         /// <summary>
-        /// Desc:结算金额
+        /// 已结算金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "结算金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        [SugarColumn(ColumnDescription = "已结算金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
         public decimal? SettlementAmount { get; set; } = 0;
         /// <summary>
-        /// Desc:开票金额
+        /// 已开票金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "开票金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        [SugarColumn(ColumnDescription = "已开票金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
         public decimal? InvoiceAmount { get; set; } = 0;
         /// <summary>
-        /// Desc:申请金额
+        ///已申请金额
         /// </summary>
-        [SugarColumn(ColumnDescription = "申请金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
+        [SugarColumn(ColumnDescription = "已申请金额", Length = 18, DecimalDigits = 2, DefaultValue = "0")]
         public decimal? OrderAmount { get; set; } = 0;
         /// <summary>
         /// Desc:申请开票金额

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

@@ -1,6 +1,7 @@
 using DS.Module.Core;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
+using DS.WMS.Core.Op.Entity;
 
 namespace DS.WMS.Core.Fee.Interface
 {
@@ -23,6 +24,21 @@ namespace DS.WMS.Core.Fee.Interface
         /// <returns></returns>
         Task<DataResult<List<FeeApplicationBiz>>> GetBizListAsync(PageRequest request);
 
+        /// <summary>
+        /// 获取申请单详情
+        /// </summary>
+        /// <param name="id">申请单ID</param>
+        /// <returns></returns>
+        Task<DataResult<FeeApplicationDto>> GetAsync(long id);
+
+        /// <summary>
+        /// 根据业务编号及类型获取关联费用记录
+        /// </summary>
+        /// <param name="id">业务ID</param>
+        /// <param name="businessType">业务类型</param>
+        /// <returns></returns>
+        Task<DataResult<FeeDto>> GetFeesAsync(long id, BusinessType businessType);
+
         /// <summary>
         /// 提交申请单
         /// </summary>
@@ -30,6 +46,13 @@ namespace DS.WMS.Core.Fee.Interface
         /// <returns></returns>
         Task<DataResult> SaveAsync(FeeApplication application);
 
+        /// <summary>
+        /// 删除申请单明细
+        /// </summary>
+        /// <param name="ids">申请单明细ID</param>
+        /// <returns></returns>
+        Task<DataResult> DeleteDetailAsync(params long[] ids);
+
         /// <summary>
         /// 删除申请单
         /// </summary>

ds-wms-service/DS.WMS.Core/Fee/Method/FeeApplicationService.cs

@@ -1,4 +1,5 @@
-using DS.Module.Core;
+using System.Text;
+using DS.Module.Core;
 using DS.Module.Core.Enums;
 using DS.Module.Core.Extensions;
 using DS.WMS.Core.Fee.Dtos;
@@ -9,6 +10,7 @@ using DS.WMS.Core.Flow.Entity;
 using DS.WMS.Core.Flow.Interface;
 using DS.WMS.Core.Op.Entity;
 using DS.WMS.Core.Sys.Entity;
+using DS.WMS.Core.Sys.Interface;
 using Microsoft.Extensions.DependencyInjection;
 using SqlSugar;
 
@@ -20,6 +22,7 @@ namespace DS.WMS.Core.Fee.Method
     public class FeeApplicationService : FeeServiceBase, IFeeApplicationService
     {
         readonly IClientFlowInstanceService flowService;
+        readonly ICommonService commonService;
 
         /// <summary>
         /// 初始化
@@ -28,6 +31,7 @@ namespace DS.WMS.Core.Fee.Method
         public FeeApplicationService(IServiceProvider serviceProvider) : base(serviceProvider)
         {
             flowService = serviceProvider.GetRequiredService<IClientFlowInstanceService>();
+            commonService = serviceProvider.GetRequiredService<ICommonService>();
         }
 
         /// <summary>
@@ -125,6 +129,51 @@ namespace DS.WMS.Core.Fee.Method
             return TenantDb.UnionAll(new List<ISugarQueryable<FeeApplicationBiz>> { query1 });
         }
 
+        /// <summary>
+        /// 根据业务编号及类型获取关联费用记录
+        /// </summary>
+        /// <param name="id">业务ID</param>
+        /// <param name="businessType">业务类型</param>
+        /// <returns></returns>
+        public async Task<DataResult<FeeDto>> GetFeesAsync(long id, BusinessType businessType)
+        {
+            var list = await TenantDb.Queryable<FeeRecord>()
+                .Where(f => f.BusinessId == id && f.BusinessType == businessType && f.FeeStatus == FeeStatus.AuditPassed)
+                .Select(f => new FeeRecordDto
+                {
+                    RecordId = f.Id,
+                    BusinessId = id,
+                    BusinessType = businessType,
+                    CustomerName = f.CustomerName,
+                    FeeId = f.FeeId,
+                    FeeName = f.FeeName,
+                    FeeType = f.FeeType,
+                    Amount = f.Amount,
+                    Currency = f.Currency,
+                    OriginalCurrency = f.Currency,
+                    OriginalRate = f.ExchangeRate,
+                    RestAmount = f.Amount - f.SettlementAmount - f.OrderAmount + f.OrderSettlementAmount,
+                    InvoiceAmount = f.InvoiceAmount,
+                    Remark = f.Remark,
+                    CreateBy = f.CreateBy
+                }).ToListAsync();
+
+            list.RemoveAll(f => f.RestAmount == 0);
+
+            if (list.Count > 0)
+            {
+                //关联用户名称
+                var userIds = list.Select(x => x.CreateBy).Distinct();
+                var users = await Db.Queryable<SysUser>().Where(x => userIds.Contains(x.Id)).Select(x => new { x.Id, x.UserName }).ToListAsync();
+                foreach (var item in list)
+                {
+                    item.CreateByName = users.Find(x => x.Id == item.CreateBy)?.UserName;
+                }
+            }
+
+            return DataResult<FeeDto>.Success(new FeeDto(list));
+        }
+
         /// <summary>
         /// 获取分页列表
         /// </summary>
@@ -149,25 +198,171 @@ namespace DS.WMS.Core.Fee.Method
         }
 
         /// <summary>
-        /// 提交保存申请单
+        /// 获取申请单详情
+        /// </summary>
+        /// <param name="id">申请单ID</param>
+        /// <returns></returns>
+        public async Task<DataResult<FeeApplicationDto>> GetAsync(long id)
+        {
+            var dto = await TenantDb.Queryable<FeeApplication>().Where(x => x.Id == id).Select<FeeApplicationDto>().FirstAsync();
+            if (dto != null)
+            {
+                dto.Details = await TenantDb.Queryable<FeeApplicationDetail>()
+                    .LeftJoin<FeeRecord>((d, f) => d.RecordId == f.Id)
+                    .LeftJoin<BusinessFeeStatus>((d, f, b) => f.BusinessId == b.BusinessId && f.BusinessType == b.BusinessType)
+                    .Where(d => d.ApplicationId == id)
+                   .Select((d, f, b) => new FeeApplicationDetailDto
+                   {
+                       AccTaxRate = f.AccTaxRate,
+                       Amount = d.Amount,
+                       FeeName = d.FeeName,
+                       FeeType = f.FeeType,
+                       FeeObject = f.CustomerName,
+                       OriginalCurrency = d.OriginalCurrency,
+                       OriginalRate = f.ExchangeRate,
+                       ExchangeRate = d.ExchangeRate,
+                       OriginalAmount = d.OriginalAmount,
+                       BusinessId = b.BusinessId,
+                       BusinessType = b.BusinessType,
+                       IsBusinessLocking = b.IsBusinessLocking,
+                       IsFeeLocking = b.IsFeeLocking
+                   }).ToListAsync();
+
+
+                var gList = dto.Details.GroupBy(x => x.BusinessType).ToList();
+                foreach (var g in gList)
+                {
+                    var ids = g.Select(x => x.BusinessId).ToList();
+                    switch (g.Key)
+                    {
+                        case BusinessType.OceanShippingExport:
+                            var list1 = await TenantDb.Queryable<SeaExport>().Where(x => ids.Contains(x.Id)).Select(x => new
+                            {
+                                x.Id,
+                                x.MBLNO,
+                                x.CustomerNo,
+                                x.CustomerName,
+                                x.ETD,
+                                x.CntrTotal,
+                                x.AccountDate,
+                                x.OperatorCode,
+                                x.Vessel,
+                                x.Voyno,
+                                x.Carrier,
+                                x.Forwarder
+                            }).ToListAsync();
+                            foreach (var item in g)
+                            {
+                                var biz = list1.Find(x => x.Id == item.BusinessId);
+                                if (biz != null)
+                                {
+                                    item.MBLNO = biz.MBLNO;
+                                    item.CustomerName = biz.CustomerName;
+                                    item.CustomerNo = biz.CustomerNo;
+                                    item.ETD = biz.ETD;
+                                    item.CntrTotal = biz.CntrTotal;
+                                    item.AccountDate = biz.AccountDate;
+                                    item.Operator = biz.OperatorCode;
+                                    item.Vessel = biz.Vessel;
+                                    item.Voyage = biz.Voyno;
+                                    item.Carrier = biz.Carrier;
+                                    item.Forwarder = biz.Forwarder;
+                                }
+                            }
+                            break;
+
+                        case BusinessType.OceanShippingImport:
+                            break;
+                    }
+                }
+            }
+
+            return DataResult<FeeApplicationDto>.Success(dto);
+        }
+
+        /// <summary>
+        /// 提交保存费用申请单
         /// </summary>
         /// <param name="application">申请单</param>
         /// <returns></returns>
         public async Task<DataResult> SaveAsync(FeeApplication application)
         {
+            application.Details ??= [];
             if (application.Id > 0)
             {
                 //修改需检查申请单状态
-                if (await TenantDb.Queryable<FeeApplication>().AnyAsync(x =>
-                    x.Id == application.Id && (x.Status == ApplicationStatus.AuditSubmittd || x.Status == ApplicationStatus.AuditPassed)))
+                var model = await TenantDb.Queryable<FeeApplication>().Where(x => x.Id == application.Id).Select(
+                    x => new { x.Status, x.Currency }).FirstAsync();
+
+                if (model.Status == ApplicationStatus.AuditSubmittd || model.Status == ApplicationStatus.AuditPassed)
                     return DataResult.Failed("只能修改状态为：未提交/审核驳回的申请单");
+
+                if (application.Details.Count > 0 && !string.Equals(model.Currency, application.Currency, StringComparison.OrdinalIgnoreCase))
+                    return DataResult.Failed("提交申请单币别需与原申请单币别一致");
+            }
+
+            List<FeeRecord>? fees = null;
+            if (application.Details.Count > 0)
+            {
+                if (application.Details.GroupBy(x => x.CustomerName).Select(x => x.Key).Count() > 1)
+                    return DataResult.Failed("申请单的结算对象有且只能有一个");
+
+                if (!application.Currency.IsNullOrEmpty() && application.Details.Any(x => x.Currency != application.Currency))
+                    return DataResult.Failed($"申请单不是原币申请，所有明细币别必须为 {application.Currency}");
+
+                //仅处理新增的明细
+                var ids = application.Details.FindAll(x => x.Id == 0).Select(x => x.RecordId).ToList();
+                fees = await TenantDb.Queryable<FeeRecord>().Where(x => ids.Contains(x.Id)).Select(x => new FeeRecord
+                {
+                    Id = x.Id,
+                    Amount = x.Amount,
+                    OrderAmount = x.OrderAmount,
+                    OrderSettlementAmount = x.OrderSettlementAmount,
+                    SettlementAmount = x.SettlementAmount
+                }).ToListAsync();
+
+                StringBuilder sb = new();
+                foreach (var detail in application.Details)
+                {
+                    var fee = fees.Find(x => x.Id == detail.RecordId);
+                    if (fee == null)
+                    {
+                        sb.Append($"未能关联明细【{detail.FeeName}】的费用信息；");
+                        continue;
+                    }
+                    //未申请金额=总金额-结算金额-申请金额+申请金额已结算
+                    var restAmount = fee.Amount.GetValueOrDefault() - fee.SettlementAmount.GetValueOrDefault() - fee.OrderAmount.GetValueOrDefault() + fee.OrderSettlementAmount;
+                    if (detail.OriginalAmount > 0 && detail.OriginalAmount > restAmount)
+                    {
+                        sb.Append($"申请单明细【{detail.FeeName}】的申请金额不能超出原费用的金额；");
+                        continue;
+                    }
+                    if (detail.OriginalAmount < 0 && detail.OriginalAmount < restAmount)
+                    {
+                        sb.Append($"申请单明细【{detail.FeeName}】的申请金额不能超出原费用的金额；");
+                        continue;
+                    }
+                    //更新费用记录的已申请金额
+                    fee.OrderAmount += detail.OriginalAmount;
+
+                    detail.Category = FeeCategory.PaidApplication;
+                }
+
+                if (sb.Length > 0)
+                    return DataResult.Failed(sb.ToString());
+
+                if (application.Currency.IsNullOrEmpty())
+                    application.ExchangeRate = 1m;
+
+                application.AmountRMB = application.Details.Where(x => x.Currency == "CNY").Sum(x => x.Amount);
+                application.AmountUSD = application.Details.Where(x => x.Currency == "USD").Sum(x => x.Amount);
             }
 
             //关联用户名称
-            var userIds = new long?[] { application.SettlerId, application.PaymentApplicantId };
-            var users = await Db.Queryable<SysUser>().Where(x => userIds.Contains(x.Id)).Select(x => new { x.Id, x.UserName }).ToListAsync();
-            application.SettlerName = application.SettlerId.HasValue ? users.Find(x => x.Id == application.SettlerId.Value)?.UserName : string.Empty;
-            application.PaymentApplicantName = application.PaymentApplicantId.HasValue ? users.Find(x => x.Id == application.PaymentApplicantId.Value)?.UserName : string.Empty;
+            //var userIds = new long?[] { application.SettlerId, application.PaymentApplicantId };
+            //var users = await Db.Queryable<SysUser>().Where(x => userIds.Contains(x.Id)).Select(x => new { x.Id, x.UserName }).ToListAsync();
+            //application.SettlerName = application.SettlerId.HasValue ? users.Find(x => x.Id == application.SettlerId.Value)?.UserName : string.Empty;
+            //application.PaymentApplicantName = application.PaymentApplicantId.HasValue ? users.Find(x => x.Id == application.PaymentApplicantId.Value)?.UserName : string.Empty;
 
             await TenantDb.Ado.BeginTranAsync();
             try
@@ -175,14 +370,37 @@ namespace DS.WMS.Core.Fee.Method
                 //关联导航属性插入
                 if (application.Id == 0)
                 {
+                    //创建时需要生成申请单编号
+                    var sequence = commonService.GetSequenceNext<FeeApplication>();
+                    if (!sequence.Succeeded)
+                    {
+                        return DataResult.Failed(sequence.Message, MultiLanguageConst.SequenceSetNotExist);
+                    }
+                    application.ApplicationNO = sequence.Data;
+
                     await TenantDb.InsertNav(application).Include(x => x.Details).ExecuteCommandAsync();
                 }
-                //关联导航属性更新
                 else
                 {
-                    await TenantDb.UpdateNav(application).Include(x => x.Details).ExecuteCommandAsync();
+                    var createList = application.Details.FindAll(x => x.Id == 0);
+                    if (createList.Count > 0)
+                        await TenantDb.Insertable(createList).ExecuteCommandAsync();
+
+                    await TenantDb.Updateable(application).IgnoreColumns(x => new
+                    {
+                        x.ApplicationNO,
+                        //x.Currency,
+                        x.CreateBy,
+                        x.CreateTime,
+                        x.Deleted,
+                        x.DeleteBy,
+                        x.DeleteTime
+                    }).ExecuteCommandAsync();
                 }
 
+                if (fees != null)
+                    await TenantDb.Updateable(fees).UpdateColumns(x => new { x.OrderAmount }).ExecuteCommandAsync();
+
                 await TenantDb.Ado.CommitTranAsync();
                 return DataResult.Success;
             }
@@ -194,6 +412,44 @@ namespace DS.WMS.Core.Fee.Method
             }
         }
 
+        /// <summary>
+        /// 删除申请单明细
+        /// </summary>
+        /// <param name="ids">申请单明细ID</param>
+        /// <returns></returns>
+        public async Task<DataResult> DeleteDetailAsync(params long[] ids)
+        {
+            var details = await TenantDb.Queryable<FeeApplicationDetail>().Where(x => ids.Contains(x.Id)).Select(
+                x => new FeeApplicationDetail
+                {
+                    Id = x.Id,
+                    RecordId = x.RecordId,
+                    OriginalAmount = x.OriginalAmount
+                }).ToListAsync();
+
+            await TenantDb.Ado.BeginTranAsync();
+            try
+            {
+                //还原费用表的已申请金额
+                var fees = details.Select(x => new FeeRecord { Id = x.RecordId, OrderAmount = x.OriginalAmount }).ToList();
+                TenantDb.Updateable(fees)
+                       .PublicSetColumns(it => it.OrderAmount, "-")
+                       .UpdateColumns(x => new { x.OrderAmount })
+                       .ExecuteCommand();
+
+                await TenantDb.Deleteable(details).ExecuteCommandAsync();
+
+                await TenantDb.Ado.CommitTranAsync();
+                return DataResult.Success;
+            }
+            catch (Exception ex)
+            {
+                await TenantDb.Ado.RollbackTranAsync();
+                await ex.LogAsync(Db);
+                return DataResult.Failed("删除失败!");
+            }
+        }
+
         /// <summary>
         /// 删除申请单
         /// </summary>
@@ -204,8 +460,35 @@ namespace DS.WMS.Core.Fee.Method
             if (await TenantDb.Queryable<FeeApplication>().AnyAsync(x => ids.Contains(x.Id) && (x.Status != ApplicationStatus.Pending && x.Status != ApplicationStatus.AuditRejected)))
                 return DataResult.Failed("只能删除状态为‘待审核’或‘驳回’的申请单", MultiLanguageConst.FeeRecordDelete);
 
-            bool result = await TenantDb.DeleteNav<FeeApplication>(x => ids.Contains(x.Id)).Include(x => x.Details).ExecuteCommandAsync();
-            return result ? DataResult.Successed("删除成功!") : DataResult.Failed("删除失败!");
+            var details = await TenantDb.Queryable<FeeApplicationDetail>().Where(x => ids.Contains(x.ApplicationId)).Select(
+                x => new FeeApplicationDetail
+                {
+                    Id = x.Id,
+                    RecordId = x.RecordId,
+                    OriginalAmount = x.OriginalAmount
+                }).ToListAsync();
+
+            await TenantDb.Ado.BeginTranAsync();
+            try
+            {
+                //还原费用表的已申请金额
+                var fees = details.Select(x => new FeeRecord { Id = x.RecordId, OrderAmount = x.OriginalAmount }).ToList();
+                TenantDb.Updateable(fees)
+                       .PublicSetColumns(it => it.OrderAmount, "-")
+                       .UpdateColumns(x => new { x.OrderAmount })
+                       .ExecuteCommand();
+
+                await TenantDb.DeleteNav<FeeApplication>(x => ids.Contains(x.Id)).Include(x => x.Details).ExecuteCommandAsync();
+
+                await TenantDb.Ado.CommitTranAsync();
+                return DataResult.Success;
+            }
+            catch (Exception ex)
+            {
+                await TenantDb.Ado.RollbackTranAsync();
+                await ex.LogAsync(Db);
+                return DataResult.Failed("删除失败!");
+            }
         }
 
         /// <summary>
@@ -306,7 +589,7 @@ namespace DS.WMS.Core.Fee.Method
             {
                 await Db.Updateable(flows).UpdateColumns(x => new { x.FlowStatus, x.MakerList }).ExecuteCommandAsync();
 
-                foreach (var item in list) 
+                foreach (var item in list)
                 {
                     item.Status = ApplicationStatus.Pending;
                     item.FlowId = null;

ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs

@@ -38,6 +38,10 @@ namespace DS.WMS.Core.Fee.Method
         readonly IClientFlowInstanceService flowService;
         readonly IFeeRecordService feeService;
 
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        /// <param name="serviceProvider"></param>
         public FeeAuditService(IServiceProvider serviceProvider) : base(serviceProvider)
         {
             flowService = serviceProvider.GetRequiredService<IClientFlowInstanceService>();
@@ -151,7 +155,7 @@ namespace DS.WMS.Core.Fee.Method
                 .Select((s, b, f, cs, csd) => new FeeAuditBusiness
                 {
                     Id = s.Id,
-                    AccountDate = SqlFunc.ToDate(s.AccountDate),
+                    AccountDate = s.AccountDate,
                     APFeeStatus = b.APFeeStatus,
                     ARFeeStatus = b.ARFeeStatus,
                     BusinessType = BusinessType.OceanShippingExport,
@@ -236,7 +240,7 @@ namespace DS.WMS.Core.Fee.Method
                 .Select((s, b, cs, csd) => new FeeAuditBusiness
                 {
                     Id = s.Id,
-                    AccountDate = SqlFunc.ToDate(s.AccountDate),
+                    AccountDate = s.AccountDate,
                     APFeeStatus = b.APFeeStatus,
                     ARFeeStatus = b.ARFeeStatus,
                     BusinessType = BusinessType.OceanShippingExport,

ds-wms-service/DS.WMS.Core/Op/Entity/BusinessFeeStatus.cs

@@ -112,16 +112,19 @@ namespace DS.WMS.Core.Op.Entity
         /// <summary>
         /// 费用更改单
         /// </summary>
+        [Description("费用更改单")]
         ChangeOrder = 0,
 
         /// <summary>
         /// 海运出口
         /// </summary>
+        [Description("海运出口")]
         OceanShippingExport = 1,
 
         /// <summary>
         /// 海运进口
         /// </summary>
+        [Description("海运进口")]
         OceanShippingImport = 2
     }
 }

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

@@ -3,6 +3,7 @@ using DS.Module.Core.Data;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Fee.Interface;
+using DS.WMS.Core.Op.Entity;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DS.WMS.FeeApi.Controllers
@@ -45,6 +46,29 @@ namespace DS.WMS.FeeApi.Controllers
             return await _service.GetBizListAsync(request);
         }
 
+        /// <summary>
+        /// 获取申请单详情
+        /// </summary>
+        /// <param name="id">申请单ID</param>
+        /// <returns></returns>
+        [HttpGet, Route("Get")]
+        public async Task<DataResult<FeeApplicationDto>> GetAsync([FromQuery] long id)
+        {
+            return await _service.GetAsync(id);
+        }
+
+        /// <summary>
+        /// 根据业务编号及类型获取关联费用记录
+        /// </summary>
+        /// <param name="id">业务ID</param>
+        /// <param name="businessType">业务类型</param>
+        /// <returns></returns>
+        [HttpGet, Route("GetFees")]
+        public async Task<DataResult<FeeDto>> GetFeesAsync([FromQuery] long id, [FromQuery] BusinessType businessType)
+        {
+            return await _service.GetFeesAsync(id, businessType);
+        }
+
         /// <summary>
         /// 提交申请单
         /// </summary>
@@ -56,6 +80,20 @@ namespace DS.WMS.FeeApi.Controllers
             return await _service.SaveAsync(application);
         }
 
+        /// <summary>
+        /// 删除申请单明细
+        /// </summary>
+        /// <param name="model">申请单明细ID</param>
+        /// <returns></returns>
+        [HttpPost, Route("DeleteDetail")]
+        public async Task<DataResult> DeleteDetailAsync([FromBody] IdModel model)
+        {
+            if (model.Ids == null || model.Ids.Length == 0)
+                return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
+
+            return await _service.DeleteDetailAsync(model.Ids);
+        }
+
         /// <summary>
         /// 删除申请单
         /// </summary>
@@ -64,7 +102,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("Delete")]
         public async Task<DataResult> DeleteAsync([FromBody] IdModel model)
         {
-            if (model.Id == null || model.Ids.Length == 0)
+            if (model.Ids == null || model.Ids.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _service.DeleteAsync(model.Ids);

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

@@ -77,7 +77,7 @@ namespace DS.WMS.FeeApi.Controllers
         [HttpPost, Route("AuditBusiness")]
         public async Task<DataResult> AuditBusinessAsync(FeeBizAuditRequest request)
         {
-            if (request == null || (request.Result != 1 && request.Result != 2) || request.Items == null || !request.Items.Any())
+            if (request == null || (request.Result != 1 && request.Result != 2) || request.Items == null || request.Items.Count == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
 
             return await _auditService.AuditBusinessAsync(request);

ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt

@@ -1167,3 +1167,94 @@
 2024-06-11 17:00:00.1804 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-11 17:00:00.1804 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-06-11 17:00:00.1804 Info Configuration initialized.
+2024-06-12 11:26:58.0826 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 11:26:58.0997 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 11:26:58.0997 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 11:26:58.1220 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-12 11:26:58.1220 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-12 11:26:58.1290 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 11:26:58.1290 Info Configuration initialized.
+2024-06-12 11:41:37.2592 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 11:41:37.3125 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 11:41:37.3125 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 11:41:37.3272 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-12 11:41:37.3334 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-12 11:41:37.3334 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 11:41:37.3334 Info Configuration initialized.
+2024-06-12 11:46:01.6380 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 11:46:01.6662 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 11:46:01.6662 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 11:46:01.6861 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-12 11:46:01.6944 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-12 11:46:01.6944 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 11:46:01.7209 Info Configuration initialized.
+2024-06-12 11:58:34.0931 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 11:58:34.1238 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 11:58:34.1238 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 11:58:34.1401 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-12 11:58:34.1455 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-12 11:58:34.1455 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 11:58:34.1455 Info Configuration initialized.
+2024-06-12 14:21:09.6723 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 14:21:09.7028 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 14:21:09.7085 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 14:21:09.7085 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-12 14:21:09.7286 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-12 14:21:09.7286 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 14:21:09.7386 Info Configuration initialized.
+2024-06-12 14:26:46.8901 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 14:26:46.9344 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 14:26:46.9344 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 14:26:46.9540 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-12 14:26:46.9591 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-12 14:26:46.9591 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 14:26:46.9591 Info Configuration initialized.
+2024-06-12 14:36:23.6327 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 14:36:23.6609 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 14:36:23.6609 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 14:36:23.6758 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-12 14:36:23.6758 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-12 14:36:23.6758 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 14:36:23.6758 Info Configuration initialized.
+2024-06-12 15:38:30.6238 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 15:38:30.6594 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 15:38:30.6635 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 15:38:30.6761 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-12 15:38:30.6761 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-12 15:38:30.6761 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 15:38:30.6970 Info Configuration initialized.
+2024-06-12 15:43:09.0733 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 15:43:09.1009 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 15:43:09.1009 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 15:43:09.1136 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-12 15:43:09.1136 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-12 15:43:09.1136 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 15:43:09.1136 Info Configuration initialized.
+2024-06-12 16:50:57.6309 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 16:50:57.6788 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 16:50:57.6788 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 16:50:57.6959 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-12 16:50:57.6959 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-12 16:50:57.6959 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 16:50:57.7091 Info Configuration initialized.
+2024-06-12 16:51:16.5669 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 16:51:16.5952 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 16:51:16.5991 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 16:51:16.5991 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-12 16:51:16.6164 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-12 16:51:16.6164 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 16:51:16.6164 Info Configuration initialized.
+2024-06-12 16:55:30.4049 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-12 16:55:30.4343 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-12 16:55:30.4343 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-12 16:55:30.4490 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-12 16:55:30.4490 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-12 16:55:30.4490 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-12 16:55:30.4490 Info Configuration initialized.
+2024-06-13 13:54:29.3425 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-13 13:54:29.3966 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-13 13:54:29.3966 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-13 13:54:29.4254 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-13 13:54:29.4405 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-13 13:54:29.4405 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-13 13:54:29.4577 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-06-06T09:41:51.1810315Z||;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||;</History>
+    <History>True|2024-06-13T02:46:52.6971321Z||;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||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

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

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

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

@@ -6,7 +6,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Code\PublishCopy\ds8-mainapi</_PublishTargetUrl>
-    <History>True|2024-06-13T07:09:38.6462581Z;True|2024-06-13T14:55:09.1297939+08:00;True|2024-06-12T18:08:20.7787980+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;</History>
+    <History>True|2024-06-11T09:08:01.8930314Z||;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||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>