From 4c95576cf4cb986ee514b4f1e1622365ccc716e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Wed, 6 Nov 2024 20:39:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=88=97=E8=A1=A8=E8=B4=B9=E7=94=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Fee/Method/FeeAuditService.cs | 2 +- .../Fee/Method/FeeRecordService.cs | 2 +- .../Settlement/Method/SettlementService`1.cs | 62 ++++++++++++++----- 3 files changed, 47 insertions(+), 19 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs index 63c76cee..9360c3b3 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeAuditService.cs @@ -395,7 +395,7 @@ namespace DS.WMS.Core.Fee.Method var query1 = TenantDb.Queryable().Where(f => f.BusinessId == request.Id && f.BusinessType == request.BusinessType) .InnerJoin((f, s) => f.BusinessId == s.Id) .LeftJoin((f, s, i) => f.CustomerId == i.Id) - .WhereIF(ids1.Length > 0, (f, s, i) => (ids1.Contains(f.Id) || ids2.Contains(f.BusinessId)) && AuditStatusArray.Contains(f.FeeStatus)) + .WhereIF(ids1.Length > 0, (f, s, i) => ids1.Contains(f.Id) || ids2.Contains(f.BusinessId)) .Select((f, s, i) => new FeeAuditItemQuery { Id = f.Id, diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs index 93eabd9f..f980b03b 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs @@ -914,7 +914,7 @@ namespace DS.WMS.Core.Fee.Method } else if (taskType == TaskBaseTypeEnum.BILL_PAY_AUDIT) { - if (entity.BillAuditStatus != BillAuditStatus.PaySubmitted && entity.BillAuditStatus != BillAuditStatus.PayRejected) + if (entity.BillAuditStatus != BillAuditStatus.PaySubmitted || entity.BillAuditStatus != BillAuditStatus.PayRejected) return DataResult.Failed(string.Format( MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.BillFeeStatusError)), entity.BillAuditStatus.GetDescription())); } diff --git a/ds-wms-service/DS.WMS.Core/Settlement/Method/SettlementService`1.cs b/ds-wms-service/DS.WMS.Core/Settlement/Method/SettlementService`1.cs index 4f881de0..983d1dfe 100644 --- a/ds-wms-service/DS.WMS.Core/Settlement/Method/SettlementService`1.cs +++ b/ds-wms-service/DS.WMS.Core/Settlement/Method/SettlementService`1.cs @@ -140,11 +140,11 @@ namespace DS.WMS.Core.Settlement.Method { detail.Currency = settlement.Currency; - var doc = request.Documents.Find(x => x.Id == detail.ApplicationId); + var doc = request.Documents.Find(x => x.Id == detail.RefId); if (doc == null) return DataResult.Failed("结算单据与费用明细不一致"); - var exchange = doc.ExchangeRates?.Find(x => x.Currency == settlement.Currency); + var exchange = doc.ExchangeRates?.Find(x => x.Currency == detail.OriginalCurrency); if (exchange == null) return DataResult.Failed($"未传入结算币别 {settlement.Currency} 与费用原币别 {detail.OriginalCurrency} 之间的汇率信息"); @@ -250,14 +250,14 @@ namespace DS.WMS.Core.Settlement.Method details1.Where(x => x.RefId == doc.Id).OrderBy(x => x.ApplyAmount) : details1.Where(x => x.BusinessId == doc.Id && x.BusinessType == doc.BusinessType && x.CustomerName == doc.CustomerName).OrderBy(x => x.ApplyAmount); - var rmbDetails = details2.Where(x => x.Currency == FeeCurrency.RMB_CODE); - var totalRMB = rmbDetails.Sum(x => x.ApplyAmount); + var rmbDetails = details2.Where(x => x.OriginalCurrency == FeeCurrency.RMB_CODE); + var totalRMB = rmbDetails.Sum(x => x.OriginalAmount); doc.SettlementRMB ??= totalRMB; if (doc.SettlementRMB > totalRMB) return DataResult.Failed("人民币结算金额不能大于剩余人民币金额"); - if (totalRMB < doc.SettlementRMB) + if (doc.SettlementRMB < totalRMB) { var rest = totalRMB - doc.SettlementRMB.GetValueOrDefault(); foreach (var detail in rmbDetails) @@ -265,19 +265,29 @@ namespace DS.WMS.Core.Settlement.Method if (rest == 0) break; - detail.ApplyAmount = detail.ApplyAmount - rest; - rest = detail.ApplyAmount - rest; + detail.OriginalAmount = detail.OriginalAmount - rest; + if (detail.OriginalCurrency == settlement.Currency) + { + detail.ApplyAmount = detail.OriginalAmount; + } + else + { + var er = doc.ExchangeRates.Find(x => x.Currency == detail.OriginalCurrency); + detail.ApplyAmount = detail.OriginalAmount * er?.ExchangeRate ?? 1; + } + + rest = detail.OriginalAmount - rest; } } - var usdDetails = details2.Where(x => x.Currency == FeeCurrency.USD_CODE); - var totalUSD = usdDetails.Sum(x => x.ApplyAmount); + var usdDetails = details2.Where(x => x.OriginalCurrency == FeeCurrency.USD_CODE); + var totalUSD = usdDetails.Sum(x => x.OriginalAmount); doc.SettlementUSD ??= totalUSD; if (doc.SettlementUSD > totalUSD) return DataResult.Failed("美元结算金额不能大于剩余美元金额"); - if (totalUSD < doc.SettlementUSD) + if (doc.SettlementUSD < totalUSD) { var rest = totalUSD - doc.SettlementUSD.GetValueOrDefault(); foreach (var detail in usdDetails) @@ -285,19 +295,28 @@ namespace DS.WMS.Core.Settlement.Method if (rest == 0) break; - detail.ApplyAmount = detail.ApplyAmount - rest; - rest = detail.ApplyAmount - rest; + detail.OriginalAmount = detail.OriginalAmount - rest; + if (detail.OriginalCurrency == settlement.Currency) + { + detail.ApplyAmount = detail.OriginalAmount; + } + else + { + var er = doc.ExchangeRates.Find(x => x.Currency == detail.OriginalCurrency); + detail.ApplyAmount = detail.OriginalAmount * er?.ExchangeRate ?? 1; + } + rest = detail.OriginalAmount - rest; } } - var otherDetails = details2.Where(x => x.Currency != FeeCurrency.RMB_CODE && x.Currency != FeeCurrency.USD_CODE); - var total = rmbDetails.Sum(x => x.ApplyAmount); + var otherDetails = details2.Where(x => x.OriginalCurrency != FeeCurrency.RMB_CODE && x.Currency != FeeCurrency.USD_CODE); + var total = otherDetails.Sum(x => x.OriginalAmount); doc.SettlementOther ??= total; if (doc.SettlementOther > total) return DataResult.Failed("其他结算金额不能大于剩余其他金额"); - if (total < doc.SettlementOther) + if (doc.SettlementOther < total) { var rest = total - doc.SettlementOther.GetValueOrDefault(); foreach (var detail in otherDetails) @@ -305,8 +324,17 @@ namespace DS.WMS.Core.Settlement.Method if (rest == 0) break; - detail.ApplyAmount = detail.ApplyAmount - rest; - rest = detail.ApplyAmount - rest; + detail.OriginalAmount = detail.OriginalAmount - rest; + if (detail.OriginalCurrency == settlement.Currency) + { + detail.ApplyAmount = detail.OriginalAmount; + } + else + { + var er = doc.ExchangeRates.Find(x => x.Currency == detail.OriginalCurrency); + detail.ApplyAmount = detail.OriginalAmount * er?.ExchangeRate ?? 1; + } + rest = detail.OriginalAmount - rest; } } } From 58eb8ee7647035ac07c9e4be53ef9c9a4b377dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Thu, 7 Nov 2024 09:37:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=B1=BB=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Method/ApplicationAuditService`1.cs | 4 +- .../Method/InvoiceApplicationAuditService.cs | 2 +- .../Method/PaymentApplicationAuditService.cs | 2 +- .../Fee/Method/FeeRecordService.cs | 20 ++-- .../Method/ReportProviders/DebitNoteReport.cs | 14 ++- .../ReportProviders/ProfitAccountingReport.cs | 14 ++- .../Flow/Method/FlowInstanceService.cs | 6 +- .../Op/Entity/BusinessFeeStatus.cs | 2 +- .../Interface/IApplicationTaskService.cs | 10 ++ .../Method/ApplicationTaskService.cs | 102 ++++++++++++++++++ .../Method/FeeBillTaskService.cs | 7 +- 11 files changed, 160 insertions(+), 23 deletions(-) create mode 100644 ds-wms-service/DS.WMS.Core/TaskInteraction/Interface/IApplicationTaskService.cs create mode 100644 ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/ApplicationAuditService`1.cs b/ds-wms-service/DS.WMS.Core/Application/Method/ApplicationAuditService`1.cs index 214ee78d..82193b42 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/ApplicationAuditService`1.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/ApplicationAuditService`1.cs @@ -24,7 +24,7 @@ namespace DS.WMS.Core.Application.Method public abstract TaskBaseTypeEnum AuditType { get; } readonly IClientFlowInstanceService flowService; - readonly IAuditTaskService taskService; + readonly IApplicationTaskService taskService; /// /// 初始化 @@ -33,7 +33,7 @@ namespace DS.WMS.Core.Application.Method public ApplicationAuditService(IServiceProvider serviceProvider) : base(serviceProvider) { flowService = serviceProvider.GetRequiredService(); - taskService = serviceProvider.GetRequiredService(); + taskService = serviceProvider.GetRequiredService(); } /// diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs index 090333bc..b2edcf38 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationAuditService.cs @@ -97,7 +97,7 @@ namespace DS.WMS.Core.Application.Method protected override DataResult PreAudit(List applications) { - if (applications.Exists(x => x.Status != InvoiceApplicationStatus.AuditSubmittd)) + if (applications.Exists(x => x.Status != InvoiceApplicationStatus.AuditSubmittd && x.Status != InvoiceApplicationStatus.AuditPassed)) return DataResult.FailedWithDesc(nameof(MultiLanguageConst.ApplicationIsNotAuditing)); return DataResult.Success; diff --git a/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs b/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs index fb7f454a..2a88eb82 100644 --- a/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs +++ b/ds-wms-service/DS.WMS.Core/Application/Method/PaymentApplicationAuditService.cs @@ -289,7 +289,7 @@ namespace DS.WMS.Core.Application.Method protected override DataResult PreAudit(List applications) { - if (applications.Exists(x => x.Status != PaymentApplicationStatus.AuditSubmittd)) + if (applications.Exists(x => x.Status != PaymentApplicationStatus.AuditSubmittd && x.Status != PaymentApplicationStatus.AuditPassed)) return DataResult.FailedWithDesc(nameof(MultiLanguageConst.ApplicationIsNotAuditing)); return DataResult.Success; diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs index f980b03b..1084542f 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/FeeRecordService.cs @@ -908,13 +908,15 @@ namespace DS.WMS.Core.Fee.Method if (taskType == TaskBaseTypeEnum.BILL_RECV_AUDIT) { - if (entity.BillAuditStatus != BillAuditStatus.Pending && entity.BillAuditStatus != BillAuditStatus.RecvRejected) + if (entity.BillAuditStatus == BillAuditStatus.PaySubmitted || entity.BillAuditStatus == BillAuditStatus.PayRejected) + taskType = TaskBaseTypeEnum.BILL_PAY_AUDIT; + else if (entity.BillAuditStatus != BillAuditStatus.Pending && entity.BillAuditStatus != BillAuditStatus.RecvRejected) return DataResult.Failed(string.Format( MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.BillFeeStatusError)), entity.BillAuditStatus.GetDescription())); } else if (taskType == TaskBaseTypeEnum.BILL_PAY_AUDIT) { - if (entity.BillAuditStatus != BillAuditStatus.PaySubmitted || entity.BillAuditStatus != BillAuditStatus.PayRejected) + if (entity.BillAuditStatus != BillAuditStatus.PaySubmitted && entity.BillAuditStatus != BillAuditStatus.PayRejected) return DataResult.Failed(string.Format( MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.BillFeeStatusError)), entity.BillAuditStatus.GetDescription())); } @@ -985,11 +987,6 @@ namespace DS.WMS.Core.Fee.Method x.ARFeeStatus, x.APFeeStatus }).ExecuteCommandAsync(); - - //修改关联费用状态为提交审核 - await TenantDb.Updateable().Where(x => x.BusinessId == bid && x.BusinessType == type && - (x.FeeStatus == FeeStatus.Entering || x.FeeStatus == FeeStatus.Withdraw || x.FeeStatus == FeeStatus.RejectSubmission)) - .SetColumns(x => x.FeeStatus == FeeStatus.AuditSubmitted).ExecuteCommandAsync(); } else if (taskType == TaskBaseTypeEnum.BILL_PAY_AUDIT) { @@ -1000,6 +997,11 @@ namespace DS.WMS.Core.Fee.Method }).ExecuteCommandAsync(); } + //修改关联费用状态为提交审核 + await TenantDb.Updateable().Where(x => x.BusinessId == bid && x.BusinessType == type && + (x.FeeStatus == FeeStatus.Entering || x.FeeStatus == FeeStatus.Withdraw || x.FeeStatus == FeeStatus.RejectSubmission)) + .SetColumns(x => x.FeeStatus == FeeStatus.AuditSubmitted).ExecuteCommandAsync(); + if (useTransaction) await TenantDb.Ado.CommitTranAsync(); return DataResult.Success; @@ -1039,7 +1041,9 @@ namespace DS.WMS.Core.Fee.Method if (taskType == TaskBaseTypeEnum.BILL_RECV_AUDIT) { - if (entity.BillAuditStatus != BillAuditStatus.RecvSubmitted) + if (entity.BillAuditStatus == BillAuditStatus.PaySubmitted) + taskType = TaskBaseTypeEnum.BILL_PAY_AUDIT; + else if (entity.BillAuditStatus != BillAuditStatus.RecvSubmitted) return DataResult.Failed(string.Format( MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.BusinessStatusError)), entity.BillAuditStatus.GetDescription())); } diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/DebitNoteReport.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/DebitNoteReport.cs index 72694e76..93e53e1d 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/DebitNoteReport.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/DebitNoteReport.cs @@ -11,15 +11,23 @@ namespace DS.WMS.Core.Fee.Method.ReportProviders /// /// 费用确认单 /// - public class DebitNoteReport : IReportProvider + public class DebitNoteReport : ServiceBase, IReportProvider { + /// + /// 初始化 + /// + /// + public DebitNoteReport(IServiceProvider provider) : base(provider) + { + } + public async Task GetDataAsync(ReportContext context) { DebitNote? form = null; switch (context.BusinessType) { case BusinessType.OceanShippingExport: - form = await context.TenantDb.Queryable().Where(s => s.Id == context.BusinessId).Select().FirstAsync(); + form = await AsQueryable().Where(s => s.Id == context.BusinessId).Select().FirstAsync(); break; case BusinessType.OceanShippingImport: @@ -32,7 +40,7 @@ namespace DS.WMS.Core.Fee.Method.ReportProviders if (form != null) { - form.Items = await context.TenantDb.Queryable().Where(x => x.BusinessId == context.BusinessId && x.BusinessType == context.BusinessType) + form.Items = await AsQueryable().Where(x => x.BusinessId == context.BusinessId && x.BusinessType == context.BusinessType) .WhereIF(context.Ids != null && context.Ids.Length > 0, x => context.Ids.Contains(x.Id)) .Select(x => new DebitNoteItem { diff --git a/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/ProfitAccountingReport.cs b/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/ProfitAccountingReport.cs index 05fcedd2..1d903760 100644 --- a/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/ProfitAccountingReport.cs +++ b/ds-wms-service/DS.WMS.Core/Fee/Method/ReportProviders/ProfitAccountingReport.cs @@ -12,17 +12,25 @@ namespace DS.WMS.Core.Fee.Method.ReportProviders /// /// 利润核算单 /// - public class ProfitAccountingReport : IReportProvider + public class ProfitAccountingReport : ServiceBase, IReportProvider { internal static readonly string[] CustomerTypes = ["booking", "controller", "shippercn", "yard", "truck", "custom"]; + /// + /// 初始化 + /// + /// + public ProfitAccountingReport(IServiceProvider provider) : base(provider) + { + } + public async Task GetDataAsync(ReportContext context) { ProfitAccounting? form = null; switch (context.BusinessType) { case BusinessType.OceanShippingExport: - form = await context.TenantDb.Queryable().Where(s => s.Id == context.BusinessId) + form = await AsQueryable().Where(s => s.Id == context.BusinessId) .Select(s => new ProfitAccounting { ETDValue = s.ETD, @@ -71,7 +79,7 @@ namespace DS.WMS.Core.Fee.Method.ReportProviders form.CabinRemark = string.Join(delimiter, remarks.Where(x => x.RemarkType == "2").Select(x => x.Remark)); form.BookingRemark = string.Join(delimiter, remarks.Where(x => x.RemarkType == "3").Select(x => x.Remark)); - var list = await context.TenantDb.Queryable().Where(x => x.BusinessId == context.BusinessId && x.BusinessType == context.BusinessType) + var list = await AsQueryable().Where(x => x.BusinessId == context.BusinessId && x.BusinessType == context.BusinessType) .WhereIF(context.Ids != null && context.Ids.Length > 0, x => context.Ids.Contains(x.Id)) .OrderByDescending(x => x.Currency).Select().ToListAsync(); if (list.Count > 0) diff --git a/ds-wms-service/DS.WMS.Core/Flow/Method/FlowInstanceService.cs b/ds-wms-service/DS.WMS.Core/Flow/Method/FlowInstanceService.cs index a66626d9..9c310ecb 100644 --- a/ds-wms-service/DS.WMS.Core/Flow/Method/FlowInstanceService.cs +++ b/ds-wms-service/DS.WMS.Core/Flow/Method/FlowInstanceService.cs @@ -7,6 +7,8 @@ using DS.WMS.Core.Flow.Interface; using DS.WMS.Core.Op.Entity; using DS.WMS.Core.Sys.Entity; using Mapster; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Newtonsoft.Json; using SqlSugar; @@ -24,12 +26,14 @@ public class FlowInstanceService : ServiceBase, IFlowInstanceService api = new ApiFox(); } + ILogger logger; /// /// 初始化 /// /// public FlowInstanceService(IServiceProvider serviceProvider) : base(serviceProvider) { + logger = serviceProvider.GetRequiredService>(); } /// @@ -615,7 +619,7 @@ public class FlowInstanceService : ServiceBase, IFlowInstanceService } else { - await new ApplicationException($"访问回调URL：{instance.CallbackURL} 时返回了错误：" + result.Message).LogAsync(Db); + logger.LogError($"访问回调URL：{instance?.CallbackURL} 时返回了错误：" + result?.Message); } } catch (Exception ex) diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessFeeStatus.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessFeeStatus.cs index 6e03092f..b9f58d73 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessFeeStatus.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BusinessFeeStatus.cs @@ -66,7 +66,7 @@ namespace DS.WMS.Core.Op.Entity /// Desc:是否费用锁定 /// [SugarColumn(ColumnDescription = "是否费用锁定", DefaultValue = "0")] - public bool? IsFeeLocking { get; set; } = false; + public bool? IsFeeLocking { get; set; } = false; /// /// 整单费用审核状态 diff --git a/ds-wms-service/DS.WMS.Core/TaskInteraction/Interface/IApplicationTaskService.cs b/ds-wms-service/DS.WMS.Core/TaskInteraction/Interface/IApplicationTaskService.cs new file mode 100644 index 00000000..143f2d4c --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/TaskInteraction/Interface/IApplicationTaskService.cs @@ -0,0 +1,10 @@ +namespace DS.WMS.Core.TaskInteraction.Interface +{ + /// + /// 申请类审核任务 + /// + public interface IApplicationTaskService : IAuditTaskService + { + + } +} diff --git a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs new file mode 100644 index 00000000..5ddac3ee --- /dev/null +++ b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs @@ -0,0 +1,102 @@ +using DS.Module.Core; +using DS.WMS.Core.Flow.Dtos; +using DS.WMS.Core.Flow.Entity; +using DS.WMS.Core.TaskInteraction.Dtos; +using DS.WMS.Core.TaskInteraction.Entity; +using DS.WMS.Core.TaskInteraction.Interface; + +namespace DS.WMS.Core.TaskInteraction.Method +{ + /// + /// 申请类审核任务 + /// + public class ApplicationTaskService : TaskService, IApplicationTaskService + { + /// + /// 初始化 + /// + /// + public ApplicationTaskService(IServiceProvider provider) : base(provider) + { + } + + public async override Task AuditAsync(TaskAuditRequest request) + { + var tasksList = await TenantDb.Queryable().Where(x => x.TaskType == request.TaskType && request.Ids.Contains(x.BusinessId)) + .WhereIF(request.BusinessType.HasValue, x => x.BusinessType == request.BusinessType.Value).ToListAsync(); + if (tasksList.Count == 0) + return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskNotExists)); + if (tasksList.Count != request.Ids.Length) + return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskCountNotMatch)); + + if (tasksList.Exists(x => x.TaskStatus != TaskStatusEnum.Create && x.TaskStatus != TaskStatusEnum.Pending && x.TaskStatus != TaskStatusEnum.Complete)) + return DataResult.FailedWithDesc(nameof(MultiLanguageConst.TaskAuditStatusError)); + + DataResult result = DataResult.Success; + var tasks = tasksList.FindAll(x => x.TaskStatus == TaskStatusEnum.Create); + var task2 = tasksList.FindAll(x => x.TaskStatus == TaskStatusEnum.Complete); + await TenantDb.Ado.BeginTranAsync(); + try + { + //状态待审核的任务 + if (tasks.Count > 0) + { + var flowIds = tasks.Select(x => x.FlowId.Value); + var flowInstances = await Db.Queryable().Where(x => flowIds.Contains(x.Id)).ToListAsync(); + foreach (var instance in flowInstances) + { + result = await FlowService.Value.AuditAsync(new FlowAuditInfo + { + AuditNote = request.Remark, + Status = request.Result, + Instance = instance + }); + + if (!result.Succeeded) + return result; + + var req = new TaskUpdateRequest + { + BusinessId = instance.BusinessId, + BusinessType = instance.BusinessType, + RejectReason = request.Remark, + TaskTypeName = request.TaskType.ToString(), + TaskStatus = request.Result == 1 ? TaskStatusEnum.Complete : TaskStatusEnum.Pending, + AutoCreateNext = true + }; + //根据审批结果更新任务状态 + await SetTaskStatusAsync(req, false); + + if (instance.FlowStatus == FlowStatusEnum.Reject) + result.Message = request.Remark!; + } + } + + //已完成审核的任务 + if (task2.Count > 0) + { + switch (request.TaskType) + { + case TaskBaseTypeEnum.APPLICATION_PAYMENT_AUDIT: + break; + + case TaskBaseTypeEnum.APPLICATION_INVOICE_AUDIT: + break; + + default: + return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed)); + } + } + + await TenantDb.Ado.CommitTranAsync(); + return result; + } + catch (Exception ex) + { + await TenantDb.Ado.RollbackTranAsync(); + await ex.LogAsync(Db); + return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed)); + } + } + } +} diff --git a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/FeeBillTaskService.cs b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/FeeBillTaskService.cs index df586315..2ba80827 100644 --- a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/FeeBillTaskService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/FeeBillTaskService.cs @@ -66,8 +66,8 @@ namespace DS.WMS.Core.TaskInteraction.Method BusinessType = x.BusinessType, BillAuditStatus = x.BillAuditStatus, BillFeeStatusTime = x.BillFeeStatusTime, - ProfitMargin = SqlFunc.Subqueryable().Where(f => f.BusinessId == x.BusinessId && f.BusinessType == x.BusinessType && f.FeeType == FeeType.Receivable).Sum(f => f.Amount) - - SqlFunc.Subqueryable().Where(f => f.BusinessId == x.BusinessId && f.BusinessType == x.BusinessType && f.FeeType == FeeType.Payable).Sum(f => f.Amount) + ProfitMargin = SqlFunc.Subqueryable().Where(f => f.BusinessId == x.BusinessId && f.BusinessType == x.BusinessType && f.FeeType == FeeType.Receivable).Sum(f => f.Amount * SqlFunc.IsNull(f.ExchangeRate.Value, 1)) + - SqlFunc.Subqueryable().Where(f => f.BusinessId == x.BusinessId && f.BusinessType == x.BusinessType && f.FeeType == FeeType.Payable).Sum(f => f.Amount * SqlFunc.IsNull(f.ExchangeRate.Value, 1)) }).FirstAsync(); if (biz == null) return; @@ -173,7 +173,7 @@ namespace DS.WMS.Core.TaskInteraction.Method { if (biz.ProfitMargin > 0) { - biz.IsBusinessLocking = true; + biz.IsFeeLocking = true; await SetLockAsync(biz); } else //如果为非正利润则生成锁单任务 @@ -345,6 +345,7 @@ namespace DS.WMS.Core.TaskInteraction.Method BusinessType = callback.BusinessType, TaskTypeName = GetRejectedType(callback.AuditType.Value).ToString()!, TaskTitle = $"【{callback.AuditType.GetDescription()}】【{callback.BusinessType.GetDescription()}】{business.CustomerNo}", + TaskDescription = "审核备注：" + callback.RejectReason, RecvUserIdList = [task.CreateBy] //通知任务发起人 }; //创建驳回任务以进行通知 From 112597380821753a4390c10baae751d6805c3489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Thu, 7 Nov 2024 11:24:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8F=8C=E5=B8=81=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Invoice/Dtos/RequestItem.cs | 5 --- .../Invoice/Method/InvoiceService`1.cs | 38 +++++++------------ .../Method/ApplicationTaskService.cs | 30 +++++++-------- 3 files changed, 29 insertions(+), 44 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Dtos/RequestItem.cs b/ds-wms-service/DS.WMS.Core/Invoice/Dtos/RequestItem.cs index 1eb66b74..2cb23bbb 100644 --- a/ds-wms-service/DS.WMS.Core/Invoice/Dtos/RequestItem.cs +++ b/ds-wms-service/DS.WMS.Core/Invoice/Dtos/RequestItem.cs @@ -10,11 +10,6 @@ /// public long ApplicationId { get; set; } - /// - /// 发票申请币别 - /// - public string Currency { get; set; } - /// /// 本次RMB开票金额 /// diff --git a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceService`1.cs b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceService`1.cs index 16ed527e..99591676 100644 --- a/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceService`1.cs +++ b/ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceService`1.cs @@ -316,32 +316,20 @@ namespace DS.WMS.Core.Invoice.Method Currency = invoice.Currency, OriginalCurrency = item.Currency, ApplyAmount = item.ApplyAmount - item.ProcessedAmount, - OriginalAmount = item.OriginalAmount - item.OriginalProcessedAmount + OriginalAmount = item.OriginalAmount - item.OriginalProcessedAmount, + ExchangeRate = 1 }; var app = request.Applications.Find(x => x.ApplicationId == item.ApplicationId); - if (app != null) + if (app != null) //设置汇率 { - if (app.Currency == invoice.Currency) + var er = app.ExchangeRates?.FirstOrDefault(x => x.Currency == detail.OriginalCurrency); + if (er != null) { - detail.ExchangeRate = 1m; - } - else if (string.IsNullOrEmpty(app.Currency)) //原币申请 - { - detail.ExchangeRate = app.ExchangeRates.FirstOrDefault(x => x.Currency == item.Currency)?.ExchangeRate; - } - else - { - detail.ExchangeRate = app.ExchangeRates.FirstOrDefault(x => x.Currency == invoice.Currency)?.ExchangeRate; + detail.ExchangeRate = er.ExchangeRate; } } - if (!detail.ExchangeRate.HasValue) - detail.ExchangeRate = 1m; - - if (detail.ExchangeRate.HasValue) - detail.ApplyAmount *= detail.ExchangeRate.Value; - invoice.Details.Add(detail); } @@ -598,20 +586,22 @@ namespace DS.WMS.Core.Invoice.Method if (invoiceAmount == 0) return DataResult.Failed("开票金额不能为零"); - var totalRMB = details.Sum(x => x.ApplyAmount); - if (Math.Abs(invoiceAmount) > totalRMB) + var totalAmount = details.Sum(x => x.OriginalAmount); + if (Math.Abs(invoiceAmount) > totalAmount) return DataResult.Failed("申请开票金额不能大于剩余开票金额"); - if (totalRMB != invoiceAmount) //非全额开票 + if (totalAmount != invoiceAmount) //非全额开票 { - var rest = totalRMB - invoiceAmount; + var rest = totalAmount - invoiceAmount; foreach (var detail in details) { if (rest == 0) break; - detail.ApplyAmount = detail.ApplyAmount - rest; - rest = detail.ApplyAmount - rest; + detail.OriginalAmount = detail.OriginalAmount - rest; + rest = detail.OriginalAmount - rest; + + detail.ApplyAmount = detail.OriginalAmount * detail.ExchangeRate.GetValueOrDefault(); } } diff --git a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs index 5ddac3ee..6cdf234c 100644 --- a/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs +++ b/ds-wms-service/DS.WMS.Core/TaskInteraction/Method/ApplicationTaskService.cs @@ -34,12 +34,12 @@ namespace DS.WMS.Core.TaskInteraction.Method DataResult result = DataResult.Success; var tasks = tasksList.FindAll(x => x.TaskStatus == TaskStatusEnum.Create); - var task2 = tasksList.FindAll(x => x.TaskStatus == TaskStatusEnum.Complete); + //var task2 = tasksList.FindAll(x => x.TaskStatus == TaskStatusEnum.Complete); await TenantDb.Ado.BeginTranAsync(); try { //状态待审核的任务 - if (tasks.Count > 0) + if (tasksList.Count > 0) { var flowIds = tasks.Select(x => x.FlowId.Value); var flowInstances = await Db.Queryable().Where(x => flowIds.Contains(x.Id)).ToListAsync(); @@ -72,21 +72,21 @@ namespace DS.WMS.Core.TaskInteraction.Method } } - //已完成审核的任务 - if (task2.Count > 0) - { - switch (request.TaskType) - { - case TaskBaseTypeEnum.APPLICATION_PAYMENT_AUDIT: - break; + ////已完成审核的任务 + //if (task2.Count > 0) + //{ + // switch (request.TaskType) + // { + // case TaskBaseTypeEnum.APPLICATION_PAYMENT_AUDIT: + // break; - case TaskBaseTypeEnum.APPLICATION_INVOICE_AUDIT: - break; + // case TaskBaseTypeEnum.APPLICATION_INVOICE_AUDIT: + // break; - default: - return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed)); - } - } + // default: + // return DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed)); + // } + //} await TenantDb.Ado.CommitTranAsync(); return result; From 3ec22e9ece24a8fc6cd97a70ea84d7c605a5fb0e Mon Sep 17 00:00:00 2001 From: cjy Date: Thu, 7 Nov 2024 11:39:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81GetTaskTypeConst?= =?UTF-8?q?List=E7=AE=B1=E4=BD=BF=E9=87=8D=E5=A4=8D=E9=94=AE=E5=80=BC?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs index 8615f2f1..72b5dbfa 100644 --- a/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs +++ b/ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskBaseTypeEnum.cs @@ -524,7 +524,7 @@ namespace DS.Module.Core /// 打托 /// [Description("打托")] - WAIT_DATUO = 316, + WAIT_DATUO = 317, #endregion #region 工作流-流程类型枚举