From 8f586ebbb8aeba145f54401f730a758cb541d2ec Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Thu, 14 Dec 2023 13:04:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0EDI=E6=9C=89=E5=8F=91=E8=BF=90?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E8=BF=90=E6=97=B6=E9=97=B4=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BQ/Syncs/JisBBACSeEdiCompareAppService.cs | 30 ++++++++++---------
 .../Report/SeEdiCompareExportBaseService.cs   |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
index b3b310d2..13a2cb59 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs
@@ -112,24 +112,26 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                     await db.BulkUpdateAsync<BBAC_SE_DETAIL>(seReturnEntities).ConfigureAwait(false);
                 }
 
-            }
+                var seFlagErrQuery = db.Set<BBAC_SE_DETAIL>().FromSqlRaw("select distinct a.* from  [BQ_SA].[dbo].[Set_BBAC_SE_DETAIL] a left join [BQ_SA].[dbo].[Set_BBAC_SE_EDI] b  on a.PN=b.PN and a.CustomerPartCodeNoSpace= b.CustomerPartCodeNoSpace  where a.BusinessType=1 and a.IsHaveEdiData=0 and b.IsHaveSeData=1 and b.IsDeleted=0");
+                var seFlagErrEntities = seFlagErrQuery.ToList();
+                if (seFlagErrEntities.Count > 0)
+                {
+                    seFlagErrEntities.ForEach(t => t.IsHaveEdiData = true);
+                    await db.BulkUpdateAsync<BBAC_SE_DETAIL>(seFlagErrEntities).ConfigureAwait(false);
+                }
 
-            var seFlagErrQuery = db.Set<BBAC_SE_DETAIL>().FromSqlRaw("select distinct a.* from  [BQ_SA].[dbo].[Set_BBAC_SE_DETAIL] a left join [BQ_SA].[dbo].[Set_BBAC_SE_EDI] b  on a.PN=b.PN and a.CustomerPartCodeNoSpace= b.CustomerPartCodeNoSpace  where a.BusinessType=1 and a.IsHaveEdiData=0 and b.IsHaveSeData=1 and b.IsDeleted=0");
-            var seFlagErrEntities = seFlagErrQuery.ToList();
-            if (seFlagErrEntities.Count > 0)
-            {
-                seFlagErrEntities.ForEach(t => t.IsHaveEdiData = true);
-                await db.BulkUpdateAsync<BBAC_SE_DETAIL>(seFlagErrEntities).ConfigureAwait(false);
-            }
+                var ediFlagErrQuery = db.Set<BBAC_SE_EDI>().FromSqlRaw("select distinct a.* from  [dbo].[Set_BBAC_SE_EDI] a left join [dbo].[Set_BBAC_SE_DETAIL] b  on a.PN=b.PN and a.CustomerPartCodeNoSpace= b.CustomerPartCodeNoSpace  where   a.IsHaveSeData=0 and a.IsDeleted=0 and b.BusinessType=1 and b.IsHaveEdiData=1");
+                var ediFlagErrEntities = ediFlagErrQuery.ToList();
+                if (ediFlagErrEntities.Count > 0)
+                {
+                    ediFlagErrEntities.ForEach(t => t.IsHaveSeData = true);
+                    await db.BulkUpdateAsync<BBAC_SE_EDI>(ediFlagErrEntities).ConfigureAwait(false);
+                }
 
-            var ediFlagErrQuery = db.Set<BBAC_SE_EDI>().FromSqlRaw("select distinct a.* from  [dbo].[Set_BBAC_SE_EDI] a left join [dbo].[Set_BBAC_SE_DETAIL] b  on a.PN=b.PN and a.CustomerPartCodeNoSpace= b.CustomerPartCodeNoSpace  where   a.IsHaveSeData=0 and a.IsDeleted=0 and b.BusinessType=1 and b.IsHaveEdiData=1");
-            var ediFlagErrEntities = ediFlagErrQuery.ToList();
-            if (ediFlagErrEntities.Count > 0)
-            {
-                ediFlagErrEntities.ForEach(t => t.IsHaveSeData = true);
-                await db.BulkUpdateAsync<BBAC_SE_EDI>(ediFlagErrEntities).ConfigureAwait(false);
             }
 
+           
+
 
         }
 
diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs
index 9c3290ea..d7efe781 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/SeEdiCompareExportBaseService.cs
@@ -81,7 +81,7 @@ namespace SettleAccount.Job.Services.Report
             });
             //无EDI有发运
             var notHaveEdiHaveSeList = _settleAccountDbContext.Set<TSe>()
-                .Where(t => t.BusinessType == businessType)
+                .Where(t => t.BusinessType == businessType && t.BillTime >= seStartDateTime && t.BillTime <= seEndDateTime)
                 .Where(t => t.IsHaveEdiData == false)
                 .GroupBy(t => new { t.PN, t.CustomerPartCodeNoSpace })
                 .Select(t => new TCompareReport()