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; }