From 7f3c8af712e25318038011a8a8f8050687082e33 Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Mon, 1 Jul 2024 11:45:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs | 4 --- .../Entities/BQ/INVOICE_SERVICE.cs | 29 +------------------ .../Entities/BQ/VmiAppService.cs | 7 +++-- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs index 077d6028..1884fa39 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs @@ -203,10 +203,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ List notList = new List(); var entites = _detailRepository.Where(p => p.BillNum == selttleBilNum).ToList(); var main = _repository.FirstOrDefault(p => p.BillNum == selttleBilNum); - - - - if (main.State != SettleBillState.未结状态) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 02502291..eb0e2afc 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -898,8 +898,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ private async Task CreateBBACTaskAsync(List invoiceGrps) { - - var invDetails = await _settleAccountDbContext.Set().Where(p => invoiceGrps.Contains(p.InvbillNum)).AsNoTracking().ToListAsync().ConfigureAwait(false); foreach (var itm in invoiceGrps) { @@ -1005,10 +1003,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ private async Task CreateHBPOTaskAsync(List invoiceGrps) { - - - var invDetails=await _settleAccountDbContext.Set().Where(p =>invoiceGrps.Contains(p.InvbillNum)).AsNoTracking().ToListAsync().ConfigureAwait(false); - + var invDetails=await _settleAccountDbContext.Set().Where(p =>invoiceGrps.Contains(p.InvbillNum)).AsNoTracking().ToListAsync().ConfigureAwait(false); foreach (var itm in invoiceGrps) { var ls = invDetails.Where(p => p.InvbillNum == itm).ToList(); @@ -1091,9 +1086,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ } } } - - - private async Task CreatePubHongChongTaskAsync(List invoiceGrps) { // 对发票组进行处理 @@ -2073,25 +2065,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ return new JsonResult(new { Code = 200, Message = "退回成功" }); ; } - - - - - - - - - - - - - - - - - - - /// /// 同步QAD /// 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 7e148ddb..955affeb 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 @@ -1383,11 +1383,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var locs = locList.Select(p => p.Description).ToList(); if (p_list.Any(p => !locs.Contains(p.ToErpLocCode))) { - - return "发运数据有不在" + string.Join(",", locs) + "库位中"; } - return "ok"; } @@ -1792,6 +1789,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ using var context = new SettleAccountDbContext(options); var st = new Stopwatch(); st.Start(); + + + + try { //导入日志和消息