Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs

@@ -202,11 +202,6 @@ public class BBAC_SA_SERVICE : SettleAccountApplicationBase<BBAC_SA>
     [HttpPost]
     public async Task<PagedResultDto<BBAC_SA_DTO>> GetListAsync(RequestDto input)
     {
-        var businessTypeFilterConditions = input.Filters.FindAll(t => t.Column.ToLower() == "businesstype");
-        businessTypeFilterConditions.ForEach(t =>
-        {
-            t.Value = EnumBusinessType.JisBBAC.ToString();
-        });
         var entities = await _bbacSaRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
         var totalCount = await _bbacSaRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
         var dtos = ObjectMapper.Map<List<BBAC_SA>, List<BBAC_SA_DTO>>(entities);

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisBBACSeEdiCompareAppService.cs

@@ -18,7 +18,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class JisBBACSeEdiCompareAppService : ApplicationService, IInvocable
 {
-    private readonly object _lockObj = new object();
     private readonly IServiceProvider _serviceProvider;
 
     public JisBBACSeEdiCompareAppService(IServiceProvider serviceProvider)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JisHBPOSeEdiCompareAppService.cs

@@ -10,8 +10,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using SettleAccount.Domain.BQ;
 using Volo.Abp.Application.Services;
-using Volo.Abp.Uow;
-using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 
@@ -21,32 +19,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 [ApiExplorerSettings(IgnoreApi = true)]
 public class JisHBPOSeEdiCompareAppService : ApplicationService, IInvocable
 {
-    private readonly object _lockObj = new object();
     private readonly IServiceProvider _serviceProvider;
 
-    /// <summary>
+    public JisHBPOSeEdiCompareAppService(IServiceProvider serviceProvider)
-    /// HBPO发运数据仓储
-    /// </summary>
-    private readonly INormalEfCoreRepository<HBPO_SE_DETAIL, Guid> _hbpoSeDetailRepository;
-    /// <summary>
-    /// HBPOEDI数据仓储
-    /// </summary>
-    private readonly INormalEfCoreRepository<HBPO_SE_EDI, Guid> _hbpoSeEdiRepository;
-    /// <summary>
-    /// UnitOfWork
-    /// </summary>
-    private readonly IUnitOfWorkManager _unitOfWorkManager;
-
-    public JisHBPOSeEdiCompareAppService(
-        IServiceProvider serviceProvider,
-        INormalEfCoreRepository<HBPO_SE_DETAIL, Guid> hbpoSeDetailRepository,
-        INormalEfCoreRepository<HBPO_SE_EDI, Guid> hbpoSeEdiRepository,
-        IUnitOfWorkManager unitOfWorkManager)
     {
         _serviceProvider = serviceProvider;
-        _hbpoSeDetailRepository = hbpoSeDetailRepository;
-        _hbpoSeEdiRepository = hbpoSeEdiRepository;
-        _unitOfWorkManager = unitOfWorkManager;
     }
 
     /// <summary>

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@@ -89,7 +89,7 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
     {
         using var ms = new MemoryStream();
         await files.FirstOrDefault().OpenReadStream().CopyToAsync(ms).ConfigureAwait(false);
-        return this.ImportInternal<PUB_ADJ_DETAIL_IMP_DTO>(ms.ToArray(), out var validationResults);
+        return this.ImportInternal<PUB_ADJ_DETAIL_IMP_DTO>(ms.ToArray()).Select(o => o.Item1).ToList();
     }
 
     /// <summary>
@@ -388,8 +388,8 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
             var file = files.FirstOrDefault();
             await file.OpenReadStream().CopyToAsync(ms).ConfigureAwait(false);
             var data = ms.ToArray();
-            var list = this.ImportInternal<VmiLog>(data, out var validationResults);
+            var tupleList = this.ImportInternal<VmiLog>(data).Where(o => o.Item2.Count == 0).ToList();
-            if (validationResults.Any(o => o.Count > 0))
+            if (tupleList.Any(o => o.Item2.Count > 0))
             {
                 using var workbook = new XLWorkbook(new MemoryStream(data));
                 var ws = workbook.Worksheets.FirstOrDefault();
@@ -398,7 +398,7 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
                 header.Cell(errorIndex).Value = "提示信息";
                 for (int i = 0; i < ws.RowsUsed().Count() - 1; i++)
                 {
-                    ws.Row(i + 2).Cell(errorIndex).Value = string.Join(',', validationResults[i].Select(o => o.ErrorMessage));
+                    ws.Row(i + 2).Cell(errorIndex).Value = string.Join(',', tupleList[i].Item2.Select(o => o.ErrorMessage));
                 }
                 SetStyle(ws);
                 using var stream = new MemoryStream();
@@ -408,8 +408,9 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
                 await this._fileContainer.SaveAsync(fileName, stream, true).ConfigureAwait(false);
                 return new JsonResult(new { code = 400, message = "输入异常", fileName });
             }
-            list.ForEach(Update);
+            var logList = tupleList.Select(o => o.Item1).ToList();
-            var messageList = list.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList();
+            logList.AsParallel().ForEach(Update);
+            var messageList = logList.Select(log => new VmiMessage { Message = JsonSerializer.Serialize(log) }).ToList();
             var connectionString = this._serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
             var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connectionString).Options;
             using var context = new SettleAccountDbContext(options);
@@ -418,7 +419,7 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
             try
             {
                 using var transaction = context.Database.BeginTransaction();
-                await context.BulkInsertAsync(list).ConfigureAwait(false);
+                await context.BulkInsertAsync(logList).ConfigureAwait(false);
                 await context.BulkInsertAsync(messageList).ConfigureAwait(false);
                 transaction.Commit();
             }
@@ -441,10 +442,9 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
         }
     }
 
-    private List<T> ImportInternal<T>(byte[] data, out List<List<ValidationResult>> validationResults)
+    private List<Tuple<T, List<ValidationResult>>> ImportInternal<T>(byte[] data)
     {
-        var list = new List<T>();
+        var list = new List<Tuple<T, List<ValidationResult>>>();
-        validationResults = new List<List<ValidationResult>>();
         try
         {
             using var workbook = new XLWorkbook(new MemoryStream(data));
@@ -452,12 +452,13 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
                 .Where(o => o.GetAttributes<ImporterHeaderAttribute>().Any() || o.GetAttributes<DisplayAttribute>().Any())
                 .ToDictionary(o => o.GetAttribute<ImporterHeaderAttribute>()?.Name ?? o.GetAttribute<DisplayAttribute>()?.Name, o => o);
             var ws = workbook.Worksheets.FirstOrDefault();
-
+            var rowsUsedCount = ws.RowsUsed().Count();
-            for (int rowIndex = 2; rowIndex <= ws.RowsUsed().Count(); rowIndex++)
+            var columnsUsedCount = ws.ColumnsUsed().Count();
+            for (int rowIndex = 2; rowIndex <= rowsUsedCount; rowIndex++)
             {
                 var row = ws.Row(rowIndex);
                 var model = Activator.CreateInstance<T>();
-                for (var columnIndex = 1; columnIndex < ws.ColumnsUsed().Count(); columnIndex++)
+                for (var columnIndex = 1; columnIndex < columnsUsedCount; columnIndex++)
                 {
                     var cell = row.Cell(columnIndex);
                     var headerName = ws.Cell(1, columnIndex).Value.ToString().Trim();
@@ -498,10 +499,9 @@ public class VmiAppService : Controller, IApplicationService, IJobService, ITran
                         }
                     }
                 }
-                list.Add(model);
                 var results = new List<ValidationResult>();
                 Validator.TryValidateObject(model, new ValidationContext(model, null, null), results);
-                validationResults.Add(results);
+                list.Add(new Tuple<T, List<ValidationResult>>(model, results));
             }
             return list;
         }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAsyncBalanceService.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Text.Json;
+using System.Threading;
 using System.Threading.Tasks;
+using EFCore.BulkExtensions;
 using Magicodes.ExporterAndImporter.Core.Extension;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
@@ -29,6 +30,7 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
 {
     private readonly IServiceProvider _serviceProvider;
     private readonly ILogger<VmiAsyncBalanceService> _logger;
+    private static SemaphoreSlim semaphoreSlim = new SemaphoreSlim(1, 1);
 
     public VmiAsyncBalanceService(IServiceProvider serviceProvider, ILogger<VmiAsyncBalanceService> logger)
     {
@@ -50,15 +52,30 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
 
     [NonAction]
     public async Task Invoke(IServiceProvider serviceProvider)
+    {
+        await semaphoreSlim.WaitAsync().ConfigureAwait(false);
+        try
+        {
+            await InvokeInternal(serviceProvider).ConfigureAwait(false);
+        }
+        finally
+        {
+            semaphoreSlim.Release();
+        }
+    }
+
+    private async Task InvokeInternal(IServiceProvider serviceProvider)
     {
         var batchSize = 1000;
         var fetchSize = 0;
         var connectionString = serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
         for (var i = 0; i < 1000; i++)
         {
+            var balanceList = new List<Tuple<VmiBalance, int>>();
+            var vmiReplenishedList = new List<VmiReplenished>();
             var sw = new Stopwatch();
             sw.Start();
-            using var connection = new SqlConnection(connectionString);
+            using var connection = new Microsoft.Data.SqlClient.SqlConnection(connectionString);
             connection.Open();
             using var transaction = connection.BeginTransaction();
             try
@@ -72,20 +89,30 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
                 var vmiLogRepo = context.Set<VmiLog>();
                 var vmiBalanceRepo = context.Set<VmiBalance>();
                 var vmiReplenishedRepo = context.Set<VmiReplenished>();
-                if (!vmiMessageRepo.Any(o => !o.isConsumed))
+                //读取可消费消息列表
+                var messages = vmiMessageRepo.AsNoTracking().Where(o => !o.isConsumed).OrderBy(o => o.Number).Take(batchSize).ToList();
+                //没有可消费消息则返回
+                if (!messages.Any())
                 {
                     transaction.Commit();
                     break;
                 }
-                var messages = vmiMessageRepo.Where(o => !o.isConsumed).OrderBy(o => o.Number).Take(batchSize).ToList();
+                //设置数量为实际返回数量
-                fetchSize=messages.Count;
+                fetchSize = messages.Count;
+                //反序列化获取库存事务
                 var list = messages.Select(o =>
                 {
                     var log = JsonSerializer.Deserialize<VmiLog>(o.Message);
-                    log.SetId(Guid.Parse(JsonSerializer.Deserialize<JsonElement>(o.Message).GetProperty("Id").GetString()));
+                    var jsonElement = JsonSerializer.Deserialize<JsonElement>(o.Message);
-                    return new KeyValuePair<VmiMessage, VmiLog>(o, log);
+                    var property = jsonElement.GetProperty("Id");
-                }).ToDictionary(o => o.Key, o => o.Value);
+                    Console.WriteLine(jsonElement);
-                var tables = list.Values.Select(o => $"Set_VmiLog_{o.ChangedTime.Year}_{(o.ChangedTime.Month - 1) / 3 + 1}").Distinct().ToList();
+                    var id = Guid.Parse(property.GetString());
+                    log.SetId(id);
+                    return new LogToBalance { VmiMessage = o, Log = log, Table = $"Set_VmiLog_{log.ChangedTime.Year}_{(log.ChangedTime.Month - 1) / 3 + 1}" };
+                });
+                //获取分表名称
+                var tables = list.Select(o => o.Table).Distinct().ToList();
+                //创建分表
                 foreach (var table in tables)
                 {
                     command.CommandText = $"select OBJECT_ID('{table}', 'U')";
@@ -100,17 +127,26 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
                         command.ExecuteNonQuery();
                     }
                 }
-                foreach (var keyValue in list)
+                foreach (var item in list)
                 {
-                    var message = keyValue.Key;
+                    var message = item.VmiMessage;
-                    var log = keyValue.Value;
+                    message.isConsumed = true;
-                    //获取分表名
+                    var log = item.Log;
-                    var table = $"Set_VmiLog_{log.ChangedTime.Year}_{(log.ChangedTime.Month - 1) / 3 + 1}";
+                    //本地查找
-                    //插入到分表
+                    var balance = balanceList.Select(o => o.Item1).FirstOrDefault(
-                    command.CommandText = $"insert into {table} select * from Set_VmiLog where id ='{log.Id}'";
+                        o => o.DeliverBillType == log.DeliverBillType &&
-                    command.ExecuteNonQuery();
+                        o.CodeType == log.CodeType &&
-                    //插入库存
+                        o.DeliverBillType == log.DeliverBillType &&
-                    var balance = vmiBalanceRepo.FirstOrDefault(
+                        o.VinCode == log.VinCode &&
+                        o.ErpToLoc == log.ErpToLoc &&
+                        o.OrderNum == log.OrderNum &&
+                        o.factory == log.factory &&
+                        o.Configcode == log.Configcode);
+
+                    //数据库查找
+                    if (balance == null)
+                    {
+                        balance = vmiBalanceRepo.FirstOrDefault(
                         o => o.DeliverBillType == log.DeliverBillType &&
                         o.CodeType == log.CodeType &&
                         o.DeliverBillType == log.DeliverBillType &&
@@ -119,10 +155,12 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
                         o.OrderNum == log.OrderNum &&
                         o.factory == log.factory &&
                         o.Configcode == log.Configcode);
+                    }
                     if (balance == null)
                     {//不存在库存记录
-                        //新建库存记录
+                     //新建库存记录
                         balance = new VmiBalance();
+                        balanceList.Add(new Tuple<VmiBalance, int>(balance, 1));
                         if (log.LogType == VmiLogType.Type300)
                         {//反结算入库，重建库存
                             var logHistory = vmiLogRepo.AsNoTracking().FirstOrDefault(
@@ -149,10 +187,13 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
                             balance.InjectFrom(log);
                         }
                         balance.Qty = log.ChangedQty;
-                        await vmiBalanceRepo.AddAsync(balance).ConfigureAwait(false);
                     }
                     else
                     {//存在库存记录
+                        if (!balanceList.Any(o => o.Item1.Id == balance.Id))
+                        {
+                            balanceList.Add(new Tuple<VmiBalance, int>(balance, 2));
+                        }
                         var logType = log.LogType;
                         var currentQty = balance.Qty;// + log.ty
                         if (logType == VmiLogType.Type100)
@@ -177,7 +218,7 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
                             //添加负库存补货记录
                             var log2 = new VmiReplenished();
                             log2.InjectFrom(log);
-                            await vmiReplenishedRepo.AddAsync(log2).ConfigureAwait(false);
+                            vmiReplenishedList.Add(log2);
                         }
                         // 更新库存
                         balance.Qty = currentQty + log.ChangedQty;
@@ -187,9 +228,40 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
                             vmiBalanceRepo.Remove(balance);
                         }
                     }
-                    message.isConsumed = true;
-                    context.SaveChanges();
                 }
+
+                //更新事务分表
+                //foreach (var item in tables)
+                //{
+                //    var logs = list.Where(o => o.Table == item).Select(o => o.Log).ToList();
+                //    var xxx= logs.Select(o=>o.Id).Distinct().ToList();
+                //    await context.BulkInsertAsync(logs, new BulkConfig
+                //    {
+                //        CustomDestinationTableName = item,
+                //    }).ConfigureAwait(false);
+                //}
+                //批量更新消息
+                await context.BulkUpdateAsync(messages, new BulkConfig
+                {
+                    PropertiesToExclude = new List<string> { nameof(VmiMessage.Number) }
+                }).ConfigureAwait(false);
+                //批量插入负库存补货记录
+                await context.BulkInsertAsync(vmiReplenishedList).ConfigureAwait(false);
+                //批量插入库存余额
+                var addList = balanceList.Where(o => o.Item2 == 1 && o.Item1.Qty != decimal.Zero).Select(o => o.Item1).ToList();
+                var test0 = addList.Count;
+                var test1 = addList.Select(o => o.Id).Distinct().Count();
+                await context.BulkInsertAsync(balanceList.Where(o => o.Item2 == 1 && o.Item1.Qty != decimal.Zero).Select(o => o.Item1).ToList()).ConfigureAwait(false);
+                //批量更新库存余额
+                var updateList = balanceList.Where(o => o.Item2 == 2 && o.Item1.Qty != decimal.Zero).Select(o => o.Item1).ToList();
+                var test20 = updateList.Count;
+                var test21 = updateList.Select(o => o.Id).Distinct().Count();
+                await context.BulkUpdateAsync(balanceList.Where(o => o.Item2 == 2 && o.Item1.Qty != decimal.Zero).Select(o => o.Item1).ToList()).ConfigureAwait(false);
+                //批量删除库存余额
+                var deleteList = balanceList.Where(o => o.Item2 == 2 && o.Item1.Qty == decimal.Zero).Select(o => o.Item1).ToList();
+                var test30 = addList.Count;
+                var test31 = addList.Select(o => o.Id).Distinct().Count();
+                await context.BulkDeleteAsync(balanceList.Where(o => o.Item2 == 2 && o.Item1.Qty == decimal.Zero).Select(o => o.Item1).ToList()).ConfigureAwait(false);
                 transaction.Commit();
             }
             catch (Exception ex)
@@ -205,3 +277,10 @@ public class VmiAsyncBalanceService : Controller, IApplicationService, IJobServi
         }
     }
 }
+
+public class LogToBalance
+{
+    public VmiMessage VmiMessage { get; set; }
+    public VmiLog Log { get; set; }
+    public string Table { get; set; }
+}

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs

@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 
+[Table("TM_BJBMPT_JIS_RECORD")]
 public class TM_BJBMPT_JIS_RECORD
 {
     [Key]

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs

@@ -8,6 +8,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 /// <summary>
 /// Jis小件
 /// </summary>
+[Table("TM_BJBMPT_JIT_RECORD")]
 public class TM_BJBMPT_JIT_RECORD
 {
     [Key]

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs

@@ -8,6 +8,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 /// <summary>
 /// Jit(非Jis)
 /// </summary>
+[Table("TM_BJBMPT_OTHER_RECORD")]
 public class TM_BJBMPT_OTHER_RECORD
 {
     [Key]

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalance.cs

@@ -1,4 +1,5 @@
 using System;
+using SequentialGuid;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
@@ -6,7 +7,7 @@ public class VmiBalance : VmiBalanceBase
 {
     public VmiBalance()
     {
-        Id = SequentialGuid.SequentialSqlGuidGenerator.Instance.NewGuid();
+        Id = SequentialGuidGenerator.Instance.NewGuid();
         CreatedTime = Id.ToDateTime().Value.ToLocalTime();
         ConcurrencyStamp = Guid.NewGuid().ToString("N");
     }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using SequentialGuid;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
@@ -11,7 +12,7 @@ public class VmiLog : VmiBalanceBase, IValidatableObject
 {
     public VmiLog()
     {
-        Id = SequentialGuid.SequentialSqlGuidGenerator.Instance.NewGuid();
+        Id = SequentialGuidGenerator.Instance.NewGuid();
         ChangedTime = Id.ToDateTime().Value.ToLocalTime();
         ConcurrencyStamp = Guid.NewGuid().ToString("N");
     }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiMessage.cs

@@ -1,4 +1,5 @@
 using System;
+using SequentialGuid;
 using Volo.Abp.Domain.Entities;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
@@ -7,7 +8,7 @@ public class VmiMessage : Entity<Guid>
 {
     public VmiMessage()
     {
-        Id = SequentialGuid.SequentialSqlGuidGenerator.Instance.NewGuid();
+        Id = SequentialGuidGenerator.Instance.NewGuid();
         CreatedTime = Id.ToDateTime().Value.ToLocalTime();
         ConcurrencyStamp = Guid.NewGuid().ToString("N");
     }