Browse Source

更新版本

master
zhaoxinyu 4 months ago
parent
commit
fc282e8224
  1. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs
  2. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

12
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<INVOICE_GRP>().FirstOrDefaultAsync(p => p.InvbillNum == itm).ConfigureAwait(false);
var adj = await _settleAccountDbContext.Set<PUB_ADJ_DETAIL>().Where(p => p.InvBillNum == itm).AsNoTracking().ToListAsync().ConfigureAwait(false); //调整数量
if (ls.Any() && invoice != null)
{
if (adj.Any())//假如存在调整单
{
var adjlist = await ChangedPrice<HBPO_CAN_SA_DETAIL>(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;//

3
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<bool> 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.)
{

Loading…
Cancel
Save