From 4476db44d7ef6eaaf18b7a557a2ebfde469db9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Fri, 1 Dec 2023 10:46:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0QAD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=8E=A5=E5=8F=A3ERP=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=AF=84=E5=94=AE?= =?UTF-8?q?=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/INVOICE_SERVICE.cs | 6 +++++- .../Entities/BQ/Syncs/PendingDeductionService.cs | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 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 d28f5d23..5f1aea36 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 @@ -131,6 +131,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ .Where(t => t.State == SettleBillState.已扣减) .FirstOrDefault(); + + + + if (invoiceGrp == null) { return; @@ -175,7 +179,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ InvoiceNetAmount = invoiceGrpDetail.Amt, InvoiceTaxAmount = Math.Round(invoiceGrpDetail.Amt * 0.13m, 2), TaxRate = 0.13m, - Location = $"C{invoiceGrp.ClientCode}", + Location = invoiceGrp.GetProperty("ErpToLoc",string.Empty), begintime = invoiceGrpDetail.BeginDate, endtime = invoiceGrpDetail.EndDate, domain = "BJBMPT", diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs index 7fdc2d2a..371667e2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/PendingDeductionService.cs @@ -8,6 +8,7 @@ using SettleAccount.Domain.BQ; using TaskJob.EventArgs; using TaskJob.Interfaces; using Volo.Abp.Application.Services; +using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Emailing; using Volo.Abp.Uow; @@ -224,7 +225,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs //SubBillType = EnumDeliverSubBillType.小件BBAC, //BillType = EnumDeliverBjBmpBillType.JIS件, CustPartCode = itm.LU, - SettlementVinCode = itm.PN, + SettlementVinCode = inv.InvbillNum, DeliverBillType = bussinessType, VinCode = itm.PN, OrderNum = itm.GroupNum, @@ -287,6 +288,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs var pdList = _dbcontext.Set().Where(p => billList.Contains(p.BillNum)).ToList();//扣减单内容 var pdinvList = _dbcontext.Set().Where(p => billList.Contains(p.InvbillNum)).ToList(); var pddetail = _dbcontext.Set().Where(p => billList.Contains(p.BillNum)).ToList(); + + var erploc= ls.FirstOrDefault().ErpToLoc; if (pdList.Count > 0) { if (flag == true) @@ -297,6 +300,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } foreach (var item in pdinvList) { + item.SetProperty("ErpToLoc", erploc); item.State = SettleBillState.已扣减; } _dbcontext.BulkUpdate(pdList); @@ -310,6 +314,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } foreach (var item in pdinvList) { + item.SetProperty("ErpToLoc", erploc); if (item.State == SettleBillState.已提交QAD) { item.State = SettleBillState.红冲发票; @@ -337,6 +342,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } foreach (var item in bbacinvList) { + item.SetProperty("ErpToLoc", erploc); item.State = SettleBillState.已扣减; } _dbcontext.BulkUpdate(bbacList); @@ -350,6 +356,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } foreach (var item in bbacinvList) { + item.SetProperty("ErpToLoc", erploc); + if (item.State == SettleBillState.已提交QAD) { item.State = SettleBillState.红冲发票; @@ -377,6 +385,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } foreach (var item in hbpoinvList) { + item.SetProperty("ErpToLoc", erploc); item.State = SettleBillState.已扣减; } _dbcontext.BulkUpdate(hbpoList); @@ -390,6 +399,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs } foreach (var item in hbpoinvList) { + item.SetProperty("ErpToLoc", erploc); if (item.State == SettleBillState.已提交QAD) { item.State = SettleBillState.红冲发票;