获取待付费的业务列表增加查询字段

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

@@ -1,4 +1,5 @@
 using System.Runtime.Serialization;
+using DS.Module.Core;
 using DS.WMS.Core.Op.Entity;
 
 namespace DS.WMS.Core.Fee.Dtos
@@ -122,7 +123,7 @@ namespace DS.WMS.Core.Fee.Dtos
         /// <summary>
         /// 会计期间
         /// </summary>
-        public DateTime? AccountDate { get; set; }
+        public string? AccountDate { get; set; }
 
         /// <summary>
         /// 操作员ID
@@ -186,5 +187,31 @@ namespace DS.WMS.Core.Fee.Dtos
         /// 所属部门名称
         /// </summary>
         public string? SaleDeptName { get; set; }
+
+        /// <summary>
+        /// 收付类型（收、付） 1应收 2 应付
+        /// </summary>
+        public FeeType FeeType { get; set; }
+
+        /// <summary>
+        /// 币别
+        /// </summary>
+        public string? Currency { get; set; }
+
+        /// <summary>
+        /// 费用Id
+        /// </summary>
+        public long? FeeId { get; set; }
+
+        /// <summary>
+        /// 是否垫付费用
+        /// </summary>
+        public bool? IsAdvancedPay { get; set; }
+
+        /// <summary>
+        /// 是否禁开发票
+        /// </summary>
+        public bool? IsInvoice { get; set; }
+
     }
 }

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

@@ -72,10 +72,10 @@ namespace DS.WMS.Core.Fee.Method
             var query1 = TenantDb.Queryable<SeaExport>().InnerJoin<FeeRecord>((s, f) => s.Id == f.BusinessId && f.BusinessType == BusinessType.OceanShippingExport)
                 .Where((s, f) => f.FeeStatus == FeeStatus.AuditPassed)
                 .GroupBy((s, f) => s.Id)
-                .Select(s => new FeeApplicationBiz
+                .Select((s, f) => new FeeApplicationBiz
                 {
                     Id = s.Id,
-                    AccountDate = SqlFunc.ToDate(s.AccountDate),
+                    AccountDate = s.AccountDate,
                     BusinessType = BusinessType.OceanShippingExport,
                     CntrTotal = s.CntrTotal,
                     CreateBy = s.CreateBy,
@@ -95,6 +95,12 @@ namespace DS.WMS.Core.Fee.Method
                     Voyage = s.Voyno,//航次
                     BookingNO = s.BookingNo,
                     StlName = s.StlName,
+                    FeeType = f.FeeType,
+                    FeeId = f.FeeId,
+                    Currency = f.Currency,
+                    IsAdvancedPay = f.IsAdvancedPay,
+                    IsInvoice = f.IsInvoice,
+
                     UnpaidRMB = SqlFunc.Subqueryable<FeeRecord>().Where(f => f.BusinessId == s.Id && f.FeeStatus == FeeStatus.AuditPassed &&
                         f.FeeType == FeeType.Payable && f.Currency == "CNY").Select(f => SqlFunc.AggregateSumNoNull(f.Amount.Value)),
                     UnpaidUSD = SqlFunc.Subqueryable<FeeRecord>().Where(f => f.BusinessId == s.Id && f.FeeStatus == FeeStatus.AuditPassed &&

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

@@ -35,7 +35,7 @@ namespace DS.WMS.FeeApi.Controllers
         }
 
         /// <summary>
-        /// 获取待审核列表
+        /// 获取待付费的业务列表
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
@@ -51,7 +51,7 @@ namespace DS.WMS.FeeApi.Controllers
         /// <param name="application">申请单</param>
         /// <returns></returns>
         [HttpPost, Route("Save")]
-        public async Task<DataResult> SaveAsync([FromBody] FeeApplication application) 
+        public async Task<DataResult> SaveAsync([FromBody] FeeApplication application)
         {
             return await _service.SaveAsync(application);
         }
@@ -62,7 +62,7 @@ namespace DS.WMS.FeeApi.Controllers
         /// <param name="model">申请单ID</param>
         /// <returns></returns>
         [HttpPost, Route("Delete")]
-        public async Task<DataResult> DeleteAsync(IdModel model) 
+        public async Task<DataResult> DeleteAsync([FromBody] IdModel model)
         {
             if (model.Id == null || model.Ids.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);
@@ -90,7 +90,7 @@ namespace DS.WMS.FeeApi.Controllers
         /// <param name="model">申请单ID</param>
         /// <returns></returns>
         [HttpPost, Route("Withdraw")]
-        public async Task<DataResult> WithdrawAsync(IdModel model) 
+        public async Task<DataResult> WithdrawAsync([FromBody] IdModel model)
         {
             if (model.Ids == null || model.Ids.Length == 0)
                 return DataResult.Failed("参数无效", MultiLanguageConst.IllegalRequest);

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

@@ -1160,3 +1160,10 @@
 2024-06-11 15:46:56.8603 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 15:46:56.8603 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-06-11 15:46:56.8603 Info Configuration initialized.
+2024-06-11 17:00:00.0968 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-11 17:00:00.1229 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-11 17:00:00.1692 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-11 17:00:00.1804 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-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.