修改bug

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

@@ -29,7 +29,7 @@ public class PurchaseReturnNoteController : AbpController
     private readonly IInventoryLabelAppService _labelAppService;
 
     private readonly IBalanceAppService _balanceAppService;
-
+    private readonly IPurchaseOrderAppService _purchaseOrderAppService;
     /// <summary>
     ///
     /// </summary>
@@ -38,12 +38,14 @@ public class PurchaseReturnNoteController : AbpController
     /// <param name="balanceAppService"></param>
     public PurchaseReturnNoteController(IPurchaseReturnNoteAppService noteAppService,
                                     IInventoryLabelAppService labelAppService,
-                                    IBalanceAppService balanceAppService
+                                    IBalanceAppService balanceAppService,
+                                     IPurchaseOrderAppService purchaseOrderAppService
     )
     {
         _noteAppService = noteAppService;
         this._labelAppService = labelAppService;
         this._balanceAppService = balanceAppService;
+        _purchaseOrderAppService = purchaseOrderAppService;
     }
 
     /// <summary>
@@ -133,7 +135,7 @@ public class PurchaseReturnNoteController : AbpController
                 //createInputDetail.WarehouseCode= poNumberItem.
 
                 await SetDetailByBalanceAsync(packingCode, createInputDetail).ConfigureAwait(false);
-
+                await SetDetailByPoAsync(poNumberDetail.PoNumber, createInputDetail).ConfigureAwait(false);
                 returnNoteEditInput.Details.Add(createInputDetail);
             }
 
@@ -142,11 +144,17 @@ public class PurchaseReturnNoteController : AbpController
 
         return createInputs;
     }
-
+    private async Task SetDetailByPoAsync(string poNumber, PurchaseReturnNoteDetailInput createInputDetail)
+    {
+        var po = await _purchaseOrderAppService.GetListByNumberAndItemCodeAsync(poNumber, createInputDetail.ItemCode).ConfigureAwait(false);
+        Check.NotNull(po, nameof(PurchaseOrderDTO));
+        var detail =  po.Details.FirstOrDefault(r => r.ItemCode == createInputDetail.ItemCode);
+        Check.NotNull(detail, nameof(PurchaseOrderDetailDTO));
+        createInputDetail.PoLine = detail.PoLine;
+    }
     private async Task SetDetailByBalanceAsync(string packingCode, PurchaseReturnNoteDetailInput createInputDetail)
     {
         var balance = await _balanceAppService.GetByPackingCodeAsync(packingCode).ConfigureAwait(false);
-
         Check.NotNull(balance, nameof(BalanceDTO));
 
         createInputDetail.LocationCode = balance.LocationCode;

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/ISplitPackingRecAppService.cs

@@ -28,4 +28,5 @@ public interface ISplitPackingRecAppService
     Task<List<SplitPackingRecDTO>> GetListByFromPackingCode(List<string> fromPackingCodeList);
     Task<SplitPackingRecDTO> GetTopPackingCode(string toPackingCode);
     Task<SplitPackingRecDTO> GetSplitPackingCode(string toPackingCode);
+    Task<List<SplitPackingRecDTO>> GetFirstOrDefaultPackingCode(List<string> toPackingCodeList);
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/SplitPackings/SplitPackingRecAppService.cs

@@ -76,7 +76,18 @@ public class SplitPackingRecAppService :
         List<SplitPackingRecDTO> ret = ObjectMapper.Map<List<SplitPackingRec>, List<SplitPackingRecDTO>>(lst);
         return ret;
     }
-
+    /// <summary>
+    /// 取每个目标箱码的最后一条拆箱记录
+    /// </summary>
+    /// <param name="toPackingCodeList">目标箱码列表</param>
+    /// <returns></returns>
+    [HttpGet("get-first-or-default-packing-code")]
+    public async Task<List<SplitPackingRecDTO>> GetFirstOrDefaultPackingCode(List<string> toPackingCodeList)
+    {
+        var lst = await _splitPackingRecManager.GetFirstOrDefaultPackingCode(toPackingCodeList).ConfigureAwait(false);
+        List<SplitPackingRecDTO> ret = ObjectMapper.Map<List<SplitPackingRec>, List<SplitPackingRecDTO>>(lst);
+        return ret;
+    }
     /// <summary>
     /// 取每个源标箱码的“操作状态=其它”的拆箱记录
     /// </summary>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/ISplitPackingRecManager.cs

@@ -25,4 +25,5 @@ public interface ISplitPackingRecManager : IDomainService
     Task<List<SplitPackingRec>> GetListByFromPackingCode(List<string> fromPackingCodeList);
     Task<SplitPackingRec> GetTopPackingCode(string packingCode);
     Task<SplitPackingRec> GetSplitPackingCode(string packingCode);
+    Task<List<SplitPackingRec>> GetFirstOrDefaultPackingCode(List<string> toPackingCodeList);
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRecManager.cs

@@ -122,7 +122,28 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
         }
         return ret;
     }
+    /// <summary>
+    /// 获取所有最后一条操作想骂记录
+    /// </summary>
+    /// <param name="toPackingCodeList">目标箱码列表</param>
+    /// <returns></returns>
+    public async Task<List<SplitPackingRec>> GetFirstOrDefaultPackingCode(List<string> toPackingCodeList)
+    {
+        List<SplitPackingRec> ret = new List<SplitPackingRec>();
+        List<SplitPackingRec> lst = await _repository.GetListAsync(
+            itm => toPackingCodeList.Contains(itm.ToPackingCode)).ConfigureAwait(false);
 
+        foreach (string toCode in toPackingCodeList)
+        {
+            var obj = lst.Where(itm => itm.ToPackingCode == toCode)
+                .OrderByDescending(itm => itm.CreationTime).FirstOrDefault();
+            if (obj != null)
+            {
+                ret.Add(obj);
+            }
+        }
+        return ret;
+    }
     /// <summary>
     /// 取每个源标箱码的“操作状态=其它”的拆箱记录
     /// </summary>
@@ -168,7 +189,7 @@ public class SplitPackingRecManager : DomainService, ISplitPackingRecManager
     /// <returns></returns>
     public async Task<SplitPackingRec> GetSplitPackingCode(string packingCode)
     {
-        SplitPackingRec item = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.SplitBox).ConfigureAwait(false);
+        SplitPackingRec item = await _repository.FirstOrDefaultAsync(itm => itm.ToPackingCode == packingCode && itm.OprType == OprTypeEnum.Other).ConfigureAwait(false);
         return item;
     }
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Orders/PurchaseOrders/IPurchaseOrderAppService.cs

@@ -41,4 +41,5 @@ public interface IPurchaseOrderAppService
     Task<List<PurchaseOrderDTO>> GetListBySupplierCodeAsync(string supplierCode, string itemCode);
     Task<List<string>> GetNoPoBillList(List<string> poBillNo);
     Task<PurchaseOrderDTO> CreateOrUpdateAsync(PurchaseOrderEditInput input);
+    Task<PurchaseOrderDTO> GetListByNumberAndItemCodeAsync(string number, string itemCode);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PurchaseReceiptNotes/PurchaseReceiptNoteAppService.cs

@@ -170,14 +170,14 @@ public class PurchaseReceiptNoteAppService :
     public virtual async Task<PurchaseReceiptNoteDetailDTO> GetDetailByItemAndPackingAsync(string itemCode,
         string packingCode)
     {
-        var list=await _splitPackingRecAppService.GetListByToPackingCode(new List<string>(){ packingCode }).ConfigureAwait(false);
+        var list=await _splitPackingRecAppService.GetFirstOrDefaultPackingCode(new List<string>(){ packingCode }).ConfigureAwait(false);
         var splitPackingRecDto=list.FirstOrDefault();
        
         var entity = (await _repository.GetListAsync(p => p.Details.Any(y => y.ItemCode == itemCode && y.PackingCode == (splitPackingRecDto==null? packingCode: splitPackingRecDto.ToTopPackingCode)), true).ConfigureAwait(false)).FirstOrDefault();
 
         if (entity != null)
         {
-            var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == splitPackingRecDto.ToTopPackingCode);
+            var detail = entity.Details.FirstOrDefault(y => y.ItemCode == itemCode && y.PackingCode == (splitPackingRecDto == null ? packingCode : splitPackingRecDto.ToTopPackingCode));
 
             var dto = ObjectMapper.Map<PurchaseReceiptNoteDetail, PurchaseReceiptNoteDetailDTO>(detail);
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Orders/PurchaseOrders/PurchaseOrderAppService.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Repositories;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -320,7 +321,16 @@ public class PurchaseOrderAppService :
 
         return dtos;
     }
+    [HttpGet("get-list-by-number-nad-item-code")]
+    public virtual async Task<PurchaseOrderDTO> GetListByNumberAndItemCodeAsync(string number,string itemCode)
+    {
+        var entity = await _repository.GetListAsync(p =>p.Number==number&& p.Details.Any(y => y.ItemCode == itemCode),true)
+            .ConfigureAwait(false);
+
+        var dtos = ObjectMapper.Map<PurchaseOrder, PurchaseOrderDTO>(entity.FirstOrDefault());
 
+        return dtos;
+    }
     #region 校验
 
     [HttpPost("check-status")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Transactions/PurchaseReturnNoteEventHandler.cs

@@ -64,8 +64,7 @@ public class PurchaseReturnNoteEventHandler
         {
             var inventoryLabelDto=await _inventoryLabelAppService.GetByCodeAsync(detail.PackingCode).ConfigureAwait(false);
 
-            var purchaseOrderDetailUpdateInputs = entity.Details
-            .Select(BuildPurchaseOrderDetailUpdateInput).ToList();
+            var purchaseOrderDetailUpdateInputs = entity.Details.Select(BuildPurchaseOrderDetailUpdateInput).ToList();
 
             await _purchaseOrderAppService.UpdateDetailsAsync(entity.PoNumber, purchaseOrderDetailUpdateInputs).ConfigureAwait(false);
         }

build/src/docker/publish/conf/settings/appsettings.Development.json

@@ -117,8 +117,8 @@
       //"BaseUrl": "http://localhost:59093/"
     },
     "BaseData": {
-      "BaseUrl": "http://dev.ccwin-in.com:60084/"
-      //"BaseUrl": "http://localhost:59094/"
+      //"BaseUrl": "http://dev.ccwin-in.com:60084/"
+      "BaseUrl": "http://localhost:59094/"
     },
     "Default": {
       "BaseUrl": "http://dev.ccwin-in.com:60083/"