From 93c533d86d4709b327d044297fa639ae4e889797 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 20 Dec 2023 17:31:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/OutStockService.cs               | 28 ++++++++-----------
 .../Services/TakeStockService.cs              | 28 ++++++++-----------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/WMS.Web.Domain/Services/OutStockService.cs b/src/WMS.Web.Domain/Services/OutStockService.cs
index 1671d69e..9bdbf55d 100644
--- a/src/WMS.Web.Domain/Services/OutStockService.cs
+++ b/src/WMS.Web.Domain/Services/OutStockService.cs
@@ -197,7 +197,9 @@ namespace WMS.Web.Domain.Services
 
             if (entity.Type == OutStockType.Sal)
             {
-                await Sync(entity, loginInfo);
+                OperateRequest oRequest = new OperateRequest();
+                oRequest.Ids.Add(entity.Id);
+                await Sync(oRequest, loginInfo);
             }
 
             return Result.ReSuccess();
@@ -207,25 +209,19 @@ namespace WMS.Web.Domain.Services
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> Sync(OperateRequest dto, LoginInDto loginInfo)
+        public Task<Result> Sync(OperateRequest dto, LoginInDto loginInfo)
         {
-            var list = await _outStockRepositories.GetEntityList(dto.Ids);
+            var list = _outStockRepositories.GetEntityList(dto.Ids).GetAwaiter().GetResult();
             foreach (var entity in list)
             {
-                await Sync(entity, loginInfo);
+                Task.Run(async () =>
+                {
+                    var res = await SalOutStock(entity, loginInfo);
+                    if (!res.IsSuccess)
+                        _logger.LogError($"出库单同步失败:{res.Message}");
+                });
             }
-            return Result.ReSuccess();
-        }
-
-        private Task Sync(OutStock entity, LoginInDto loginInfo)
-        {
-            Task.Run(async () =>
-            {
-                var res = await SalOutStock(entity, loginInfo);
-                if (!res.IsSuccess)
-                    _logger.LogError($"出库单同步失败:{res.Message}");
-            });
-            return Task.CompletedTask;
+            return Task.FromResult(Result.ReSuccess());
         }
 
         /// <summary>
diff --git a/src/WMS.Web.Domain/Services/TakeStockService.cs b/src/WMS.Web.Domain/Services/TakeStockService.cs
index 5ceb2101..aa42fb88 100644
--- a/src/WMS.Web.Domain/Services/TakeStockService.cs
+++ b/src/WMS.Web.Domain/Services/TakeStockService.cs
@@ -135,10 +135,9 @@ namespace WMS.Web.Domain.Services
                 return Result.ReFailure(ResultCodes.DateWriteError);
 
             //同步金蝶
-            foreach (var entity in list)
-            {
-                await Sync(entity);
-            }
+            OperateRequest oRequest = new OperateRequest();
+            oRequest.Ids = list.Select(s => s.Id).ToList();
+            await Sync(oRequest);
 
             return Result.ReSuccess();
         }
@@ -148,27 +147,22 @@ namespace WMS.Web.Domain.Services
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<Result> Sync(OperateRequest dto)
+        public Task<Result> Sync(OperateRequest dto)
         {
             var list = _takeStockRepositories.GetEntityList(dto.Ids).GetAwaiter().GetResult();
             list = list.Where(w => w.SuccessSync == SyncStatus.Fail || w.SuccessSync == SyncStatus.SyncIng).ToList();
             foreach (var entity in list)
             {
-                await Sync(entity);
+                Task.Run(async () =>
+                {
+                    var res = await Loss_Profit(entity);
+                    if (!res.IsSuccess)
+                        _logger.LogError($"盘点同步失败:{res.Message}");
+                });
             }
-            return Result.ReSuccess();
+            return Task.FromResult(Result.ReSuccess());
         }
 
-        private Task Sync(TakeStock entity)
-        {
-            Task.Run(async () =>
-            {
-                var res = await Loss_Profit(entity);
-                if (!res.IsSuccess)
-                    _logger.LogError($"盘点同步失败:{res.Message}");
-            });
-            return Task.CompletedTask;
-        }
         /// <summary>
         /// 盘盈盘亏同步金蝶
         /// </summary>