BoXu.Zheng
/
BeiJinSettleAccount
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新版本

master
赵新宇 2 years ago
parent
b2e09c3eea
commit
35c2285a89
2 changed files with 34 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
  2. 51
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs

3
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs
View File

@ -74,8 +74,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost]
[UnitOfWork(false)] [UnitOfWork(false)]
[HttpPost]
//[Route("generateinvoice")] //[Route("generateinvoice")]
public async override Task<IActionResult> GenerateInvoice([FromBody] string invbillnum) public async override Task<IActionResult> GenerateInvoice([FromBody] string invbillnum)
{ {

51
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/INV_MNG.cs
View File

@ -26,6 +26,7 @@ using Volo.Abp.Json;
using Volo.Abp.Uow; using Volo.Abp.Uow;
using Win.Sfs.SettleAccount.Bases; using Win.Sfs.SettleAccount.Bases;
using Win.Sfs.SettleAccount.Entities.BQ.Temp; using Win.Sfs.SettleAccount.Entities.BQ.Temp;
using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
using Win.Sfs.SettleAccount.Entities.CodeSettings; using Win.Sfs.SettleAccount.Entities.CodeSettings;
using Win.Sfs.SettleAccount.Entities.Prices; using Win.Sfs.SettleAccount.Entities.Prices;
using Win.Sfs.Shared.RepositoryBase; using Win.Sfs.Shared.RepositoryBase;
@ -1345,7 +1346,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
adjdetails.Add(detail); adjdetails.Add(detail);
} }
} }
var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID,p.LU }) var detailDtos = dtos.Where(p => ls.Contains(p.GroupNum)).GroupBy(p => new { p.InvGroupNum, p.PartCode, p.Price, p.BeginDate, p.EndDate, p.ContractDocID, p.LU })
.Select(itm => new .Select(itm => new
{ {
PartCode = itm.Key.PartCode, PartCode = itm.Key.PartCode,
@ -1474,25 +1475,37 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
invbill.CreationTime = DateTime.Now; invbill.CreationTime = DateTime.Now;
invlist.Add(invbill); invlist.Add(invbill);
} }
//using (var transaction = _repository.DbContext.Database.BeginTransaction())
//{
// try
// {
// 执行批量数据操作
if (salist.Count > 0)
{
await _repository.DbContext.BulkUpdateAsync(salist);
}
await _repository.DbContext.BulkInsertAsync(invlist);
await _repository.DbContext.BulkInsertAsync(groupList);
await _repository.DbContext.BulkInsertAsync(detailList);
if (salist.Count > 0) if (adjlist.Count > 0)
{ {
await _repository.DbContext.BulkUpdateAsync(adjlist);
await _repository.DbContext.BulkUpdateAsync(salist); }
} if (notDetialList.Count > 0)
{
await _repository.DbContext.BulkInsertAsync(invlist); await _repository.DbContext.BulkInsertAsync(notDetialList);
await _repository.DbContext.BulkInsertAsync(groupList); }
await _repository.DbContext.BulkInsertAsync(detailList); // 提交事务
// transaction.Commit();
if (adjlist.Count > 0) // }
{ // catch (Exception)
await _repository.DbContext.BulkUpdateAsync(adjlist); // {
} // // 回滚事务
if (notDetialList.Count > 0) // transaction.Rollback();
{ // throw;
await _repository.DbContext.BulkInsertAsync(notDetialList); // }
} //}
_invls = invlist.Select(p => p.InvbillNum).ToList(); _invls = invlist.Select(p => p.InvbillNum).ToList();
} }

Write Preview
Loading…
Cancel
Save