Browse Source

更新版本

Agv分支2024-11-19
赵新宇 4 months ago
parent
commit
6a516c26c6
  1. 11
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs
  2. 24
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs

11
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs

@ -51,9 +51,6 @@ public class AgvJobOutputService : ApplicationService
)
{
_logger = logger;
_unitOfWorkManager = unitOfWorkManager;
_httpClientFactory = httpClientFactory;
@ -129,19 +126,19 @@ public class AgvJobOutputService : ApplicationService
{
var token = _agvOptions.Value.Token;
httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
}
}
if (!string.IsNullOrEmpty(_agvOptions.Value.UserName) && !string.IsNullOrEmpty(_agvOptions.Value.Password))
{
var username = _agvOptions.Value.UserName;
var password = _agvOptions.Value.Password;
httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
var password = _agvOptions.Value.Password;
httpclient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic",
Convert.ToBase64String(Encoding.ASCII.GetBytes($"{username}:{password}")));
}
var client = new AgvJobClient(_agvOptions.Value.Address, httpclient, _agvOptions.Value.Path);
return client;
}
}
/////// <summary>

24
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/CustomerProductionReturnNotes/CustomerProductionReturnNoteAppService.cs

@ -33,7 +33,7 @@ public class CustomerProductionReturnNoteAppService :
private readonly ICustomerItemAppService _customerItemAppService;
private readonly ICustomerAppService _customerAppService;
private readonly ICustomerItemRepository _customerItemRepository;
//private readonly ICustomerItemRepository _customerItemRepository;
private readonly ISalePriceSheetAppService _salePriceSheetAppService;
public CustomerProductionReturnNoteAppService(
@ -41,17 +41,13 @@ public class CustomerProductionReturnNoteAppService :
, ICustomerProductionReturnNoteManager CustomerProductionReturnNoteManager
, ICustomerItemAppService customerItemAppService,
ISalePriceSheetAppService salePriceSheetAppService,
ICustomerAppService customerAppService,
ICustomerItemRepository customerItemRepository
ICustomerAppService customerAppService
// ICustomerItemRepository customerItemRepository
) : base(repository)
{
_customerItemRepository = customerItemRepository;
//_customerItemRepository = customerItemRepository;
_customerItemAppService = customerItemAppService;
_salePriceSheetAppService = salePriceSheetAppService;
_CustomerProductionReturnNoteManager = CustomerProductionReturnNoteManager;
_customerAppService = customerAppService;
}
@ -154,14 +150,14 @@ public class CustomerProductionReturnNoteAppService :
}
foreach (var itm in entity.Details)
{
itm.FromLocationCode = "";
itm.FromLocationCode = string.Empty;
itm.FromStatus = EnumInventoryStatus.OK;
itm.ToStatus=EnumInventoryStatus.OK;
itm.FromLocationArea = "";
itm.FromLocationErpCode= "";
itm.FromWarehouseCode = "";
itm.FromLocationGroup = "";
itm.FromContainerCode = "";
itm.FromLocationArea = string.Empty;
itm.FromLocationErpCode= string.Empty;
itm.FromWarehouseCode = string.Empty;
itm.FromLocationGroup = string.Empty;
itm.FromContainerCode = string.Empty;
itm.ToContainerCode =string.IsNullOrEmpty(itm.ToContainerCode)? "": itm.ToContainerCode;
itm.ToWarehouseCode= string.IsNullOrEmpty(itm.ToWarehouseCode)? "": itm.ToContainerCode;
}

Loading…
Cancel
Save