diff --git a/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.metadata.v7.bin b/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.metadata.v7.bin index 70c79a0fa..b7eb44ae2 100644 Binary files a/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.metadata.v7.bin and b/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.metadata.v7.bin differ diff --git a/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.projects.v7.bin b/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.projects.v7.bin index fd95e949f..0c49dcf6f 100644 Binary files a/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.projects.v7.bin and b/WinIn.FasterZ.AgGridReport/.vs/ProjectEvaluation/winin.fasterz.aggridreport.projects.v7.bin differ diff --git a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.futdcache.v2 b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.futdcache.v2 index 3187d3c12..b8e663096 100644 Binary files a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.futdcache.v2 and b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.futdcache.v2 differ diff --git a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.suo b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.suo index e1e1da4ba..056e88632 100644 Binary files a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.suo and b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/.suo differ diff --git a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/fileList.bin b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/fileList.bin index a67b133c5..2f841c338 100644 Binary files a/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/fileList.bin and b/WinIn.FasterZ.AgGridReport/.vs/WinIn.FasterZ.AgGridReport/v17/fileList.bin differ diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReceiptNoteController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReceiptNoteController.cs index 686f72267..0a6747c27 100644 --- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReceiptNoteController.cs +++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/PurchaseReceiptNoteController.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; +using Win_in.Sfs.Basedata.Application.Contracts; using Win_in.Sfs.Wms.Store.Application.Contracts; namespace Win_in.Sfs.Wms.Pda.Controllers.Stores; @@ -16,14 +17,16 @@ namespace Win_in.Sfs.Wms.Pda.Controllers.Stores; public class PurchaseReceiptNoteController : AbpController { private readonly IPurchaseReceiptNoteAppService _purchaseReceiptNoteAppService; + private readonly ISplitPackingRecAppService _splitPackingRecAppService; /// /// /// /// - public PurchaseReceiptNoteController(IPurchaseReceiptNoteAppService purchaseReceiptNoteAppService) + public PurchaseReceiptNoteController(IPurchaseReceiptNoteAppService purchaseReceiptNoteAppService, ISplitPackingRecAppService splitPackingRecAppService) { _purchaseReceiptNoteAppService = purchaseReceiptNoteAppService; + _splitPackingRecAppService = splitPackingRecAppService; } /// @@ -48,6 +51,8 @@ public class PurchaseReceiptNoteController : AbpController string packingCode) { return await _purchaseReceiptNoteAppService.GetDetailByItemAndPackingAsync(itemCode, packingCode).ConfigureAwait(false); + + } /// diff --git a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs index 7e81b3b08..69611ae4d 100644 --- a/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs +++ b/be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs @@ -650,7 +650,6 @@ public class BalanceAppService [HttpGet("usable-list")] public virtual async Task> GetUsableListAsync(RecommendBalanceRequestInput input) { - var inventoryBalances = await _balanceManager .GetUsableListAsync(input.ItemCode, input.Locations, input.Statuses, input.IsPackingCode).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs index 372eafae9..913dc928e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs @@ -26,6 +26,7 @@ public class TransferLibJobAppService private readonly IServiceProvider _serviceProvider; private readonly ILocationAppService _locationAppService; private readonly IExpectOutAppService _expectOutAppService; + private readonly IBalanceAppService _balanceAppService; protected ITransferLibRequestAppService TransferLibRequestAppService => LazyServiceProvider.LazyGetRequiredService(); @@ -33,12 +34,13 @@ public class TransferLibJobAppService public TransferLibJobAppService( ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager, IServiceProvider serviceProvider, ILocationAppService locationAppService, - IExpectOutAppService expectOutAppService) : base(repository, + IExpectOutAppService expectOutAppService, IBalanceAppService balanceAppService) : base(repository, TransferLibJobManager) { _serviceProvider = serviceProvider; _locationAppService = locationAppService; _expectOutAppService = expectOutAppService; + _balanceAppService = balanceAppService; } /// @@ -205,6 +207,8 @@ public class TransferLibJobAppService detail.HandledFromContainerCode = string.Empty; detail.HandledToContainerCode = string.Empty; + var balanceDto=await _balanceAppService.GetByPackingCodeAsync(detail.HandledToPackingCode).ConfigureAwait(false); + var fromLocationDto = await _locationAppService.GetByCodeAsync(detail.HandledFromLocationCode) .ConfigureAwait(false); var toLocationDto = @@ -216,11 +220,21 @@ public class TransferLibJobAppService detail.HandledFromLocationGroup = fromLocationDto.LocationGroupCode; detail.HandledFromWarehouseCode = fromLocationDto.WarehouseCode; + detail.HandledFromArriveDate= balanceDto.ArriveDate; + detail.HandledFromExpireDate= balanceDto.ExpireDate; + detail.HandledFromProduceDate= balanceDto.ProduceDate; + detail.HandledFromSupplierBatch= balanceDto.SupplierBatch; + detail.HandledToLocationArea = toLocationDto.AreaCode; detail.HandledToLocationCode = toLocationDto.Code; detail.HandledToLocationErpCode = toLocationDto.ErpLocationCode; detail.HandledToLocationGroup = toLocationDto.LocationGroupCode; detail.HandledToWarehouseCode = toLocationDto.WarehouseCode; + + detail.HandledToArriveDate = balanceDto.ArriveDate; + detail.HandledToExpireDate = balanceDto.ExpireDate; + detail.HandledToProduceDate = balanceDto.ProduceDate; + detail.HandledToSupplierBatch = balanceDto.SupplierBatch; } var ret = await base.CompleteAsync(id, dto).ConfigureAwait(false); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs index 7c7d13a11..e1bd42b58 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs @@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Volo.Abp.ObjectMapping; using Win_in.Sfs.Basedata.Application.Contracts; +using Win_in.Sfs.Label.Application.Contracts; using Win_in.Sfs.Shared.Domain.Shared; using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Domain; @@ -169,13 +170,26 @@ public class PurchaseReceiptNoteAppService : public virtual async Task GetDetailByItemAndPackingAsync(string itemCode, string packingCode) { - var entity = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == packingCode), true).ConfigureAwait(false)).FirstOrDefault(); + var list=await _splitPackingRecAppService.GetListByToPackingCode(new List(){ packingCode }).ConfigureAwait(false); + var splitPackingRecDto=list.FirstOrDefault(); - var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == packingCode); + var entity = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == splitPackingRecDto.ToTopPackingCode), true).ConfigureAwait(false)).FirstOrDefault(); - var dto = ObjectMapper.Map(detail); + if (entity != null) + { + var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == splitPackingRecDto.ToTopPackingCode); - return dto; + var dto = ObjectMapper.Map(detail); + + dto.Qty = splitPackingRecDto.ToQty; + dto.PackingCode = packingCode; + + return dto; + } + else + { + return null; + } } ///