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 aa50b1ec..1da8ccda 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 @@ -900,7 +900,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ begintime = DateTime.Now, endtime = DateTime.Now, domain = "BJBMPT", - LINE = (i + 1).ToString() + LINE = (i + 1).ToString(), + Remark= string.IsNullOrEmpty(invoice.FileName) ? string.Empty : invoice.FileName + }); } var invbefore = invoice.RealAmt + invoice.TaxDiff;// @@ -930,10 +932,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var ls = invDetails.Where(p => p.InvbillNum == itm).ToList(); var invoice = await _settleAccountDbContext.Set().FirstOrDefaultAsync(p => p.InvbillNum == itm).ConfigureAwait(false); var adj = await _settleAccountDbContext.Set().Where(p => p.InvBillNum == itm).AsNoTracking().ToListAsync().ConfigureAwait(false); //调整数量 - if (ls.Any() && invoice != null) { - if (adj.Any())//假如存在调整单 { var adjlist = await ChangedPrice(invoice.BusinessType, invoice.Site, adj).ConfigureAwait(false); @@ -990,7 +990,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ begintime = DateTime.Now, endtime = DateTime.Now, domain = "BJBMPT", - LINE = (i + 1).ToString() + LINE = (i + 1).ToString(), + Remark = string.IsNullOrEmpty(invoice.FileName) ? string.Empty : invoice.FileName }); } var invbefore = invoice.RealAmt + invoice.TaxDiff;// @@ -1085,7 +1086,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ begintime = DateTime.Now, endtime = DateTime.Now, domain = "BJBMPT", - LINE = (i + 1).ToString() + LINE = (i + 1).ToString(), + Remark = string.IsNullOrEmpty(invoice.FileName) ? string.Empty : invoice.FileName }); } var invbefore = invoice.RealAmt + invoice.TaxDiff;// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs index b21a3cd5..59197756 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs @@ -105,7 +105,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers public async Task UpdateInvoiceAsync(string p_invbillnum, string remark) { try - { var ls = _repository.Where(p => p.InvbillNum == p_invbillnum).ToList(); @@ -159,7 +158,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { if (inv.State == SettleBillState.商务已审核) { - inv.State = state; } else @@ -194,7 +192,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers case SettleBillState.已扣减: foreach (var inv in appls) { - if (inv.State == SettleBillState.客户已收票) {