修改bug

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;
 
     /// <summary>
     ///
     /// </summary>
     /// <param name="purchaseReceiptNoteAppService"></param>
-    public PurchaseReceiptNoteController(IPurchaseReceiptNoteAppService purchaseReceiptNoteAppService)
+    public PurchaseReceiptNoteController(IPurchaseReceiptNoteAppService purchaseReceiptNoteAppService, ISplitPackingRecAppService splitPackingRecAppService)
     {
         _purchaseReceiptNoteAppService = purchaseReceiptNoteAppService;
+        _splitPackingRecAppService = splitPackingRecAppService;
     }
 
     /// <summary>
@@ -48,6 +51,8 @@ public class PurchaseReceiptNoteController : AbpController
         string packingCode)
     {
         return await _purchaseReceiptNoteAppService.GetDetailByItemAndPackingAsync(itemCode, packingCode).ConfigureAwait(false);
+
+        
     }
 
     /// <summary>

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<List<BalanceDTO>> GetUsableListAsync(RecommendBalanceRequestInput input)
     {
-        
         var inventoryBalances = await _balanceManager
             .GetUsableListAsync(input.ItemCode, input.Locations, input.Statuses, input.IsPackingCode).ConfigureAwait(false);
 

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<ITransferLibRequestAppService>();
@@ -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;
     }
 
     /// <summary>
@@ -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);

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,14 +170,27 @@ public class PurchaseReceiptNoteAppService :
     public virtual async Task<PurchaseReceiptNoteDetailDTO> 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<string>(){ 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();
+
+        if (entity != null)
+        {
+            var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == splitPackingRecDto.ToTopPackingCode);
 
             var dto = ObjectMapper.Map<PurchaseReceiptNoteDetail, PurchaseReceiptNoteDetailDTO>(detail);
 
+            dto.Qty = splitPackingRecDto.ToQty;
+            dto.PackingCode = packingCode;
+
             return dto;
         }
+        else
+        {
+            return null;
+        }
+    }
 
     /// <summary>
     ///     创建收货记录