diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-month.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-month.js index 29c93fcc..6502d33c 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-month.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-month.js @@ -413,6 +413,13 @@ export default function () { value: null, readOnly: true, }, + { + logic: "and", + column: "year", + action: "like", + value: null, + readOnly: true, + }, ], }, 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 22979fe9..a4d344f7 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 @@ -35,6 +35,7 @@ using RestSharp.Extensions; using SettleAccount.Domain.BQ; using SettleAccount.Job.SignalR; using Shouldly; +using Shouldly.Configuration; using SqlSugar; using TaskJob.EventArgs; using Volo.Abp; @@ -811,6 +812,48 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } var logList = tupleList.Select(o => o.Item1).ToList(); logList.AsParallel().ForEach(Update); + List seDetails = new List(); + foreach (var item in logList) + { + if(item.DeliverBillType== EnumDeliverBjBmpBillType.JIS件&&item.DeliverSubBillType== EnumDeliverSubBillType.保险杠BBAC) + { + BBAC_SE_DETAIL seDetail = new BBAC_SE_DETAIL(); + seDetail.SetId(item.Id); + seDetail.BeginDate = DateTime.Now; + seDetail.CreationTime = DateTime.Now; + seDetail.IsDeleted = false; + seDetail.Version = int.Parse(item.BillTime?.ToString("yyyyMM")); + seDetail.ShippingDate = (DateTime)item.BillTime; + seDetail.Qty = item.Qty; + seDetail.IsHaveEdiData = false; + seDetail.BusinessType = EnumBusinessType.JisBBAC; + seDetail.AssembleData = (DateTime)item.AssembleData; + seDetail.BillType = 0; + seDetail.DeliverBillType = (EnumDeliverBjBmpBillType)item.DeliverBillType; + seDetail.DeliverSubBillType = (EnumDeliverSubBillType)item.DeliverSubBillType; + seDetail.ProType = 0; + seDetail.State = 0; + seDetail.SubBillType = 0; + seDetail.TransType = EnumDelTransType.发货; + seDetail.UID = 000; + seDetail.FactoryPartCode = item.RealPartCode; + seDetail.CustomerPartCodeNoSpace = item.RealPartCode.Replace("-", ""); + seDetail.ErpToLoc= item.ErpToLoc; + seDetail.Qty=item.Qty; + seDetail.VinCode= item.VinCode; + seDetail.PN = item.VinCode; + seDetail.LU = item.CustPartCode; + seDetail.CustPartCode = item.CustPartCode; + seDetail.BillTime= item.BillTime; + + seDetail.Remark = "期初初始化"; + + seDetails.Add(seDetail); + } + + + } + //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; @@ -832,6 +875,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ await context.BulkInsertAsync(logList).ConfigureAwait(false); //await context.BulkInsertAsync(messageList).ConfigureAwait(false); + await context.BulkInsertAsync(seDetails).ConfigureAwait(false); transaction.Commit(); } catch (Exception ex)