From 44ad4095c7c285f4d0652af1a5189cb8699258f8 Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 4 Jan 2024 11:23:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AF=84=E5=94=AE=E5=BA=93?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/VmiAppService.cs | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index 313b49ee..ddd0f643 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -639,15 +639,29 @@ namespace Win.Sfs.SettleAccount.Entities.BQ log.ChangedTime = log.Id.ToDateTime().Value.ToLocalTime(); if (log.ChangedQty >= decimal.Zero) { - log.Qty = log.ChangedQty; - log.LogType = VmiLogType.Type500; - log.ChangedType = VmiType.In; + if(log.LogType != VmiLogType.Type100) + { + log.Qty = log.ChangedQty; + log.LogType = VmiLogType.Type500; + log.ChangedType = VmiType.In; + } + else + { + log.Qty = log.ChangedQty; + log.ChangedType = VmiType.In; + } + } else { - log.Qty = -log.Qty; - log.LogType = VmiLogType.Type600; - log.ChangedType = VmiType.Out; + if(log.LogType != VmiLogType.Type100) + { + log.Qty = -log.Qty; + log.LogType = VmiLogType.Type600; + log.ChangedType = VmiType.Out; + } + + } log.ChangedBy = this._currentUser.UserName; } @@ -796,7 +810,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } var logList = tupleList.Select(o => o.Item1).ToList(); logList.AsParallel().ForEach(Update); - var messageList = logList.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList(); + //var messageList = logList.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList(); var connectionString = this._serviceProvider.GetRequiredService().GetConnectionString("SettleAccountService"); var options = new DbContextOptionsBuilder().UseSqlServer(connectionString).Options; using var context = new SettleAccountDbContext(options); @@ -816,7 +830,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ await context.BulkInsertAsync(logList).ConfigureAwait(false); - await context.BulkInsertAsync(messageList).ConfigureAwait(false); + //await context.BulkInsertAsync(messageList).ConfigureAwait(false); transaction.Commit(); } catch (Exception ex)