|
|
@ -2,13 +2,7 @@ using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Text.Json; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using DocumentFormat.OpenXml.Office2010.Excel; |
|
|
|
using DocumentFormat.OpenXml.Presentation; |
|
|
|
using Microsoft.AspNetCore.Identity; |
|
|
|
using Nito.AsyncEx; |
|
|
|
using Volo.Abp.Identity; |
|
|
|
using Volo.Abp.ObjectMapping; |
|
|
|
using Volo.Abp.Users; |
|
|
|
using Win_in.Sfs.Auth.Application.Contracts; |
|
|
|
using Win_in.Sfs.Wms.DataExchange.Domain; |
|
|
|
using Win_in.Sfs.Wms.DataExchange.Domain.Fawtyg.Tyrp; |
|
|
@ -25,21 +19,18 @@ public class UnplannedIssueNoteConverter : IOutgoingConverter |
|
|
|
private readonly IOutgoingToExternalManager _outgoingToExternalManager; |
|
|
|
private readonly IDepartmentAppService _departmentAppService; |
|
|
|
private readonly IObjectMapper _objectMapper; |
|
|
|
private readonly IIdentityUserAppService identityUserAppService; |
|
|
|
|
|
|
|
public UnplannedIssueNoteConverter( |
|
|
|
IOutgoingFromWmsManager outgoingFromWmsManager |
|
|
|
, IOutgoingToExternalManager outgoingToExternalManager |
|
|
|
, IDepartmentAppService departmentAppService |
|
|
|
, IObjectMapper objectMapper |
|
|
|
, |
|
|
|
IIdentityUserAppService identityUserAppService) |
|
|
|
) |
|
|
|
{ |
|
|
|
_outgoingFromWmsManager = outgoingFromWmsManager; |
|
|
|
_outgoingToExternalManager = outgoingToExternalManager; |
|
|
|
_departmentAppService = departmentAppService; |
|
|
|
_objectMapper = objectMapper; |
|
|
|
this.identityUserAppService = identityUserAppService; |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
@ -58,15 +49,6 @@ IIdentityUserAppService identityUserAppService) |
|
|
|
var exchangeReceipt = _objectMapper.Map<UnplannedIssueNoteDTO, UnplannedIssueNoteExchangeDto>(wmsReceipt); |
|
|
|
var department = await _departmentAppService.GetByUsernameAsync(exchangeReceipt.Worker).ConfigureAwait(false); |
|
|
|
var departmentCode = department == null ? "" : department.Code; |
|
|
|
if (Guid.TryParse(exchangeReceipt.CreatorId.ToString(), out Guid guid)) |
|
|
|
{ |
|
|
|
var user = await identityUserAppService.GetAsync(guid).ConfigureAwait(false); |
|
|
|
if(user != null) |
|
|
|
{ |
|
|
|
exchangeReceipt.Worker = user.UserName; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
var purchaseOrder = BuildDataInterface(exchangeReceipt); |
|
|
|
var outgoingToExternal = new OutgoingToExternal() |
|
|
|
{ |
|
|
@ -124,8 +106,9 @@ IIdentityUserAppService identityUserAppService) |
|
|
|
/// </summary>
|
|
|
|
/// <param name="exchangeOrder"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder) |
|
|
|
{ |
|
|
|
private Wmsoutm BuildDataInterface(UnplannedIssueNoteExchangeDto exchangeOrder) |
|
|
|
{ |
|
|
|
|
|
|
|
var ret = new Wmsoutm() |
|
|
|
{ |
|
|
|
wmsoutm_nbr = exchangeOrder.Number, |
|
|
|