From 5aefbebf625e3013e2a6d5bcb54c6bb7cc4a0fdb Mon Sep 17 00:00:00 2001 From: mahao Date: Wed, 1 Nov 2023 13:10:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E5=8F=91=E8=BF=90?= =?UTF-8?q?=20Qty=20=E6=98=AF0=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Report/JisBBACSaSeEdiCompareExportService.cs | 4 ++-- .../Services/Report/JisHBPOSaSeEdiCompareExportService.cs | 2 +- .../Services/Report/MaiDanBBACSaSeCompareExportService.cs | 2 +- .../Services/Report/PubSaSeCompareExportService.cs | 6 +++--- .../Services/Report/SaSeCompareExportBaseService.cs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs index b80351cd..5d45148b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisBBACSaSeEdiCompareExportService.cs @@ -146,7 +146,7 @@ namespace SettleAccount.Job.Services.Report }; //发运 var seGroup = (from se in _settleAccountDbContext.Set() - where se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime + where se.State == EnumBillState.新建 && se.BusinessType == businessType && se.BillTime >= seStartDateTime && se.BillTime <= seEndDateTime group se by new { se.PN, se.CustomerPartCodeNoSpace } into groupItem select new { @@ -159,7 +159,7 @@ namespace SettleAccount.Job.Services.Report FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), ToLoc = groupItem.Max(t => t.ToLoc), ErpToLoc = groupItem.Max(t => t.ErpToLoc) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //Edi var ediGroup = from edi in _settleAccountDbContext.Set() where edi.IsDeleted == false && edi.IsHaveSeData == true diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs index 79b24b83..da1f1617 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/JisHBPOSaSeEdiCompareExportService.cs @@ -154,7 +154,7 @@ namespace SettleAccount.Job.Services.Report FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), ToLoc = groupItem.Max(t => t.ToLoc), ErpToLoc = groupItem.Max(t => t.ErpToLoc) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //Edi var ediGroup = from edi in _settleAccountDbContext.Set() where edi.IsDeleted == false && edi.IsHaveSeData == true diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs index 305e2861..25e6bf1f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/MaiDanBBACSaSeCompareExportService.cs @@ -201,7 +201,7 @@ namespace SettleAccount.Job.Services.Report ToLocCode = groupItem.Max(t => t.ToLoc), ToErpLocCode = groupItem.Max(t => t.ErpToLoc), CodeType = groupItem.Max(t => t.CodeType) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //有结算无发运 var haveSaNotHaveSeList = (from sa in saGroupByMappingType 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 b4708358..d8092a6f 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 @@ -236,7 +236,7 @@ namespace SettleAccount.Job.Services.Report FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), ToLocCode = groupItem.Max(t => t.ToLocCode), ToErpLocCode = groupItem.Max(t => t.ToErpLocCode) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //有结算无发运 var haveSaNotHaveSeList = (from sa in saGroupByMappingType @@ -358,7 +358,7 @@ namespace SettleAccount.Job.Services.Report FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), ToLocCode = groupItem.Max(t => t.ToLocCode), ToErpLocCode = groupItem.Max(t => t.ToErpLocCode) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //有结算无发运 var haveSaNotHaveSeList = (from sa in saGroupByMappingType @@ -477,7 +477,7 @@ namespace SettleAccount.Job.Services.Report ShippingDate = groupItem.Max(t => t.ShippingDate), ToLocCode = groupItem.Max(t => t.ToLocCode), ToErpLocCode = groupItem.Max(t => t.ToErpLocCode) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //有结算无发运 var haveSaNotHaveSeList = (from sa in saGroupByMappingType 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 0e516dde..aff26e7a 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 @@ -102,7 +102,7 @@ namespace SettleAccount.Job.Services.Report FactoryPartCode = groupItem.Max(t => t.FactoryPartCode), ToLocCode = groupItem.Max(t => t.ToLoc), ToErpLocCode = groupItem.Max(t => t.ErpToLoc) - }).Where(t => t.Qty > 0M); + }).Where(t => t.Qty != 0M); //有结算无发运 var haveSaNotHaveSeList = (from sa in saGroupByMappingType