Browse Source

同上

dev_DY_CC
刘云峰 10 months ago
parent
commit
e51521964b
  1. 10
      be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnNoteController.cs
  2. 13
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReturnNotes/PurchaseReturnNoteAppService.cs

10
be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReturnNoteController.cs

@ -31,7 +31,6 @@ public class PurchaseReturnNoteController : AbpController
private readonly IBalanceAppService _balanceAppService;
private readonly IPurchaseOrderAppService _purchaseOrderAppService;
private readonly ICurrentUser _currentUser;
/// <summary>
///
/// </summary>
@ -41,14 +40,13 @@ public class PurchaseReturnNoteController : AbpController
public PurchaseReturnNoteController(IPurchaseReturnNoteAppService noteAppService,
IInventoryLabelAppService labelAppService,
IBalanceAppService balanceAppService,
IPurchaseOrderAppService purchaseOrderAppService,
ICurrentUser currentUser)
IPurchaseOrderAppService purchaseOrderAppService
)
{
_noteAppService = noteAppService;
this._labelAppService = labelAppService;
this._balanceAppService = balanceAppService;
_purchaseOrderAppService = purchaseOrderAppService;
_currentUser = currentUser;
}
/// <summary>
@ -75,10 +73,6 @@ public class PurchaseReturnNoteController : AbpController
var noteCreateInputs = await BuildNoteCreateInputsAsync(input, EnumPurchaseReturnType.BeforePuton).ConfigureAwait(false);
foreach (var noteCreateInput in noteCreateInputs)
{
if (noteCreateInput.Worker.IsNullOrEmpty())
{
noteCreateInput.Worker = _currentUser.UserName;
}
await _noteAppService.CreateAsync(noteCreateInput).ConfigureAwait(false);
}

13
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReturnNotes/PurchaseReturnNoteAppService.cs

@ -15,7 +15,7 @@ using System.Linq.Expressions;
using System.Threading;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Users;
using Win_in.Sfs.FileStorage.Application.Contracts;
using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain;
@ -31,12 +31,17 @@ public class PurchaseReturnNoteAppService : SfsStoreWithDetailsAppServiceBase<Pu
{
private readonly IPurchaseReturnNoteManager _purchaseReturnNoteManager;
private readonly ICurrentUser _currentUser;
public PurchaseReturnNoteAppService(
IPurchaseReturnNoteRepository repository,
IPurchaseReturnNoteManager purchaseReturnNoteManager)
IPurchaseReturnNoteManager purchaseReturnNoteManager,
ICurrentUser currentUser
)
: base(repository)
{
_purchaseReturnNoteManager = purchaseReturnNoteManager;
_currentUser = currentUser;
}
[HttpPost("confirm")]
@ -66,6 +71,10 @@ public class PurchaseReturnNoteAppService : SfsStoreWithDetailsAppServiceBase<Pu
public override async Task<PurchaseReturnNoteDTO> CreateAsync(PurchaseReturnNoteEditInput input)
{
var entity = ObjectMapper.Map<PurchaseReturnNoteEditInput, PurchaseReturnNote>(input);
if (entity.Worker.IsNullOrEmpty() && _currentUser != null)
{
entity.Worker = _currentUser.UserName;
}
await _purchaseReturnNoteManager.CreateAsync(entity).ConfigureAwait(false);
var dto = ObjectMapper.Map<PurchaseReturnNote, PurchaseReturnNoteDTO>(entity);

Loading…
Cancel
Save