Browse Source

[CI SKIP]

master
学 赵 1 year ago
parent
commit
1d9a47c321
  1. 11
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

11
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs

@ -63,7 +63,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
INormalEfCoreRepository<BBAC_NOT_SA_DETAIL, Guid> notRepository, INormalEfCoreRepository<BBAC_NOT_SA_DETAIL, Guid> notRepository,
INormalEfCoreRepository<PriceList, Guid> priceRepository, INormalEfCoreRepository<PriceList, Guid> priceRepository,
BBAC_CAN_SA_MNG bbacMng, BBAC_CAN_SA_MNG bbacMng,
BaseDomainService baseservice, BaseDomainService baseservice,
TaskJobService service TaskJobService service
) )
: base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository, invmng, baseservice) : base(excelImportService, snowflakeIdGenerator, commonManager, repository, detailRepository, invmng, baseservice)
@ -92,6 +92,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
return new JsonResult(new { Code = 400, Message = "已创建发票不能重复创建" }); return new JsonResult(new { Code = 400, Message = "已创建发票不能重复创建" });
} }
//var talbe1 = _priceRepository.Select(p => new { BeginTime = p.BeginTime, EndTime = p.EndTime, LU = p.LU }).ToList();
var entitys = await _bbacMng.GetDetalListAsync(invbillNum).ConfigureAwait(false);//可结算 var entitys = await _bbacMng.GetDetalListAsync(invbillNum).ConfigureAwait(false);//可结算
var priceList = _priceRepository.Where(p => p.IsCancel == false).ToList(); var priceList = _priceRepository.Where(p => p.IsCancel == false).ToList();
//价格单 //价格单
@ -107,10 +111,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
await _bbacMng.SetWaitingState(invbillNum); await _bbacMng.SetWaitingState(invbillNum);
var _taskid = await _service.ExportEnqueueAsync("生成发票任务", ExportExtentsion.Excel, string.Empty, string.Empty, CurrentUser, typeof(GenerateJisInvoiceService), customConditionList, (rs) => var _taskid = await _service.ExportEnqueueAsync("生成发票任务", ExportExtentsion.Excel, string.Empty, string.Empty, CurrentUser, typeof(GenerateJisInvoiceService), customConditionList, (rs) =>
{ {
}).ConfigureAwait(false); }).ConfigureAwait(false);
return new JsonResult(new { Code = 200, Message = "生成发票任务" }); return new JsonResult(new { Code = 200, Message = "生成发票任务" });
//if (await _bbacMng.SetForwardState(main, SettleBillState.已开票).ConfigureAwait(false)) //if (await _bbacMng.SetForwardState(main, SettleBillState.已开票).ConfigureAwait(false))
//{ //{
// var groupNumList = entitys.Select(p => p.GroupNum).Distinct().ToList(); // var groupNumList = entitys.Select(p => p.GroupNum).Distinct().ToList();

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@ -171,7 +171,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" }); return new JsonResult(new { Code = 400, Message = "不存在可结算单记录" });
} }
return new JsonResult(new { Code = 200, Message = "生成成功" });
} }
} }
} }

Loading…
Cancel
Save