From 24202168475cc8554e3fc74dbba68ebb73d046ff Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 29 Nov 2023 10:23:09 +0800
Subject: [PATCH] =?UTF-8?q?Qad=E5=8F=91=E7=A5=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/settle/sync.js             |  4 +++
 .../BQ/Syncs/JisBBACSeEdiCompareAppService.cs | 34 ++++++++++---------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/sync.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/sync.js
index 807a1b75..d08be8ed 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/sync.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/sync.js
@@ -7,6 +7,10 @@ export default function () {
     type: "object",
     properties: {
       taskState,
+      creationTime: {
+        title: "发票时间",
+        type: "datetime",
+      },
       taskId: {
         title: "任务Id",
         type: "string",
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 42aa0808..c20759b5 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
@@ -94,24 +94,26 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                 {
                     await transaction.RollbackAsync().ConfigureAwait(false);
                 }
-                               
-            }
-            //var ediReturnQuery = db.Set<BBAC_SE_DETAIL>().FromSqlRaw("SELECT  a.* FROM Set_BBAC_SE_DETAIL a right join (SELECT  PN,CustomerPartCodeNoSpace,sum(Qty) as Qty FROM Set_BBAC_SE_DETAIL group by  PN,CustomerPartCodeNoSpace having sum(Qty)=0) b  on a.PN=b.PN and a.CustomerPartCodeNoSpace=b.CustomerPartCodeNoSpace");
-            var ediReturnQuery = db.Set<BBAC_SE_EDI>().FromSqlRaw("select * from (SELECT  a.* FROM [dbo].[Set_BBAC_SE_EDI] a right join (SELECT  PN,CustomerPartCodeNoSpace,sum(Qty) as Qty FROM Set_BBAC_SE_DETAIL where  BusinessType=1 group by  PN,CustomerPartCodeNoSpace having sum(Qty)=0) b  on a.PN=b.PN and a.CustomerPartCodeNoSpace=b.CustomerPartCodeNoSpace and a.IsHaveSeData=1) c where c.id is not null");
-            var ediReturnEntities = ediReturnQuery.ToList();
-            if(ediReturnEntities.Count>0)
-            {
-                ediReturnEntities.ForEach(t => t.IsHaveSeData = false);
-                await db.BulkUpdateAsync<BBAC_SE_EDI>(ediReturnEntities).ConfigureAwait(false);
-            }
 
-            var seReturnQuery = db.Set<BBAC_SE_DETAIL>().FromSqlRaw("select * from (SELECT  a.* FROM [dbo].[Set_BBAC_SE_DETAIL] a  right join  (select PN,CustomerPartCodeNoSpace,COUNT(*) as hj,sum(Qty) as Qty,sum(CAST(IsHaveEdiData AS int)) as haveedi from Set_BBAC_SE_DETAIL where BusinessType=1  group  by  PN,CustomerPartCodeNoSpace having  count(*)>sum(CAST(IsHaveEdiData AS int)) and count(*)>=3 and sum(CAST(IsHaveEdiData AS int))>=1) b  on a.PN=b.PN and a.CustomerPartCodeNoSpace=b.CustomerPartCodeNoSpace and a.IsHaveEdiData=0) c where c.id is not null ");
-            var seReturnEntities = seReturnQuery.ToList();
-            if (seReturnEntities.Count > 0)
-            {
-                seReturnEntities.ForEach(t => t.IsHaveEdiData = true);
-                await db.BulkUpdateAsync<BBAC_SE_DETAIL>(seReturnEntities).ConfigureAwait(false);
+                //var ediReturnQuery = db.Set<BBAC_SE_DETAIL>().FromSqlRaw("SELECT  a.* FROM Set_BBAC_SE_DETAIL a right join (SELECT  PN,CustomerPartCodeNoSpace,sum(Qty) as Qty FROM Set_BBAC_SE_DETAIL group by  PN,CustomerPartCodeNoSpace having sum(Qty)=0) b  on a.PN=b.PN and a.CustomerPartCodeNoSpace=b.CustomerPartCodeNoSpace");
+                var ediReturnQuery = db.Set<BBAC_SE_EDI>().FromSqlRaw("select * from (SELECT  a.* FROM [dbo].[Set_BBAC_SE_EDI] a right join (SELECT  PN,CustomerPartCodeNoSpace,sum(Qty) as Qty FROM Set_BBAC_SE_DETAIL where  BusinessType=1 group by  PN,CustomerPartCodeNoSpace having sum(Qty)=0) b  on a.PN=b.PN and a.CustomerPartCodeNoSpace=b.CustomerPartCodeNoSpace and a.IsHaveSeData=1) c where c.id is not null");
+                var ediReturnEntities = ediReturnQuery.ToList();
+                if (ediReturnEntities.Count > 0)
+                {
+                    ediReturnEntities.ForEach(t => t.IsHaveSeData = false);
+                    await db.BulkUpdateAsync<BBAC_SE_EDI>(ediReturnEntities).ConfigureAwait(false);
+                }
+
+                var seReturnQuery = db.Set<BBAC_SE_DETAIL>().FromSqlRaw("select * from (SELECT  a.* FROM [dbo].[Set_BBAC_SE_DETAIL] a  right join  (select PN,CustomerPartCodeNoSpace,COUNT(*) as hj,sum(Qty) as Qty,sum(CAST(IsHaveEdiData AS int)) as haveedi from Set_BBAC_SE_DETAIL where BusinessType=1  group  by  PN,CustomerPartCodeNoSpace having  count(*)>sum(CAST(IsHaveEdiData AS int)) and count(*)>=3 and sum(CAST(IsHaveEdiData AS int))>=1) b  on a.PN=b.PN and a.CustomerPartCodeNoSpace=b.CustomerPartCodeNoSpace and a.IsHaveEdiData=0) c where c.id is not null ");
+                var seReturnEntities = seReturnQuery.ToList();
+                if (seReturnEntities.Count > 0)
+                {
+                    seReturnEntities.ForEach(t => t.IsHaveEdiData = true);
+                    await db.BulkUpdateAsync<BBAC_SE_DETAIL>(seReturnEntities).ConfigureAwait(false);
+                }
+
             }
+           
 
         }