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

ds-wms-service/DS.WMS.Core/Application/Dtos/ApplicationRequest.cs

@@ -1,5 +1,6 @@
 using DS.WMS.Core.Application.Entity;
 using DS.WMS.Core.Fee.Dtos;
+using SqlSugar;
 
 namespace DS.WMS.Core.Application.Dtos
 {
@@ -18,9 +19,28 @@ namespace DS.WMS.Core.Application.Dtos
         /// </summary>
         public List<BizItem> Items { get; set; } = [];
 
+        /// <summary>
+        /// 汇率转换信息
+        /// </summary>
+        public List<ExchangeRate>? Exchanges { get; set; }
+
         /// <summary>
         /// 查询条件字符串
         /// </summary>
         public string? QueryString { get; set; }
+
+        /// <summary>
+        /// 根据查询条件字符串提取查询条件对象
+        /// </summary>
+        /// <param name="client"></param>
+        /// <returns></returns>
+        public List<IConditionalModel> GetQueryConditions(ISqlSugarClient client) 
+        {
+            List<IConditionalModel> whereList = [];
+            if (!string.IsNullOrEmpty(QueryString))
+                whereList = client.ConfigQuery.Context.Utilities.JsonToConditionalModels(QueryString);
+
+            return whereList;
+        }
     }
 }

ds-wms-service/DS.WMS.Core/Application/Method/ApplicationService`1.cs

@@ -1,10 +1,8 @@
-using System.Collections.Generic;
+using DS.Module.Core;
-using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.WMS.Core.Application.Dtos;
 using DS.WMS.Core.Application.Entity;
 using DS.WMS.Core.Application.Interface;
-using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Fee.Method;
 using DS.WMS.Core.Flow.Dtos;
@@ -188,11 +186,18 @@ namespace DS.WMS.Core.Application.Method
         {
             request.Application ??= new();
 
-            List<IConditionalModel> whereList = [];
+            request.Application.Details = await GetDetailsAsync(request);
-            if (!string.IsNullOrEmpty(request.QueryString))
+            if (!string.IsNullOrEmpty(request.Application.Currency) && request.Exchanges?.Count > 0) //非原币申请
-                whereList = Db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryString);
+            {
+                var details = request.Application.Details.FindAll(x => x.Currency != request.Application.Currency);
+                foreach (var detail in details)
+                {
+                    var exchange = request.Exchanges.Find(x => x.CurrencyFrom == detail.Currency && x.CurrencyTo == request.Application.Currency);
+                    detail.ExchangeRate = exchange == null ? 1 : exchange.Rate;
+                    detail.Currency = request.Application.Currency;
+                }
+            }
 
-            request.Application.Details = await GetDetailsAsync(request.Items, whereList);
             return await SaveAsync(request.Application);
         }
 
@@ -260,10 +265,9 @@ namespace DS.WMS.Core.Application.Method
         /// <summary>
         /// 获取业务所关联的申请明细
         /// </summary>
-        /// <param name="items"></param>
+        /// <param name="request"></param>
-        /// <param name="conditions"></param>
         /// <returns></returns>
-        protected virtual Task<List<ApplicationDetail>> GetDetailsAsync(IEnumerable<BizItem> items, List<IConditionalModel>? conditions)
+        protected virtual Task<List<ApplicationDetail>> GetDetailsAsync(ApplicationRequest<TEntity> request)
         {
             return Task.FromResult(new List<ApplicationDetail>());
         }

ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs

@@ -410,17 +410,22 @@ namespace DS.WMS.Core.Application.Method
             return rows > 0 ? DataResult.Success : DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed));
         }
 
-        protected override async Task<List<ApplicationDetail>> GetDetailsAsync(IEnumerable<BizItem> items, List<IConditionalModel>? conditions)
+        protected override async Task<List<ApplicationDetail>> GetDetailsAsync(ApplicationRequest<InvoiceApplication> request)
         {
-            var ids1 = items.Select(x => x.Id);
+            var ids1 = request.Items.Select(x => x.Id);
-            var ids2 = items.Select(x => x.BusinessType);
+            var ids2 = request.Items.Select(x => x.BusinessType);
 
             var list = await TenantDb.Queryable<FeeRecord>().Where(x =>
                 ids1.Contains(x.BusinessId) && ids2.Contains(x.BusinessType) && x.FeeStatus == FeeStatus.AuditPassed)
-                .Where(conditions)
+                .Where(request.GetQueryConditions(Db))
                 .Select(x => new ApplicationDetail
                 {
-                    Id = x.Id,
+                    RecordId = x.Id,
+                    CustomerName = x.CustomerName,
+                    FeeType = x.FeeType,
+                    FeeId = x.FeeId,
+                    FeeName = x.FeeName,
+                    Currency = x.Currency,
                     ApplyAmount = x.Amount - x.InvoiceAmount - x.OrderInvoiceAmount + x.OrderInvSettlementAmount,
                     ExchangeRate = x.ExchangeRate,
                     OriginalCurrency = x.Currency

ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationService.cs

@@ -8,6 +8,7 @@ using DS.WMS.Core.Application.Interface;
 using DS.WMS.Core.Fee.Dtos;
 using DS.WMS.Core.Fee.Entity;
 using DS.WMS.Core.Info.Entity;
+using DS.WMS.Core.Invoice.Dtos;
 using DS.WMS.Core.Op.Entity;
 using DS.WMS.Core.Sys.Entity;
 using SqlSugar;
@@ -378,19 +379,23 @@ namespace DS.WMS.Core.Application.Method
             return DataResult<PaymentApplicationDto>.Success(dto);
         }
 
-        protected override async Task<List<ApplicationDetail>> GetDetailsAsync(IEnumerable<BizItem> items, List<IConditionalModel>? conditions)
+        protected override async Task<List<ApplicationDetail>> GetDetailsAsync(ApplicationRequest<PaymentApplication> request)
         {
-            var ids1 = items.Select(x => x.Id);
+            var ids1 = request.Items.Select(x => x.Id);
-            var ids2 = items.Select(x => x.BusinessType);
+            var ids2 = request.Items.Select(x => x.BusinessType);
 
             var list = await TenantDb.Queryable<FeeRecord>().Where(x =>
                 ids1.Contains(x.BusinessId) && ids2.Contains(x.BusinessType) && x.FeeStatus == FeeStatus.AuditPassed)
-                .Where(conditions)
+                .Where(request.GetQueryConditions(Db))
                 .Select(x => new ApplicationDetail
                 {
                     RecordId = x.Id,
-                    ApplyAmount = x.Amount - x.SettlementAmount - x.OrderAmount + x.OrderSettlementAmount,
+                    CustomerName = x.CustomerName,
+                    FeeType = x.FeeType,
+                    FeeId = x.FeeId,
+                    FeeName = x.FeeName,
                     Currency = x.Currency,
+                    ApplyAmount = x.Amount - x.SettlementAmount - x.OrderAmount + x.OrderSettlementAmount,
                     ExchangeRate = x.ExchangeRate,
                     OriginalCurrency = x.Currency
                 }).ToListAsync();
@@ -402,7 +407,6 @@ namespace DS.WMS.Core.Application.Method
             return list;
         }
 
-
         protected override DataResult EnsureApplication(PaymentApplication application, PaymentApplication? dbValue)
         {
             if (dbValue != null)

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

@@ -10,12 +10,12 @@ namespace DS.WMS.Core.Fee.Dtos
         /// <summary>
         /// 原币别
         /// </summary>
-        public string CurrencyFrom { get; set; }
+        public string CurrencyFrom { get; set; } = string.Empty;
 
         /// <summary>
         /// 目标币别
         /// </summary>
-        public string CurrencyTo { get; set; }
+        public string CurrencyTo { get; set; } = string.Empty;
 
         /// <summary>
         /// 费用类型（用于指定应收/应付汇率）

ds-wms-service/DS.WMS.Core/Invoice/Interface/IInvoiceIssuanceService.cs

@@ -0,0 +1,26 @@
+using DS.Module.Core;
+using DS.WMS.Core.Invoice.Dtos;
+
+namespace DS.WMS.Core.Invoice.Interface
+{
+    /// <summary>
+    /// 发票开具
+    /// </summary>
+    public interface IInvoiceIssuanceService
+    {
+        /// <summary>
+        /// 发起开票请求
+        /// </summary>
+        /// <param name="ids">开票的发票ID</param>
+        /// <returns></returns>
+        Task<DataResult<string>> InitiateAsync(params long[] ids);
+
+        /// <summary>
+        /// 添加租户信息
+        /// </summary>
+        /// <param name="tenant">租户信息</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">当<paramref name="tenant"/>为null时引发。</exception>
+        Task<string> AddTenantAsync(Tenant tenant);
+    }
+}

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

@@ -96,5 +96,19 @@ namespace DS.WMS.FeeApi.Controllers
 
             return await _invokeService.DeleteAsync(model);
         }
+
+        /// <summary>
+        /// 根据ID删除明细
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost, Route("DeleteDetails")]
+        public async Task<DataResult> DeleteAsync([FromServices] IFeeCustTemplateDetailService detailService, [FromBody] IdModel model)
+        {
+            if (!ModelState.IsValid)
+                return DataResult.Failed(ModelState.GetErrorMessage(), MultiLanguageConst.IllegalRequest);
+
+            return await detailService.DeleteAsync(model);
+        }
     }
 }

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

@@ -36,17 +36,6 @@ namespace DS.WMS.FeeApi.Controllers
             return await _service.GetApplicationListAsync(request);
         }
 
-        /// <summary>
-        /// 获取发票申请明细
-        /// </summary>
-        /// <param name="id">申请单ID</param>
-        /// <returns></returns>
-        [HttpGet, Route("GetApplicationDetails")]
-        public async Task<DataResult<List<InvoiceApplicationDetailDto>>> GetApplicationDetailsAsync([FromQuery]long id) 
-        {
-            return await _service.GetApplicationDetailsAsync(id);
-        }
-
         /// <summary>
         /// 获取发票申请明细
         /// </summary>
@@ -142,5 +131,33 @@ namespace DS.WMS.FeeApi.Controllers
             bool isLocked = Convert.ToBoolean(model.Value);
             return await _service.SetLockAsync(isLocked, model.Ids);
         }
+
+        /// <summary>
+        /// 发起开票请求
+        /// </summary>
+        /// <param name="issuanceService"></param>
+        /// <param name="idModel">开票的发票ID</param>
+        /// <returns></returns>
+        [HttpPost, Route("Initiate")]
+        public async Task<DataResult<string>> InitiateAsync([FromServices] IInvoiceIssuanceService issuanceService,
+            [FromBody] IdModel idModel)
+        {
+            if (!ModelState.IsValid)
+                return DataResult<string>.Failed(ModelState.GetErrorMessage(), MultiLanguageConst.IllegalRequest);
+
+            return await issuanceService.InitiateAsync(idModel.Ids);
+        }
+
+        /// <summary>
+        /// 添加租户信息
+        /// </summary>
+        /// <param name="issuanceService"></param>
+        /// <param name="tenant">租户信息</param>
+        /// <returns></returns>
+        [HttpPost, Route("AddTenant")]
+        public async Task<string> AddTenantAsync([FromServices] IInvoiceIssuanceService issuanceService, Tenant tenant)
+        {
+            return await issuanceService.AddTenantAsync(tenant);
+        }
     }
 }

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-09-04T02:07:38.3707398Z||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;</History>
+    <History>True|2024-09-05T01:12:44.5610882Z||;True|2024-09-04T10:07:38.3707398+08:00||;True|2024-09-04T09:52:47.0574599+08:00||;True|2024-09-03T16:41:23.7516960+08:00||;True|2024-09-03T15:22:31.8718097+08:00||;True|2024-09-03T10:01:09.7656702+08:00||;False|2024-09-03T09:46:46.8956531+08:00||;True|2024-09-02T17:07:41.0268500+08:00||;True|2024-09-02T13:50:22.0203254+08:00||;True|2024-09-02T13:34:23.3441546+08:00||;True|2024-08-30T11:25:14.7431645+08:00||;True|2024-08-29T16:38:26.3491372+08:00||;True|2024-08-29T16:32:31.8580864+08:00||;False|2024-08-29T16:30:41.4763198+08:00||;True|2024-08-09T09:18:05.8484398+08:00||;True|2024-08-09T08:45:38.7858906+08:00||;True|2024-08-05T11:37:07.3133020+08:00||;True|2024-07-24T16:45:58.2272340+08:00||;True|2024-07-24T15:48:52.0128987+08:00||;True|2024-07-23T17:41:01.7494842+08:00||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>