修改更新

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

@@ -138,7 +138,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                 .FirstOrDefault();
             if (invoiceGrp.BusinessType == EnumBusinessType.JisBBAC)
             {
-
                 var _detail = await _bbacMng.GetDetailAsync(invbillNum, EnumBusinessType.MaiDanJianBBAC).ConfigureAwait(false);//查出买单数量
                 var invoiceGrpDetails = _settleAccountDbContext.Set<INVOICE_WAIT_DETAIL>().AsNoTracking()
                 .Where(t => t.InvbillNum == invbillNum)
@@ -222,9 +221,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                             LINE = (i + 1).ToString()
                         });
                     }
-
-
-
                     var tedsaInvs1 = JsonConvert.DeserializeObject<List<TED_SAS_INVOICE>>(JsonConvert.SerializeObject(tedSaInvs));
                     var invbefore = invoiceGrp.TaxAmt + invoiceGrp.TaxDiff;
                     var invafter = tedsaInvs1.Sum(p => p.InvoiceNetAmount) + tedsaInvs1.Sum(p => p.InvoiceTaxAmount);
@@ -260,9 +256,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             else
             {
 
-
-
-
                 var invoiceGrpDetails = _settleAccountDbContext.Set<INVOICE_WAIT_DETAIL>()
                .Where(t => t.InvbillNum == invbillNum)
                .ToList();
@@ -307,7 +300,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                         {
                             invoiceGrpDetail.SetProperty("ErpToLoc", "CC001");
                         }
-
                         tedSaInvs.Add(new TED_SAS_INVOICE()
                         {
                             GUID = GuidGenerator.Create(),
@@ -336,11 +328,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
                     //红冲发票提交QAD
                     if (!string.IsNullOrEmpty(invoiceGrp.ParentInvbillNum))
                     {
-                      
-                    
                       await SubmitToQadHongChongAsync(invoiceGrp.ParentInvbillNum).ConfigureAwait(false);
-                        
-                       
                     }
                     //await _exChangeCenterDbContext.Set<TEA_TASK_SUB>().AddAsync(teaTaskSub).ConfigureAwait(false);
                     //await _exChangeCenterDbContext.Set<TED_SAS_INVOICE>().AddRangeAsync(tedSaInvs).ConfigureAwait(false);

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

@@ -41,6 +41,7 @@ using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.BlobStoring;
 using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Entities;
 using Volo.Abp.Guids;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Users;
@@ -78,6 +79,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         private readonly TaskJobService _service;
         private readonly Volo.Abp.ObjectMapping.IObjectMapper _maper;
         protected readonly IExcelImportAppService _excelImportService;
+    
         public VmiAppService(IConfiguration cfg,
             IServiceProvider serviceProvider,
             IGuidGenerator guidGenerator,
@@ -92,6 +94,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             IExcelImportAppService excelImportService,
             TaskJobService service
           
+
             )
 
         {
@@ -195,69 +198,27 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PagedResultDto<VmiBalanceNewDto>> Balance(RequestDto input)
+        public async Task<PagedResultDto<VmiBalanceSumDetailDto>> Balance(RequestDto input)
-        {
+        {
-            var sql2 =
-                      "select count(number) number from(\n" +
-                      "SELECT 1 number\n" +
-                      "FROM Set_VmiLog\n" +
-                      "GROUP BY VinCode, RealPartCode, ErpToLoc having SUM(ChangedQty)<>0) a\n"; 
-
-
-            var sql = "select  * from (\n" + 
-                      "SELECT t.vincode,t.realpartcode,t.erptoloc, shippingtime, receivetime,(isnull(t.[100],0) + isnull(t.[200],0)  + isnull(t.[400],0) + isnull(t.[500],0)+isnull(t.[600],0)) sumqty,\n" + 
-                      "isnull(t.[100],0) ShippingQty,isnull(t.[200],0) SettleQty , isnull(t.[400],0) ReturnQty,isnull(t.[500],0) InputQty,isnull(t.[600],0) OutputQty\n" + 
-                      "FROM (\n" + 
-                      "SELECT VinCode, RealPartCode, ErpToLoc, [100], [200], [400], [500],[600]\n" + 
-                      "FROM (\n" + 
-                      "SELECT VinCode, RealPartCode, ErpToLoc, ChangedQty, LogType\n" + 
-                      "FROM Set_VmiLog\n" + 
-                      ") AS src\n" + 
-                      "PIVOT (\n" + 
-                      "SUM(ChangedQty)\n" + 
-                      "FOR LogType IN ([100],[200],[400],[500],[600])\n" + 
-                      ") AS piv\n" + 
-                      ") AS t\n" + 
-                      "left JOIN (\n" + 
-                      "SELECT VinCode, RealPartCode, ErpToLoc, MAX(BillTime) shippingtime\n" + 
-                      "FROM Set_VmiLog\n" + 
-                      "WHERE LogType = 100\n" + 
-                      "GROUP BY VinCode, RealPartCode, ErpToLoc\n" + 
-                      ") AS t1 ON t1.ErpToLoc = t.ErpToLoc AND t1.RealPartCode = t.RealPartCode AND t1.VinCode = t.VinCode\n" + 
-                      "left JOIN (\n" + 
-                      "SELECT VinCode, RealPartCode, ErpToLoc, MAX(BillTime) receivetime\n" + 
-                      "FROM Set_VmiLog\n" + 
-                      "WHERE LogType = 200\n" + 
-                      "GROUP BY VinCode, RealPartCode, ErpToLoc\n" + 
-                      ") AS t2 ON t2.ErpToLoc = t.ErpToLoc AND t2.RealPartCode = t.RealPartCode AND t2.VinCode = t1.VinCode) temp55\n" + 
-                      "WHERE  sumqty <> 0\n";
-
-
           
             var connectionString = this._serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
             var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connectionString).Options;
             using var db = new SettleAccountDbContext(options);
+            var query = db.Set<VmiBalanceSumDetail>().AsQueryable();
 
-            var query =  db.Database.GetDbConnection().Query<VmiBalanceNewDto>(sql).AsQueryable();
+            var filters = input.Filters.ToLambda<VmiBalanceSumDetailDto>();
-            var query1 = db.Database.GetDbConnection().Query<int>(sql2).AsQueryable();
-
-            var filters = input.Filters.ToLambda<VmiBalanceNewDto>();
             if (input.Filters.Count > 0)
             {
-                query = query.Where(input.Filters.ToLambda<VmiBalanceNewDto>());
+                query = query.Where(input.Filters.ToLambda<VmiBalanceSumDetailDto>());              
-                query1 = query1.Where(input.Filters.ToLambda<VmiBalanceNewDto>());
             }
+            var totalCount = query.Count();
 
-            //query = string.IsNullOrEmpty(input.Sorting) ? query : DynamicQueryableExtensions.OrderBy(query, input.Sorting);
-            //var query2 = query.GroupBy(o => new { o.ErpToLoc, o.RealPartCode, o.VinCode,o.LogType }).Select(o => new VmiBalanceNewDto { VinCode = o.Key.VinCode, ErpToLoc = o.Key.ErpToLoc, RealPartCode = o.Key.RealPartCode, Qty = o.Sum(o => o.ChangedQty), BillTime = o.Max(o => o.BillTime),Se=o.Sum(o=>o.LogType== VmiLogType.Type100 ? 1:0), ReturnGoods = o.Sum(o => o.LogType == VmiLogType.Type400 ? 1 : 0) }).Where(p => p.Qty != 0);
-            var totalCount = query1.Count();
-            //query = string.IsNullOrEmpty(input.Sorting) ? query : DynamicQueryableExtensions.OrderBy(query, input.Sorting);
-            //var query2 = query.GroupBy(o => new { o.ErpToLoc, o.RealPartCode,o.VinCode }).Select(o => new VmiBalanceDto { VinCode = o.Key.VinCode, ErpToLoc = o.Key.ErpToLoc, RealPartCode = o.Key.RealPartCode, Qty = o.Sum(o => o.Qty),LastTime=o.Max(o=>o.ChangedTime) });
-            //var totalCount = query2.Count();
             var entities = await query.PageBy(input.SkipCount, input.MaxResultCount).ToListAsync().ConfigureAwait(false);
-            //var entities = await _balanceRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false);
+            // _maper.Map(VmiBalanceSumDetail,v)
-            //var totalCount = await _balanceRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
+
-            return new PagedResultDto<VmiBalanceNewDto>(totalCount, entities);
+            var dtos = _maper.Map<List<VmiBalanceSumDetail>, List<VmiBalanceSumDetailDto>>(entities);
+
+            return new PagedResultDto<VmiBalanceSumDetailDto>(totalCount, dtos);
         }
 
         /// <summary>
@@ -295,21 +256,21 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<PagedResultDto<VmiBalanceSumDto>> BalanceSum(RequestDto input)
+        public async Task<PagedResultDto<VmiBalanceSumMainDto>> BalanceSum(RequestDto input)
         {
 
             var connectionString = this._serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
             var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connectionString).Options;
             using var db = new SettleAccountDbContext(options);
-            var query = db.Set<VmiLog>().FromSqlRaw("select * from Set_VmiLog");
+            var query = db.Set<VmiBalanceSum>().AsQueryable();
-            var filters = input.Filters.ToLambda<VmiLog>();
+            var filters = input.Filters.ToLambda<VmiBalanceSumMainDto>();
             if (input.Filters.Count > 0)
             {
-                query = query.Where(input.Filters.ToLambda<VmiLog>());
+                query = query.Where(input.Filters.ToLambda<VmiBalanceSumMainDto>());
             }
             query = string.IsNullOrEmpty(input.Sorting) ? query : DynamicQueryableExtensions.OrderBy(query, input.Sorting);
-            var query2 = query.GroupBy(o => new { o.ErpToLoc, o.RealPartCode }).Select(o => new VmiBalanceSumDto { ErpToLoc = o.Key.ErpToLoc, RealPartCode = o.Key.RealPartCode, Qty = o.Sum(o => o.ChangedQty) });
+          
-            var totalCount = query2.Count();
+            var totalCount = query.Count();
 
             //var connectionString = this._serviceProvider.GetRequiredService<IConfiguration>().GetConnectionString("SettleAccountService");
             //var options = new DbContextOptionsBuilder<SettleAccountDbContext>().UseSqlServer(connectionString).Options;
@@ -323,8 +284,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
             //var query2 = query.GroupBy(o => new { o.ErpToLoc, o.RealPartCode }).Select(o => new VmiBalanceSumDto { ErpToLoc = o.Key.ErpToLoc, RealPartCode = o.Key.RealPartCode, Qty = o.Sum(o => o.Qty) });
             //var totalCount = query2.Count();
             //query2 = string.IsNullOrEmpty(input.Sorting) ? query2 : DynamicQueryableExtensions.OrderBy(query2, input.Sorting);
-            var entities = await query2.PageBy(input.SkipCount, input.MaxResultCount).ToListAsync().ConfigureAwait(false);
+            var entities = await query.PageBy(input.SkipCount, input.MaxResultCount).ToListAsync().ConfigureAwait(false);
-            return new PagedResultDto<VmiBalanceSumDto>(totalCount, entities);
+            var dtos = _maper.Map<List<VmiBalanceSum>, List<VmiBalanceSumMainDto>>(entities);
+            return new PagedResultDto<VmiBalanceSumMainDto>(totalCount, dtos);
         }
 
         /// <summary>
@@ -1391,9 +1353,50 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
     }
 
 
+    public class VmiBalanceSumDetailDto 
+    {
+        [Display(Name = "生产码")]
+        public string Vincode { set; get; }
+        [Display(Name = "零件号")]
+        public string RealPartcode { set; get; }
+        [Display(Name = "库位")]
+        public string ErpToLoc { set; get; }
+        [Display(Name = "最后发运时间")]
+        public DateTime? ShippingTime { set; get; }
+        [Display(Name = "最后结算时间")]
+        public DateTime? ReceiveTime { set; get; }
+        [Display(Name = "合计数量")]
+        public decimal SumQty { set; get; }
+        [Display(Name = "发运入库数量")]
+        public decimal ShippingQty { set; get; }
+        [Display(Name = "结算出库数量")]
+        public decimal SettleQty { set; get; }
+        [Display(Name = "退货出库数量")]
+        public decimal ReturnQty { set; get; }
+        [Display(Name = "调整入库数量")]
+        public decimal InputQty { set; get; }
+        [Display(Name = "调整出库数量")]
+        public decimal OutputQty { set; get; }
+    }
+    public class VmiBalanceSumMainDto
+    {
+      
+        [Display(Name = "零件号")]
+        public string RealPartcode { set; get; }
+
+        [Display(Name = "零件描述")]
+        public string PartDesc { set; get; }
+
+        [Display(Name = "库位")]
+        public string ErpToLoc { set; get; }
+        [Display(Name = "数量")]
+        public decimal Qty { set; get; }
 
 
 
+    }
+
+
 
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@@ -177,6 +177,8 @@ namespace Win.Sfs.SettleAccount
             CreateMapPUB_PD();
             CreateMapPUB_PD_DETAIL();
             CreateMapINVOICE_WAIT_DETAIL_EXTEND();
+            CreateMapBalanceSumDetail();
+            CreateMapBalanceSum();
 
         }
         #region BQ
@@ -933,9 +935,7 @@ namespace Win.Sfs.SettleAccount
             CreateMap<BBAC_SA_DETAIL, BBAC_NOT_SA_DETAIL>()
                 .ForMember(x => x.SettleBillNum, y => y.MapFrom(d => d.BillNum));
             CreateMap<BBAC_SA_DETAIL, BBAC_SA_DETAIL_EXPORT_DTO>();
-
+            CreateMap<BBAC_SA_DETAIL_IMPORT_DTO, BBAC_SA_DETAIL>().ForMember(x => x.SettleDate, y => y.MapFrom(y => DateTime.ParseExact(y.SettleDate, "dd.MM.yyyy", System.Globalization.CultureInfo.CurrentCulture)));
-            CreateMap<BBAC_SA_DETAIL_IMPORT_DTO, BBAC_SA_DETAIL>()
-                .ForMember(x => x.SettleDate, y => y.MapFrom(y => DateTime.ParseExact(y.SettleDate, "dd.MM.yyyy", System.Globalization.CultureInfo.CurrentCulture)));
         }
 
         /// <summary>
@@ -947,6 +947,26 @@ namespace Win.Sfs.SettleAccount
             CreateMap<HBPO_SE_DETAIL, HBPO_SE_DETAIL_EXPORT_DTO>();
         }
 
+
+        /// <summary>
+        /// BBAC发运数据
+        /// </summary>
+        private void CreateMapBalanceSumDetail()
+        {
+            CreateMap<VmiBalanceSumDetail, VmiBalanceSumDetailDto>().ReverseMap();
+        }
+
+        /// <summary>
+        /// BBAC发运数据
+        /// </summary>
+        private void CreateMapBalanceSum()
+        {
+            CreateMap<VmiBalanceSum, VmiBalanceSumMainDto>()
+                 .ForMember(x => x.Qty, y => y.MapFrom(d => d.SumQty)).ReverseMap();
+        }
+
+
+
         /// <summary>
         /// HBPO EDI
         /// </summary>

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

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi
+{
+    public class VmiBalanceSumDetail : Entity<Guid>
+    {
+        public VmiBalanceSumDetail()
+        {
+        }
+
+        public VmiBalanceSumDetail(string vincode, string realPartcode, string erpToLoc, DateTime? shippingTime, DateTime? receiveTime, decimal sumQty, decimal shippingQty, decimal settleQty, decimal returnQty, decimal inputQty, decimal outputQty)
+        {
+            Vincode = vincode;
+            RealPartcode = realPartcode;
+            ErpToLoc = erpToLoc;
+            ShippingTime = shippingTime;
+            ReceiveTime = receiveTime;
+            SumQty = sumQty;
+            ShippingQty = shippingQty;
+            SettleQty = settleQty;
+            ReturnQty = returnQty;
+            InputQty = inputQty;
+            OutputQty = outputQty;
+        }
+
+
+
+        public string Vincode { set; get; }
+        public string RealPartcode { set; get; }
+        public string ErpToLoc { set; get; }
+        public DateTime? ShippingTime { set; get; }
+        public DateTime? ReceiveTime { set; get; }
+        public decimal SumQty { set; get; }
+        public decimal ShippingQty { set; get; }
+        public decimal SettleQty { set; get; }
+        public decimal ReturnQty { set; get; }
+        public decimal InputQty { set; get; }
+        public decimal OutputQty { set; get; }
+    }
+    public class VmiBalanceSum : Entity<Guid>
+    {
+        public VmiBalanceSum()
+        {
+        }
+
+        public VmiBalanceSum(string realPartcode, string erpToLoc, decimal sumQty)
+        {
+            RealPartcode = realPartcode;
+            ErpToLoc = erpToLoc;
+            SumQty = sumQty;
+        }
+        [Display(Name ="零件号")]
+        public string RealPartcode { set; get; }
+        [Display(Name = "库位")]
+        public string ErpToLoc { set; get; }
+        [Display(Name = "数量")]
+        public decimal SumQty { set; get; }
+
+
+
+    }
+
+
+
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -2,6 +2,7 @@ using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Org.BouncyCastle.Crypto.Tls;
 using SettleAccount.Domain.BQ;
 using Volo.Abp;
 using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -113,6 +114,8 @@ namespace Win.Sfs.SettleAccount
             builder.ConfigureBBAC_PD(options);
             builder.ConfigureHBPO_PD(options);
             builder.ConfigurePUB_PD(options);
+            builder.ConfigureVmiBalanceSum(options);
+            builder.ConfigureVmiBalanceSumDetail(options);
 
             //builder.ConfigureTED_SA_INV(options);
             //大众发票导入
@@ -1115,6 +1118,35 @@ namespace Win.Sfs.SettleAccount
             });
         }
 
+       
+        private static void ConfigureVmiBalanceSum(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+            builder.Entity<VmiBalanceSum>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_VmiBalanceSum", options.Schema);
+                b.ConfigureByConvention();
+                b.Property(x => x.ErpToLoc).HasMaxLength(50);
+                b.Property(x => x.RealPartcode).HasMaxLength(50);
+            
+            });
+        }
+        private static void ConfigureVmiBalanceSumDetail(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+            builder.Entity<VmiBalanceSumDetail>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_VmiBalanceSumDetail", options.Schema);
+
+                b.ConfigureByConvention();
+                b.Property(x => x.ErpToLoc).HasMaxLength(50);
+                b.Property(x => x.RealPartcode).HasMaxLength(50);
+                b.Property(x => x.Vincode).HasMaxLength(50);
+
+            });
+        }
+
+
+
+
         //private static void ConfigureTED_SA_INV(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         //{
         //    builder.Entity<TED_SA_INV>(b =>

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20231214035158_202312140001.cs

@@ -0,0 +1,231 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202312140001 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "Version",
+                table: "Set_VmiLog",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "StateOther",
+                table: "Set_BBAC_SA",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "Set_VmiBalanceSum",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    RealPartcode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    ErpToLoc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    SumQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Set_VmiBalanceSum", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Set_VmiBalanceSumDetail",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Vincode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    RealPartcode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    ErpToLoc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    ShippingTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    ReceiveTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    SumQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    ShippingQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    SettleQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    ReturnQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    InputQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    OutputQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Set_VmiBalanceSumDetail", x => x.Id);
+                });
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "3a923aaaa9ae40909dd4c4c9742b6a6b");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "6ec51a85d14d4b8fb1d73448c094bc7e");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "8bb2744237da4124b53d60ae195d0033");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "ded0555578d84ac3b7fe4398c6fa0fed");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "cd696e4bd17945d6a12a563e6f4df0bd");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "f975d3b2aed6483ebccc47c2759ac7a1");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "a155d7eb0a4241c18959939d43fae77e");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "f2fa14427a7b40ff9931d64d69e1ff27");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "601c312fb4704923bae6f5fcb8c43f5a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "361fff6305e343cabd1a30996f06b2f6");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "3353367fc55e4997a9f0b1d4619f1ec9");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Set_VmiBalanceSum");
+
+            migrationBuilder.DropTable(
+                name: "Set_VmiBalanceSumDetail");
+
+            migrationBuilder.DropColumn(
+                name: "Version",
+                table: "Set_VmiLog");
+
+            migrationBuilder.DropColumn(
+                name: "StateOther",
+                table: "Set_BBAC_SA");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "77f1b41949d5436b8d1935bc21b98a54");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "6404d1839d68478189fd8a9fbd72067b");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "6a99699beaa946bc82e545cbabd6594a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "5973e508dc284fbda7801ac2d6114f50");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "af105df5a597486483b5a80e7a82012a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "428e13f0333542d8b84288ba8cbb9048");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "faa60c8fdc9f46518f34d756d932858a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "80ecdd20c8754faf961e532967ff2b84");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "76c6644c2274455d8db9d4032cd48f62");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "c0009655671b4c67aafa641a18ab7512");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "6669dd2cf3114f43989f64e9f27ef1b5");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -528,6 +528,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("StateOther")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("Version")
                         .HasColumnType("int");
 
@@ -4717,7 +4720,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "c0009655671b4c67aafa641a18ab7512",
+                            ConcurrencyStamp = "361fff6305e343cabd1a30996f06b2f6",
                             Cron = "0 0 8 26 *",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4727,7 +4730,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "77f1b41949d5436b8d1935bc21b98a54",
+                            ConcurrencyStamp = "3a923aaaa9ae40909dd4c4c9742b6a6b",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4737,7 +4740,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "6404d1839d68478189fd8a9fbd72067b",
+                            ConcurrencyStamp = "6ec51a85d14d4b8fb1d73448c094bc7e",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4747,7 +4750,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "faa60c8fdc9f46518f34d756d932858a",
+                            ConcurrencyStamp = "a155d7eb0a4241c18959939d43fae77e",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4757,7 +4760,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "6a99699beaa946bc82e545cbabd6594a",
+                            ConcurrencyStamp = "8bb2744237da4124b53d60ae195d0033",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4767,7 +4770,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "af105df5a597486483b5a80e7a82012a",
+                            ConcurrencyStamp = "cd696e4bd17945d6a12a563e6f4df0bd",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4777,7 +4780,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "5973e508dc284fbda7801ac2d6114f50",
+                            ConcurrencyStamp = "ded0555578d84ac3b7fe4398c6fa0fed",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4787,7 +4790,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "6669dd2cf3114f43989f64e9f27ef1b5",
+                            ConcurrencyStamp = "3353367fc55e4997a9f0b1d4619f1ec9",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4797,7 +4800,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "428e13f0333542d8b84288ba8cbb9048",
+                            ConcurrencyStamp = "f975d3b2aed6483ebccc47c2759ac7a1",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4807,7 +4810,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "76c6644c2274455d8db9d4032cd48f62",
+                            ConcurrencyStamp = "601c312fb4704923bae6f5fcb8c43f5a",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4817,7 +4820,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "80ecdd20c8754faf961e532967ff2b84",
+                            ConcurrencyStamp = "f2fa14427a7b40ff9931d64d69e1ff27",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4968,6 +4971,75 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.ToTable("Set_VmiBalance");
                 });
 
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiBalanceSum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ErpToLoc")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("RealPartcode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<decimal>("SumQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Set_VmiBalanceSum");
+                });
+
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiBalanceSumDetail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("ErpToLoc")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<decimal>("InputQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("OutputQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("RealPartcode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<DateTime?>("ReceiveTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("ReturnQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("SettleQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("ShippingQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<DateTime?>("ShippingTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<decimal>("SumQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Vincode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Set_VmiBalanceSumDetail");
+                });
+
             modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiLog", b =>
                 {
                     b.Property<Guid>("Id")
@@ -5082,6 +5154,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<DateTime>("UpdatedTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
                     b.Property<string>("VinCode")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");