Browse Source

修改 给try添加回滚

dev_DY_CC
郑勃旭 8 months ago
parent
commit
0245637cea
  1. 9
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs
  2. 8
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

9
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/GaoTongs/GaoTongAppService.cs

@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Uow;
using Volo.Abp.Users; using Volo.Abp.Users;
using Win_in.Sfs.Basedata.Application.Contracts; using Win_in.Sfs.Basedata.Application.Contracts;
using Win_in.Sfs.Basedata.Domain; using Win_in.Sfs.Basedata.Domain;
@ -32,6 +33,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
private readonly IItemBasicAppService _itemBasicAppService; private readonly IItemBasicAppService _itemBasicAppService;
private readonly ILocationAppService _locationAppService; private readonly ILocationAppService _locationAppService;
private readonly IPositionCodeAppService _positionCodeAppService; private readonly IPositionCodeAppService _positionCodeAppService;
private readonly UnitOfWorkManager _unitOfWorkManager;
public GaoTongAppService( public GaoTongAppService(
IBalanceAppService balanceAppService IBalanceAppService balanceAppService
@ -39,7 +41,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
, CurrentUser currentUser , CurrentUser currentUser
, IItemBasicAppService itemBasicAppService , IItemBasicAppService itemBasicAppService
, ILocationAppService locationAppService , ILocationAppService locationAppService
, IPositionCodeAppService positionCodeAppService) , IPositionCodeAppService positionCodeAppService, UnitOfWorkManager unitOfWorkManager)
{ {
_balanceAppService = balanceAppService; _balanceAppService = balanceAppService;
_transferNoteAppService = transferNoteAppService; _transferNoteAppService = transferNoteAppService;
@ -47,6 +49,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
_itemBasicAppService = itemBasicAppService; _itemBasicAppService = itemBasicAppService;
_locationAppService = locationAppService; _locationAppService = locationAppService;
_positionCodeAppService = positionCodeAppService; _positionCodeAppService = positionCodeAppService;
_unitOfWorkManager = unitOfWorkManager;
} }
/// <summary> /// <summary>
/// 组盘信息反馈到东阳WMS /// 组盘信息反馈到东阳WMS
@ -57,6 +60,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
public async Task<GaoTongResultDTO> FeedbackZuPanAsync(ZuPanEditInput input) public async Task<GaoTongResultDTO> FeedbackZuPanAsync(ZuPanEditInput input)
{ {
GaoTongResultDTO ret = new GaoTongResultDTO(); GaoTongResultDTO ret = new GaoTongResultDTO();
using var unitOfWork = _unitOfWorkManager.Begin();
try try
{ {
ItemBasicDTO itemBasicObj = await _itemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); ItemBasicDTO itemBasicObj = await _itemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false);
@ -139,6 +143,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
ret.Code = GaoTongResultStatus.Failure; ret.Code = GaoTongResultStatus.Failure;
ret.Message = "FeedbackZuPanAsync执行失败:" + ex.Message; ret.Message = "FeedbackZuPanAsync执行失败:" + ex.Message;
ret.OperateTime = CommonHelper.CurTimeStr; ret.OperateTime = CommonHelper.CurTimeStr;
await unitOfWork.RollbackAsync().ConfigureAwait(false);
return ret; return ret;
} }
} }
@ -173,6 +178,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
public async Task<GaoTongResultDTO> ManualSelection(ZuPanEditInput input) public async Task<GaoTongResultDTO> ManualSelection(ZuPanEditInput input)
{ {
GaoTongResultDTO ret = new GaoTongResultDTO(); GaoTongResultDTO ret = new GaoTongResultDTO();
using var unitOfWork = _unitOfWorkManager.Begin();
try try
{ {
ItemBasicDTO itemBasicObj = await _itemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false); ItemBasicDTO itemBasicObj = await _itemBasicAppService.GetByCodeAsync(input.ItemCode).ConfigureAwait(false);
@ -268,6 +274,7 @@ public class GaoTongAppService : ApplicationService, IGaoTongAppService
ret.Code = GaoTongResultStatus.Failure; ret.Code = GaoTongResultStatus.Failure;
ret.Message = "ManualSelection执行失败:" + ex.Message; ret.Message = "ManualSelection执行失败:" + ex.Message;
ret.OperateTime = CommonHelper.CurTimeStr; ret.OperateTime = CommonHelper.CurTimeStr;
await unitOfWork.RollbackAsync();
return ret; return ret;
} }
} }

8
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@ -51,6 +51,7 @@ public class AssembleIssueJobAppService
private readonly IOptions<RestoOptions> _options; private readonly IOptions<RestoOptions> _options;
private readonly ILogger<AssembleIssueJobAppService> _logger; private readonly ILogger<AssembleIssueJobAppService> _logger;
private readonly ICurrentUser _currentUser; private readonly ICurrentUser _currentUser;
private readonly UnitOfWorkManager _unitOfWorkManager;
public AssembleIssueJobAppService( public AssembleIssueJobAppService(
ILogger<AssembleIssueJobAppService> logger, ILogger<AssembleIssueJobAppService> logger,
@ -58,7 +59,7 @@ public class AssembleIssueJobAppService
ILocationAppService locationAppService, ILocationAppService locationAppService,
IAssembleIssueNoteAppService assembleIssueNoteAppService, IExpectOutAppService expectOutAppService IAssembleIssueNoteAppService assembleIssueNoteAppService, IExpectOutAppService expectOutAppService
, IHttpClientFactory httpClientFactory , IHttpClientFactory httpClientFactory
, IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser) : base( , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser, UnitOfWorkManager unitOfWorkManager) : base(
repository, assembleIssueJobManager) repository, assembleIssueJobManager)
{ {
_assembleIssueJobManager = assembleIssueJobManager; _assembleIssueJobManager = assembleIssueJobManager;
@ -69,6 +70,7 @@ public class AssembleIssueJobAppService
_options = options; _options = options;
_transferLibRequestAppService = transferLibRequestAppService; _transferLibRequestAppService = transferLibRequestAppService;
_currentUser = currentUser; _currentUser = currentUser;
_unitOfWorkManager = unitOfWorkManager;
_logger = logger; _logger = logger;
} }
@ -463,6 +465,7 @@ public class AssembleIssueJobAppService
ret.Code = 0; ret.Code = 0;
ret.Message = "操作成功"; ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
using var unitOfWork = _unitOfWorkManager.Begin();
try try
{ {
var IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>(); var IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>();
@ -534,6 +537,7 @@ public class AssembleIssueJobAppService
ret.Code = 1; ret.Code = 1;
ret.Message = ex.Message; ret.Message = ex.Message;
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
await unitOfWork.RollbackAsync().ConfigureAwait(false);
} }
return ret; return ret;
@ -549,6 +553,7 @@ public class AssembleIssueJobAppService
#endif #endif
var errors = new List<string>(); var errors = new List<string>();
var ret = new ReusltObject { Code = int.Parse(GaoTongResultStatus.Success), OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" }; var ret = new ReusltObject { Code = int.Parse(GaoTongResultStatus.Success), OperateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Message = "操作成功" };
using var unitOfWork = _unitOfWorkManager.Begin();
try try
{ {
@ -669,6 +674,7 @@ public class AssembleIssueJobAppService
Code = int.Parse(GaoTongResultStatus.Failure), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message Code = int.Parse(GaoTongResultStatus.Failure), OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), Message = ex.Message
, Data = json , Data = json
}; };
await unitOfWork.RollbackAsync();
return ret; return ret;
} }

Loading…
Cancel
Save