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

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@@ -18,10 +18,10 @@ export default [
         ...createPage("role", "title=角色管理"),
         children: [createButton("query", "title=查询&isTop=true"), createButton("create", "title=新建&isTop=true"), createButton("delete", "title=删除&disabled=o => o.isStatic")],
       },
-      {
+      // {
-        ...createPage("material", "title=物料主数据"),
+      //   ...createPage("material", "title=物料主数据"),
-        children: [createButton("query", "title=查询&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
+      //   children: [createButton("query", "title=查询&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],
-      },
+      // },
       {
         ...createPage("version", "title=期间设置"),
         children: [

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_CAN_SA_DTO.cs

@@ -42,7 +42,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
     public class BBAC_CAN_SA_DETAIL_DTO : EntityDto<Guid>
     {
 
-        
+    
+
         [ExporterHeader(DisplayName = "关联结算单号")]         //全部业务都有显示                    
         public string SettleBillNum { get; set; }
         [ExporterHeader(DisplayName = "发票分组号")]           //全部业务都显示  （默认）
@@ -63,10 +64,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         public decimal Qty { get; set; }
         [ExporterHeader(DisplayName = "结算分组号")]          //全部业务都显示    （查询条件）
         public string GroupNum { get; set; }
-       [ExporterHeader(DisplayName = "工厂地点")]             //HBPO-JIS业务显示
+        [ExporterHeader(DisplayName = "工厂地点")]             //HBPO-JIS业务显示
         public string Site { get; set; }
         [ExporterHeader(DisplayName = "是否退货")]             //BBAC-JIS显示 其他没有这个字段
         public string IsReturn { get; set; }
+
+        [ExporterHeader(DisplayName = "合同号")]
+        public string ContractDocID { set; get; }
+
+
         /// <summary>
         /// 版本
         /// </summary>
@@ -84,10 +90,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// 金额
         /// </summary>
         public decimal Amt { get; set; }
-        /// <summary>
+   
-        /// 合同号
-        /// </summary>
-        public string ContractDocID { set; get; }
    
 
     }
@@ -129,6 +132,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
         /// </summary>
         [ExporterHeader(DisplayName = "版本号")]
         public int Version { get; set; }
+        [ExporterHeader(DisplayName = "合同号")]
+        public int ContractDocID { set; get; }
 
     }
     //public class BBAC_CAN_SA_EXP_DTO

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

@@ -15,6 +15,7 @@ using Volo.Abp;
 using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Uow;
 using Win.Abp.Snowflakes;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Bases;
@@ -74,6 +75,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
+        [UnitOfWork(false)]
         //[Route("generateinvoice")]
         public async override Task<IActionResult> GenerateInvoice([FromBody] string invbillnum)
         {
@@ -161,11 +163,5 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             }
             return  new JsonResult(new { Code = 200, Message = "生成成功" });
         }
-
-
-       
-
-
-
     }
 }

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

@@ -4,15 +4,11 @@ using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Text.Json;
 using System.Threading.Tasks;
-using EFCore.BulkExtensions;
 using Magicodes.ExporterAndImporter.Core.Extension;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Omu.ValueInjecter;
-using SettleAccount.Job.SignalR;
 using Volo.Abp.Application.Services;
 using Volo.Abp.DependencyInjection;
 using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
@@ -34,140 +30,114 @@ public class VmiAsyncBalanceService : ApplicationService, IJobService, ITransien
 
     public async Task Invoke(IServiceProvider serviceProvider)
     {
-        var connectionString = serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
+        for (var i = 0; i < 50; i++)
-        using var connection = new SqlConnection(connectionString);
-        connection.Open();
-        using var transaction = connection.BeginTransaction();
-        try
         {
-            var command = connection.CreateCommand();
+            var connectionString = serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
-            command.Transaction = transaction;
+            using var connection = new SqlConnection(connectionString);
-            var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connection).Options;
+            connection.Open();
-            using var context = new SettleAccountDbContext(options);
+            using var transaction = connection.BeginTransaction();
-            context.Database.UseTransaction(transaction);
+            try
-            var messages = context.Set<VmiMessage>().Where(o => !o.isConsumed).OrderBy(o => o.Number).Take(1000 * 100).ToList();
-            var repo = context.Set<VmiBalance>();
-            foreach (var message in messages)
             {
-                var log = JsonSerializer.Deserialize<VmiLog>(message.Message);
+                var command = connection.CreateCommand();
-                log.SetId(Guid.Parse(JsonSerializer.Deserialize<JsonElement>(message.Message).GetProperty("Id").GetString()));
+                command.Transaction = transaction;
-                //插入分表
+                var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connection).Options;
-                var table = $"Set_VmiLog_{log.ChangedTime.Year}_{(log.ChangedTime.Month - 1) / 3 + 1}";
+                using var context = new SettleAccountDbContext(options);
-                command.CommandText = $"select OBJECT_ID('{table}', 'U')";
+                context.Database.UseTransaction(transaction);
-                var result = command.ExecuteScalar().ToString();
+                if (!context.Set<VmiMessage>().Any(o => !o.isConsumed))
-                if (result == string.Empty)
                 {
-                    command.CommandText = $"select * into {table} from Set_VmiLog where 1=0;";
+                    break;
-                    command.ExecuteNonQuery();
-                    command.CommandText = $"create clustered index IX_{table}_ChangedTime on {table} (ChangedTime);";
-                    command.ExecuteNonQuery();
-                    command.CommandText = $"alter table {table} add constraint PK_{table} primary key (Id);";
-                    command.ExecuteNonQuery();
                 }
-                //插入到分表
+                var messages = context.Set<VmiMessage>().Where(o => !o.isConsumed).OrderBy(o => o.Number).Take(1000).ToList();
-                command.CommandText = $"insert into {table} select * from Set_VmiLog where id ='{log.Id}'";
+                var repo = context.Set<VmiBalance>();
-                command.ExecuteNonQuery();
+                foreach (var message in messages)
-                //插入库存
-                var balance = context.Set<VmiBalance>().FirstOrDefault(
-                o => o.DeliverBillType == log.DeliverBillType &&
-                o.CodeType == log.CodeType &&
-                o.DeliverBillType == log.DeliverBillType &&
-                o.VinCode == log.VinCode &&
-                o.ErpToLoc == log.ErpToLoc &&
-                o.OrderNum == log.OrderNum &&
-                o.factory == log.factory &&
-                o.Configcode == log.Configcode);
-                if (balance == null)
                 {
-                    balance = new VmiBalance(GuidGenerator.Create());
+                    var log = JsonSerializer.Deserialize<VmiLog>(message.Message);
-                    balance.InjectFrom(log);
+                    log.SetId(Guid.Parse(JsonSerializer.Deserialize<JsonElement>(message.Message).GetProperty("Id").GetString()));
-                    await repo.AddAsync(balance).ConfigureAwait(false);
+                    //插入分表
-                    log.InjectFrom(balance);
+                    var table = $"Set_VmiLog_{log.ChangedTime.Year}_{(log.ChangedTime.Month - 1) / 3 + 1}";
-                }
+                    command.CommandText = $"select OBJECT_ID('{table}', 'U')";
-                else
+                    var result = command.ExecuteScalar().ToString();
-                {
+                    if (result == string.Empty)
-                    var logType = log.LogType;
-
-                    var qty = balance.Qty;// + log.ty
-                    if (logType == VmiLogType.Type100)
-                    {
-                        //发运入库，负库存字段需要更新
-                        if (balance.Qty < decimal.Zero)
-                        {
-                            balance.InjectFrom(log);
-                        }
-                    }
-                    else if (logType == VmiLogType.Type300)
                     {
-                        //反结入库，只更新库存
+                        command.CommandText = $"select * into {table} from Set_VmiLog where 1=0;";
+                        command.ExecuteNonQuery();
+                        command.CommandText = $"create clustered index IX_{table}_ChangedTime on {table} (ChangedTime);";
+                        command.ExecuteNonQuery();
+                        command.CommandText = $"alter table {table} add constraint PK_{table} primary key (Id);";
+                        command.ExecuteNonQuery();
                     }
-                    else if (logType == VmiLogType.Type500)
+                    //插入到分表
+                    command.CommandText = $"insert into {table} select * from Set_VmiLog where id ='{log.Id}'";
+                    command.ExecuteNonQuery();
+                    //插入库存
+                    var balance = context.Set<VmiBalance>().FirstOrDefault(
+                    o => o.DeliverBillType == log.DeliverBillType &&
+                    o.CodeType == log.CodeType &&
+                    o.DeliverBillType == log.DeliverBillType &&
+                    o.VinCode == log.VinCode &&
+                    o.ErpToLoc == log.ErpToLoc &&
+                    o.OrderNum == log.OrderNum &&
+                    o.factory == log.factory &&
+                    o.Configcode == log.Configcode);
+                    if (balance == null)
                     {
-                        //调整入库，更新库存和其他字段
+                        balance = new VmiBalance(GuidGenerator.Create());
                         balance.InjectFrom(log);
+                        await repo.AddAsync(balance).ConfigureAwait(false);
+                        log.InjectFrom(balance);
                     }
-                    // 更新库存
+                    else
-                    balance.Qty = qty;
-                    if (balance.Qty == decimal.Zero)
-                    {
-                        //删除0库存
-                        repo.Remove(balance);
-                    }
-                    if (logType == VmiLogType.Type100 && balance.Qty < decimal.Zero && log.Qty > 0)
                     {
-                        //添加负库存补货记录
+                        var logType = log.LogType;
-                        var log2 = new VmiReplenished();
+
-                        log2.InjectFrom(log);
+                        var qty = balance.Qty;// + log.ty
-                        await context.Set<VmiReplenished>().AddAsync(log2).ConfigureAwait(false);
+                        if (logType == VmiLogType.Type100)
+                        {
+                            //发运入库，负库存字段需要更新
+                            if (balance.Qty < decimal.Zero)
+                            {
+                                balance.InjectFrom(log);
+                            }
+                        }
+                        else if (logType == VmiLogType.Type300)
+                        {
+                            //反结入库，只更新库存
+                        }
+                        else if (logType == VmiLogType.Type500)
+                        {
+                            //调整入库，更新库存和其他字段
+                            balance.InjectFrom(log);
+                        }
+                        // 更新库存
+                        balance.Qty = qty;
+                        if (balance.Qty == decimal.Zero)
+                        {
+                            //删除0库存
+                            repo.Remove(balance);
+                        }
+                        if (logType == VmiLogType.Type100 && balance.Qty < decimal.Zero && log.Qty > 0)
+                        {
+                            //添加负库存补货记录
+                            var log2 = new VmiReplenished();
+                            log2.InjectFrom(log);
+                            await context.Set<VmiReplenished>().AddAsync(log2).ConfigureAwait(false);
+                        }
                     }
+                    message.isConsumed = true;
                 }
-                message.isConsumed = true;
+                context.SaveChanges();
+                transaction.Commit();
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.ToString());
+                transaction.Rollback();
+                throw;
             }
-            context.SaveChanges();
-            transaction.Commit();
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine(ex.ToString());
-            transaction.Rollback();
-            throw;
         }
     }
-}
-
-/// <summary>
-/// 消息表定时清理
-/// </summary>
-public class VmiAsyncMessageService : Controller, IApplicationService, IJobService, ITransientDependency
-{
-    private readonly IServiceProvider _serviceProvider;
-
-    public VmiAsyncMessageService(IServiceProvider serviceProvider)
-    {
-        this._serviceProvider = serviceProvider;
-    }
-
-    [NonAction]
-    public Task Invoke(IServiceProvider serviceProvider)
-    {
-        using var scope = serviceProvider.CreateScope();
-        var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
-        db.Set<VmiMessage>().Where(o => o.isConsumed).BatchDelete();
-        var count = db.Set<VmiMessage>().Where(o => !o.isConsumed).Count();
-        scope.ServiceProvider.GetService<IHubContext<PageHub>>().Clients.All.ServerToClient("VmiBalance", count.ToString(), "");
-        return Task.CompletedTask;
-    }
 
-    /// <summary>
+    public async Task InvokeInternal(IServiceProvider serviceProvider)
-    /// 未处理消息数量
-    /// </summary>
-    /// <returns></returns>
-    [HttpPost]
-    public int GetMessageCount()
     {
-        using var scope = this._serviceProvider.CreateScope();
-        var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
-        var count = db.Set<VmiMessage>().Where(o => !o.isConsumed).Count();
-        return count;
     }
 }

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

@@ -0,0 +1,51 @@
+using System;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Threading.Tasks;
+using EFCore.BulkExtensions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.DependencyInjection;
+using SettleAccount.Job.SignalR;
+using Volo.Abp.Application.Services;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ;
+
+/// <summary>
+/// 消息表定时清理
+/// </summary>
+public class VmiAsyncMessageService : Controller, IApplicationService, IJobService, ITransientDependency
+{
+    private readonly IServiceProvider _serviceProvider;
+
+    public VmiAsyncMessageService(IServiceProvider serviceProvider)
+    {
+        this._serviceProvider = serviceProvider;
+    }
+
+    [NonAction]
+    public Task Invoke(IServiceProvider serviceProvider)
+    {
+        using var scope = serviceProvider.CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
+        db.Set<VmiMessage>().Where(o => o.isConsumed).BatchDelete();
+        var count = db.Set<VmiMessage>().Where(o => !o.isConsumed).Count();
+        scope.ServiceProvider.GetService<IHubContext<PageHub>>().Clients.All.ServerToClient("VmiBalance", count.ToString(), "");
+        return Task.CompletedTask;
+    }
+
+    /// <summary>
+    /// 未处理消息数量
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost]
+    public int GetMessageCount()
+    {
+        using var scope = this._serviceProvider.CreateScope();
+        var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
+        var count = db.Set<VmiMessage>().Where(o => !o.isConsumed).Count();
+        return count;
+    }
+}