From e5e7a99976f1a082453389c61f8fbb9acf5c7cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Thu, 26 Sep 2024 19:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Settlement/Dtos/SettlementDetailDto.cs | 32 +++++++++--- .../Method/ApplicationSettlementService.cs | 41 +-------------- .../Method/InvoiceSettlementService.cs | 51 +++---------------- .../FolderProfile1.pubxml.user | 2 +- 4 files changed, 36 insertions(+), 90 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementDetailDto.cs b/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementDetailDto.cs index bc80bba4..5faf8c34 100644 --- a/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementDetailDto.cs +++ b/ds-wms-service/DS.WMS.Core/Settlement/Dtos/SettlementDetailDto.cs @@ -5,15 +5,10 @@ using DS.WMS.Core.Op.Entity; namespace DS.WMS.Core.Settlement.Dtos { /// - /// 付费申请结算明细DTO + /// 结算明细DTO /// public class SettlementDetailDto { - ///// - ///// 申请明细ID - ///// - //public IEnumerable? Ids { get; set; } - /// /// 申请单ID /// @@ -72,6 +67,11 @@ namespace DS.WMS.Core.Settlement.Dtos /// public string? CreateByName { get; set; } + /// + /// 发票业务号 + /// + public string? BillNO { get; set; } + /// /// 发票号 /// @@ -82,6 +82,26 @@ namespace DS.WMS.Core.Settlement.Dtos /// public DateTime? PaymentDate { get; set; } + /// + /// 开票单位 + /// + public string CustomerName { get; set; } + + /// + /// 开票金额 + /// + public decimal InvoiceAmount { get; set; } + + /// + /// 发票抬头 + /// + public string InvoiceHeader { get; set; } + + /// + /// 开票日期 + /// + public DateTime InvoiceDate { get; set; } + /// /// 备注 /// diff --git a/ds-wms-service/DS.WMS.Core/Settlement/Method/ApplicationSettlementService.cs b/ds-wms-service/DS.WMS.Core/Settlement/Method/ApplicationSettlementService.cs index 55c4d29e..2290ef9f 100644 --- a/ds-wms-service/DS.WMS.Core/Settlement/Method/ApplicationSettlementService.cs +++ b/ds-wms-service/DS.WMS.Core/Settlement/Method/ApplicationSettlementService.cs @@ -88,46 +88,7 @@ namespace DS.WMS.Core.Settlement.Method { var model = await TenantDb.Queryable().Select(x => new PaymentSettlementDto { - Id = x.Id, - ApplicationNO = x.ApplicationNO, //申请编号 - SettlementNO = x.SettlementNO, //结算单号 - CustomerId = x.CustomerId, //结算单位 - CustomerName = x.CustomerName, - Mode = x.Mode, //结算类型 - SettlementDate = x.SettlementDate, //结算日期 - SettlementTypeId = x.SettlementTypeId, //结算方式 - CustomerBankId = x.CustomerBankId, //客户银行 - Account = x.Account, //客户账户 - Currency = x.Currency, //币别 - Amount = x.Amount, //金额 - ExchangeRate = x.ExchangeRate, //汇率 - IsLocked = x.IsLocked, //锁定状态 - SaleDeptId = x.SaleDeptId, //所属分部 - BillType = x.BillType, //单据类型 - Category = x.Category, //业务类别 - LedgerVoucherNO = x.LedgerVoucherNO, //总账凭证号 - RelativeNO = x.RelativeNO, //相关号码 - InvoiceAmount = x.InvoiceAmount, - InvoiceDate = x.InvoiceDate, - InvoiceNO = x.InvoiceNO, - Note = x.Note, //备注 - - AccountAmount = x.AccountAmount, //记账资料 - AccountCurrency = x.AccountCurrency, - AccountRate = x.AccountRate, - PrePayAmount = x.PrePayAmount, //预付支资料 - PrePayCurrency = x.PrePayCurrency, - PrePayRate = x.PrePayRate, - AHSRAmount = x.AHSRAmount, //实收支资料 - AHSRCurrency = x.AHSRCurrency, - AHSRRate = x.AHSRRate, - FinancialAmount = x.FinancialAmount,//财务费用 - FinancialCurrency = x.FinancialCurrency, - FinancialRate = x.FinancialRate, - AdvanceAmount = x.AdvanceAmount, //预收支资料 - AdvanceCurrency = x.AdvanceCurrency, - AdvanceRate = x.AdvanceRate, - }, true).FirstAsync(x => x.Id == id && x.Mode == SettlementMode.Payment); + }, true).FirstAsync(x => x.Id == id); if (model != null) { diff --git a/ds-wms-service/DS.WMS.Core/Settlement/Method/InvoiceSettlementService.cs b/ds-wms-service/DS.WMS.Core/Settlement/Method/InvoiceSettlementService.cs index 41897a56..0c515597 100644 --- a/ds-wms-service/DS.WMS.Core/Settlement/Method/InvoiceSettlementService.cs +++ b/ds-wms-service/DS.WMS.Core/Settlement/Method/InvoiceSettlementService.cs @@ -36,46 +36,7 @@ namespace DS.WMS.Core.Settlement.Method { var model = await TenantDb.Queryable().Select(x => new PaymentSettlementDto { - Id = x.Id, - ApplicationNO = x.ApplicationNO, //申请编号 - SettlementNO = x.SettlementNO, //结算单号 - CustomerId = x.CustomerId, //结算单位 - CustomerName = x.CustomerName, - Mode = x.Mode, //结算类型 - SettlementDate = x.SettlementDate, //结算日期 - SettlementTypeId = x.SettlementTypeId, //结算方式 - CustomerBankId = x.CustomerBankId, //客户银行 - Account = x.Account, //客户账户 - Currency = x.Currency, //币别 - Amount = x.Amount, //金额 - ExchangeRate = x.ExchangeRate, //汇率 - IsLocked = x.IsLocked, //锁定状态 - SaleDeptId = x.SaleDeptId, //所属分部 - BillType = x.BillType, //单据类型 - Category = x.Category, //业务类别 - LedgerVoucherNO = x.LedgerVoucherNO, //总账凭证号 - RelativeNO = x.RelativeNO, //相关号码 - InvoiceAmount = x.InvoiceAmount, - InvoiceDate = x.InvoiceDate, - InvoiceNO = x.InvoiceNO, - Note = x.Note, //备注 - - AccountAmount = x.AccountAmount, //记账资料 - AccountCurrency = x.AccountCurrency, - AccountRate = x.AccountRate, - PrePayAmount = x.PrePayAmount, //预付支资料 - PrePayCurrency = x.PrePayCurrency, - PrePayRate = x.PrePayRate, - AHSRAmount = x.AHSRAmount, //实收支资料 - AHSRCurrency = x.AHSRCurrency, - AHSRRate = x.AHSRRate, - FinancialAmount = x.FinancialAmount,//财务费用 - FinancialCurrency = x.FinancialCurrency, - FinancialRate = x.FinancialRate, - AdvanceAmount = x.AdvanceAmount, //预收支资料 - AdvanceCurrency = x.AdvanceCurrency, - AdvanceRate = x.AdvanceRate, - }, true).FirstAsync(x => x.Id == id && x.Mode == SettlementMode.Payment); + }, true).FirstAsync(x => x.Id == id); if (model != null) { @@ -216,9 +177,13 @@ namespace DS.WMS.Core.Settlement.Method d.Currency, d.OriginalCurrency, d.OriginalAmount, + + i.CustomerName, + i.InvoiceAmount, + i.InvoiceHeader, + i.InvoiceDate, i.InvoiceNO, i.BillNO, - i.SN, i.CreateTime, i.CreateBy, i.Note @@ -242,10 +207,10 @@ namespace DS.WMS.Core.Settlement.Method var dto = new SettlementDetailDto { ApplicationId = g.Key, - //Ids = g.Select(x => x.Id), RMBApplyAmount = g.Where(x => x.OriginalCurrency == FeeCurrency.RMB_CODE).Sum(x => x.ApplyAmount), USDApplyAmount = g.Where(x => x.OriginalCurrency == FeeCurrency.USD_CODE).Sum(x => x.ApplyAmount), - ApplicationNO = firstItem.BillNO, + + BillNO = firstItem.BillNO, InvoiceNO = firstItem.InvoiceNO, CreateTime = firstItem?.CreateTime, CreateBy = firstItem?.CreateBy, diff --git a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user index 6c2bfeff..d3ca9f1d 100644 --- a/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\Publish\DS8\FeeApi - True|2024-09-26T10:24:30.8084807Z||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;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||; + True|2024-09-26T10:35:28.7455319Z||;True|2024-09-26T18:24:30.8084807+08:00||;True|2024-09-26T18:20:47.3005460+08:00||;True|2024-09-26T18:04:39.8012913+08:00||;True|2024-09-26T17:48:13.8526872+08:00||;True|2024-09-26T16:08:20.1746970+08:00||;True|2024-09-26T16:01:01.1501975+08:00||;False|2024-09-26T16:00:34.1516745+08:00||;True|2024-09-26T14:33:03.4007570+08:00||;True|2024-09-25T19:14:27.8906774+08:00||;True|2024-09-25T18:57:40.1435131+08:00||;True|2024-09-25T17:38:44.0915841+08:00||;True|2024-09-25T15:33:58.4630618+08:00||;True|2024-09-25T15:10:31.3022063+08:00||;False|2024-09-25T14:14:40.9640545+08:00||;True|2024-09-25T10:09:32.2558600+08:00||;True|2024-09-25T09:59:17.1525160+08:00||;False|2024-09-25T09:57:58.7265103+08:00||;False|2024-09-25T09:53:36.7732713+08:00||;False|2024-09-24T18:40:10.0166224+08:00||;True|2024-09-24T08:59:56.1995425+08:00||;True|2024-09-23T18:07:54.7222163+08:00||;True|2024-09-23T17:23:57.7568406+08:00||;True|2024-09-23T16:28:49.3169826+08:00||;True|2024-09-23T15:57:31.8052490+08:00||;True|2024-09-23T11:47:21.1445419+08:00||;True|2024-09-23T09:24:36.0732229+08:00||;True|2024-09-21T11:59:19.0549926+08:00||;True|2024-09-21T11:24:32.4451752+08:00||;True|2024-09-21T10:39:11.5297411+08:00||;True|2024-09-20T18:24:31.7827684+08:00||;True|2024-09-19T17:55:53.1666689+08:00||;True|2024-09-19T17:42:47.9061485+08:00||;True|2024-09-19T16:08:21.7225571+08:00||;False|2024-09-19T14:15:42.9318446+08:00||;True|2024-09-19T11:20:03.5567568+08:00||;True|2024-09-18T11:35:18.1509724+08:00||;True|2024-09-18T09:08:59.1152574+08:00||;True|2024-09-14T15:48:22.9374486+08:00||;True|2024-09-14T15:42:19.0503983+08:00||;True|2024-09-14T11:51:53.3339222+08:00||;True|2024-09-14T11:41:38.3542237+08:00||;True|2024-09-14T11:19:13.1037012+08:00||;True|2024-09-13T14:31:12.4598160+08:00||;True|2024-09-13T10:44:56.1241214+08:00||;False|2024-09-13T10:44:26.6088271+08:00||;False|2024-09-13T10:44:06.1615137+08:00||;False|2024-09-13T10:43:19.2432517+08:00||;False|2024-09-13T10:38:18.1663387+08:00||;True|2024-09-06T18:49:17.9435308+08:00||;True|2024-09-06T17:01:39.6646353+08:00||;True|2024-09-06T10:27:36.9990456+08:00||;True|2024-09-06T09:48:23.4236094+08:00||;True|2024-09-05T13:57:23.8452431+08:00||;True|2024-09-05T10:21:34.6675149+08:00||;True|2024-09-05T09:12:44.5610882+08:00||;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||; \ No newline at end of file