From 14b42e5d23fad6340a15d1f8727e2e81338aa625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 26 Oct 2023 15:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=8F=B7=E6=97=B6SA=E5=92=8C=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=B7=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/INVOICE_SERVICE.cs | 8 ++++---- .../Entities/BQ/PUB_BA_SERVICE.cs | 10 ---------- 2 files changed, 4 insertions(+), 14 deletions(-) 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 1525a587..c87c5297 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 @@ -957,10 +957,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ inv.TaxDiff = newinv.PreTaxDiff; // inv.ClientCode = newinv.ClientCode; } - foreach (var detail in invdetail) - { - detail.Extend1 = Math.Round(detail.Amt * first.Tax, 2).ToString(); - } + //foreach (var detail in invdetail)//明细EXTEND1字段BBAC不能占用 + //{ + // detail.Extend1 = Math.Round(detail.Amt * first.Tax, 2).ToString(); + //} await _repository.DbContext.BulkUpdateAsync(invlist).ConfigureAwait(false); await _repository.DbContext.BulkUpdateAsync(invdetail).ConfigureAwait(false); return ApplicationConsts.SuccessStr; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs index f4a92a73..95d7d1c4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_BA_SERVICE.cs @@ -107,15 +107,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ //if (adjlist != null && adjlist.Count > 0) //{ // var relationList = _relationRepository.Where(p => p.BusinessType == inv.BusinessType).ToList(); - // var relist = relationList.GroupBy(p => new { p.SettleMaterialCode, p.ErpMaterialCode }).Select(p => p.FirstOrDefault()); - // var errors = await CheckAdJRules(adjlist, relist.ToList(), inv.BusinessType); // if (errors.Count > 0) // { // return new JsonResult(new { Code = ApplicationConsts.ImportFailCode, Message = "错误提示文件已下载,请打开文件查看", fileName = await ExportErrorReportAsync(errors).ConfigureAwait(false) }); // } - // foreach (var itm in adjlist) // { // publist.Add(new PUB_CAN_SA_DETAIL( @@ -159,16 +156,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { priceList.Add(new PriceList() { LU = itm.LU, BeginTime = itm.BeginDate, EndTime = itm.EndDate, Price = itm.Price, ClientCode = "1041", ContractNo = itm.ContractNo }); } - break; default: priceList = _priceRepository.Where(p => p.IsCancel == false && p.ClientCode == inv.Site).ToList();//价格单 break; } - - - - //if (inv.BusinessType == EnumBusinessType.BeiJian) //{ // var priceListbj = _pricebjRepository.ToList();//价格单 @@ -185,7 +177,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ // priceList.Add(new PriceList() { LU = itm.LU, BeginTime = itm.BeginDate, EndTime = itm.EndDate, Price = itm.Price, ClientCode = "1041", ContractNo = itm.ContractNo }); // } //} - //else //{ // priceList = _priceRepository.Where(p => p.IsCancel == false && p.ClientCode == inv.Site).ToList();//价格单 @@ -219,7 +210,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ EndDate = p.EndTime, PartCode = d.PartCode,//客户零件号 LineCode = d.IndexNum - }; var dtos = q.ToList(); if (dtos != null && dtos.Count > 0)