From 1691e4e70fcf14bf506f32157484623423367b31 Mon Sep 17 00:00:00 2001 From: mahao Date: Tue, 12 Sep 2023 10:16:51 +0800 Subject: [PATCH 1/2] up --- .../JisBBACSeEdiCompareExportService.cs | 3 - .../Report/PubSaSeCompareExportService.cs | 12 +-- .../Report/SaSeCompareExportBaseService.cs | 88 +++++++++++++------ 3 files changed, 67 insertions(+), 36 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs index c36a68a9..117bd11c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSeEdiCompareExportService.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Linq.Dynamic.Core; -using Magicodes.ExporterAndImporter.Core.Extension; -using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.SignalR; using Microsoft.OpenApi.Extensions; using SettleAccount.Domain.BQ; @@ -17,7 +15,6 @@ using Volo.Abp.DependencyInjection; using Volo.Abp.ObjectMapping; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount; -using Win.Sfs.SettleAccount.Consts; using Win.Sfs.SettleAccount.Reports; namespace SettleAccount.Job.Services.Report diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs index 5d26eb4c..23069cb1 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs @@ -1,15 +1,12 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Drawing; using System.Linq; using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.SignalR; using Microsoft.OpenApi.Extensions; -using SettleAccount.Bases; using SettleAccount.Domain.BQ; using SettleAccount.Job.SignalR; -using ShardingCore.Extensions; using Shouldly; using TaskJob.EventArgs; using TaskJob.Interfaces; @@ -19,8 +16,8 @@ using Volo.Abp.ObjectMapping; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount; using Win.Sfs.SettleAccount.Entities.BQ; +using Win.Sfs.SettleAccount.Enums; using Win.Sfs.SettleAccount.Reports; -using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report; using Win.Sfs.Shared.RepositoryBase; namespace SettleAccount.Job.Services.Report @@ -174,7 +171,7 @@ namespace SettleAccount.Job.Services.Report } //结算 var saGroup = from sa in _settleAccountDbContext.Set() - where sa.BusinessType == businessType + where sa.BusinessType == businessType && sa.MappingType == EnumMappingType.None group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem select new { @@ -201,6 +198,7 @@ namespace SettleAccount.Job.Services.Report }; //发运 var seGroup = from se in _settleAccountDbContext.Set() + where se.BusinessType == businessType group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem select new { @@ -278,12 +276,13 @@ namespace SettleAccount.Job.Services.Report /// /// 获取比对数据 + /// 印度件根据客户零件号对比 /// private List GetSaSeCompareDataYinDu(int version) { //结算 var saGroup = from sa in _settleAccountDbContext.Set() - where sa.BusinessType == EnumBusinessType.YinDuJian + where sa.BusinessType == EnumBusinessType.YinDuJian && sa.MappingType == EnumMappingType.None group sa by new { sa.CustomerPartCodeNoSpace } into groupItem select new { @@ -308,6 +307,7 @@ namespace SettleAccount.Job.Services.Report }; //发运 var seGroup = from se in _settleAccountDbContext.Set() + where se.BusinessType == EnumBusinessType.YinDuJian group se by new { se.CustomerPartCodeNoSpace } into groupItem select new { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs index 7e660bcc..7ffdf9b5 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SaSeCompareExportBaseService.cs @@ -5,6 +5,7 @@ using EFCore.BulkExtensions; using Magicodes.ExporterAndImporter.Core.Extension; using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.SignalR; +using Microsoft.CodeAnalysis.CSharp.Syntax; using SettleAccount.Bases; using SettleAccount.Domain.BQ; using SettleAccount.Job.SignalR; @@ -44,7 +45,7 @@ namespace SettleAccount.Job.Services.Report { //结算 var saGroup = from sa in _settleAccountDbContext.Set() - where sa.BusinessType == businessType + where sa.BusinessType == businessType && sa.MappingType == EnumMappingType.None group sa by new { sa.PN, sa.CustomerPartCodeNoSpace } into groupItem select new { @@ -71,6 +72,7 @@ namespace SettleAccount.Job.Services.Report }; //发运 var seGroup = from se in _settleAccountDbContext.Set() + where se.BusinessType == businessType group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem select new { @@ -211,32 +213,64 @@ namespace SettleAccount.Job.Services.Report }); }); - //获取二次比对上的数据 - secondMatchHaveSaHaveSes = (from notHaveSaHaveSe in notHaveSaHaveSes - join haveSaNotHaveSe in haveSaNotHaveSes - on new { notHaveSaHaveSe.PN, notHaveSaHaveSe.ReplaceFactoryPartCode } equals new { haveSaNotHaveSe.PN, haveSaNotHaveSe.ReplaceFactoryPartCode } - select new SaSeCompareDiff() - { - WmsBillNum = notHaveSaHaveSe.WmsBillNum, - ShippingDate = notHaveSaHaveSe.ShippingDate, - SeqNumber = notHaveSaHaveSe.SeqNumber, - PJISSeqNumber = notHaveSaHaveSe.PJISSeqNumber, - CustomerOfflineTime = haveSaNotHaveSe.CustomerOfflineTime, - SAQty = haveSaNotHaveSe.SAQty, - SEQty = notHaveSaHaveSe.SEQty, - PN = haveSaNotHaveSe.PN, - ToLocCode = notHaveSaHaveSe.ToLocCode, - ToErpLocCode = notHaveSaHaveSe.ToErpLocCode, - Category = EnumPubSaSeCompareCategory.HaveSaHaveSe, - SeCustomerPartCode = notHaveSaHaveSe.SeCustomerPartCode, - SeFactoryPartCode = notHaveSaHaveSe.SeFactoryPartCode, - SaCustomerPartCode = haveSaNotHaveSe.SaCustomerPartCode, - SaFactoryPartCode = haveSaNotHaveSe.SaFactoryPartCode, - CustomerPartCode = haveSaNotHaveSe.CustomerPartCode, - PartCodeDesc = haveSaNotHaveSe.PartCodeDesc, - FactoryPartCode = haveSaNotHaveSe.FactoryPartCode, - ReplaceFactoryPartCode = haveSaNotHaveSe.ReplaceFactoryPartCode - }).ToList(); + if (businessType != EnumBusinessType.YinDuJian) + { + //获取二次比对上的数据 + secondMatchHaveSaHaveSes = (from notHaveSaHaveSe in notHaveSaHaveSes + join haveSaNotHaveSe in haveSaNotHaveSes + on new { notHaveSaHaveSe.PN, notHaveSaHaveSe.ReplaceFactoryPartCode } equals new { haveSaNotHaveSe.PN, haveSaNotHaveSe.ReplaceFactoryPartCode } + select new SaSeCompareDiff() + { + WmsBillNum = notHaveSaHaveSe.WmsBillNum, + ShippingDate = notHaveSaHaveSe.ShippingDate, + SeqNumber = notHaveSaHaveSe.SeqNumber, + PJISSeqNumber = notHaveSaHaveSe.PJISSeqNumber, + CustomerOfflineTime = haveSaNotHaveSe.CustomerOfflineTime, + SAQty = haveSaNotHaveSe.SAQty, + SEQty = notHaveSaHaveSe.SEQty, + PN = haveSaNotHaveSe.PN, + ToLocCode = notHaveSaHaveSe.ToLocCode, + ToErpLocCode = notHaveSaHaveSe.ToErpLocCode, + Category = EnumPubSaSeCompareCategory.HaveSaHaveSe, + SeCustomerPartCode = notHaveSaHaveSe.SeCustomerPartCode, + SeFactoryPartCode = notHaveSaHaveSe.SeFactoryPartCode, + SaCustomerPartCode = haveSaNotHaveSe.SaCustomerPartCode, + SaFactoryPartCode = haveSaNotHaveSe.SaFactoryPartCode, + CustomerPartCode = haveSaNotHaveSe.CustomerPartCode, + PartCodeDesc = haveSaNotHaveSe.PartCodeDesc, + FactoryPartCode = haveSaNotHaveSe.FactoryPartCode, + ReplaceFactoryPartCode = haveSaNotHaveSe.ReplaceFactoryPartCode + }).ToList(); + } + else + { + //获取二次比对上的数据 + secondMatchHaveSaHaveSes = (from notHaveSaHaveSe in notHaveSaHaveSes + join haveSaNotHaveSe in haveSaNotHaveSes + on new { notHaveSaHaveSe.ReplaceFactoryPartCode } equals new { haveSaNotHaveSe.ReplaceFactoryPartCode } + select new SaSeCompareDiff() + { + WmsBillNum = notHaveSaHaveSe.WmsBillNum, + ShippingDate = notHaveSaHaveSe.ShippingDate, + SeqNumber = notHaveSaHaveSe.SeqNumber, + PJISSeqNumber = notHaveSaHaveSe.PJISSeqNumber, + CustomerOfflineTime = haveSaNotHaveSe.CustomerOfflineTime, + SAQty = haveSaNotHaveSe.SAQty, + SEQty = notHaveSaHaveSe.SEQty, + PN = haveSaNotHaveSe.PN, + ToLocCode = notHaveSaHaveSe.ToLocCode, + ToErpLocCode = notHaveSaHaveSe.ToErpLocCode, + Category = EnumPubSaSeCompareCategory.HaveSaHaveSe, + SeCustomerPartCode = notHaveSaHaveSe.SeCustomerPartCode, + SeFactoryPartCode = notHaveSaHaveSe.SeFactoryPartCode, + SaCustomerPartCode = haveSaNotHaveSe.SaCustomerPartCode, + SaFactoryPartCode = haveSaNotHaveSe.SaFactoryPartCode, + CustomerPartCode = haveSaNotHaveSe.CustomerPartCode, + PartCodeDesc = haveSaNotHaveSe.PartCodeDesc, + FactoryPartCode = haveSaNotHaveSe.FactoryPartCode, + ReplaceFactoryPartCode = haveSaNotHaveSe.ReplaceFactoryPartCode + }).ToList(); + } return secondMatchHaveSaHaveSes; } From 2f7be99616992854c214f9545593ec96d528ed33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 12 Sep 2023 10:18:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Dtos/INVOICE_GRP_DTO.cs | 36 +++++++++++++------ .../Bases/BA_SERVICE.cs | 11 ++++++ .../Entities/BQ/INVOICE_SERVICE.cs | 12 ++++++- .../Entities/BQ/Managers/INV_MNG.cs | 3 +- 4 files changed, 49 insertions(+), 13 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs index 134ca729..e26b4a18 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/INVOICE_GRP_DTO.cs @@ -38,7 +38,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// [Display(Name = "税后金额")] public decimal TaxAmt { get; set; } - [Display(Name = "金税发票金额")] + [Display(Name = "税额")] public decimal RealAmt { get; set; } /// ///发票分组号 @@ -57,9 +57,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "发票状态")] public InvoiceBillState InvoiceState { get; set; } - [Display(Name = "发票税后尾差")] + [Display(Name = "发票尾差")] public decimal TaxDiff { get; set; } + [Display(Name = "发票金额含尾差")] + public decimal TaxAmtDiff { get; set; } + [Display(Name = "客户代码")] public string ClientCode { get; set; } } @@ -77,12 +80,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "未税金额")] public decimal Amt { get; set; } - /// - ///未税金额 - /// - [Display(Name = "税率")] - public decimal Tax { get; set; } + [Display(Name = "税额")] + public decimal RealAmt { get; set; } /// ///税后金额 @@ -90,8 +90,13 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos [Display(Name = "税后金额")] public decimal TaxAmt { get; set; } - [Display(Name = "税额")] - public decimal RealAmt { get; set; } + + [Display(Name = "税率")] + public decimal Tax { get; set; } + + + + /// ///发票分组号 /// @@ -123,16 +128,25 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos /// [ExporterHeader(DisplayName = "未税金额")] public decimal Amt { get; set; } + [Display(Name = "税额")] + public decimal RealAmt { get; set; } /// ///税额 /// - [ExporterHeader(DisplayName = "税率")] - public decimal Tax { get; set; } + //[ExporterHeader(DisplayName = "税率")] + //public decimal Tax { get; set; } /// ///税后金额 /// [ExporterHeader(DisplayName = "税后金额")] public decimal TaxAmt { get; set; } + + [ExporterHeader(DisplayName = "发票尾差")] + public decimal TaxDiff { get; set; } + + [ExporterHeader(DisplayName = "发票金额含尾差")] + public decimal TaxAmtDiff { get; set; } + /// ///业务类别 /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index 90702998..3b11a42c 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -140,6 +140,11 @@ namespace Win.Sfs.SettleAccount.Bases var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var totalCount = await _repository.GetCountByFilterAsync(input.Filters); var dtos = ObjectMapper.Map, List>(entitys); + foreach (var itm in dtos) + { + itm.TaxAmtDiff = itm.TaxAmt + itm.TaxDiff; + } + return new PagedResultDto(totalCount, dtos); } /// @@ -305,6 +310,12 @@ namespace Win.Sfs.SettleAccount.Bases IExporter _excel = new ExcelExporter(); var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true); var dtoDetails = ObjectMapper.Map, List>(entities); + foreach (var itm in dtoDetails) + { + itm.TaxAmtDiff = itm.TaxAmt + itm.TaxDiff; + } + + var classDisplayName = typeof(INVOICE_GRP_DTO).GetCustomAttribute()?.Name ?? typeof(INVOICE_GRP_DTO).Name; string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx"; byte[] result = null; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 0a83ba5e..210499cd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -142,6 +142,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var entitys = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var totalCount = await _repository.GetCountByFilterAsync(input.Filters); var dtos = ObjectMapper.Map, List>(entitys); + foreach (var itm in dtos) + { + itm.TaxAmtDiff = itm.TaxAmt + itm.TaxDiff; + } return new PagedResultDto(totalCount, dtos); } /// @@ -316,6 +320,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true); var dtoDetails = ObjectMapper.Map, List>(entities); + foreach (var itm in dtoDetails) + { + itm.TaxAmtDiff = itm.TaxAmt + itm.TaxDiff; + } + + var classDisplayName = typeof(INVOICE_GRP_DTO).GetCustomAttribute()?.Name ?? typeof(INVOICE_GRP_DTO).Name; string _fileName = $"{classDisplayName}_{Guid.NewGuid().ToString()}.xlsx"; byte[] result = null; @@ -655,7 +665,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ // inv.RealAmt = newinv.RealAmt; inv.TaxDiff =inv.TaxAmt+ newinv.PreTaxDiff; - inv.ClientCode = newinv.ClientCode; + // inv.ClientCode = newinv.ClientCode; } foreach (var detail in invdetail) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index d71ef642..1dc172fd 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -1392,8 +1392,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers EndDate = itm.Key.EndDate }).ToList(); decimal amt = detailDtos.Sum(k => k.Amt);//金额 - decimal txtAmt =detailDtos.Sum(k => k.Amt) + Math.Round(detailList.Sum(k => k.Amt) * 0.13m, 2);//税后金额 + decimal txtAmt =detailDtos.Sum(k => k.Amt) + Math.Round(detailDtos.Sum(k => k.Amt) * 0.13m, 2);//税后金额 decimal realAmt = Math.Round(detailDtos.Sum(k => k.Amt) * 0.13m, 2);//税额 + //decimal amt = detailDtos.Sum(k => k.Amt); //decimal txtAmt = Math.Round(detailDtos.Sum(k => k.Amt), 2); var mapList = new List();