Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

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

@@ -21,12 +21,14 @@ public class PurchaseReturnRequestController : AbpController
 {
     private readonly IPurchaseReturnRequestAppService _purchaseReturnRequestAppService;
     private readonly ITransactionTypeAppService _transactionTypeAppService;
+    private readonly IPurchaseOrderAppService _purchaseOrderAppService;
     public PurchaseReturnRequestController(IPurchaseReturnRequestAppService purchaseReturnRequestAppService,
-        ITransactionTypeAppService transactionTypeAppService
+        ITransactionTypeAppService transactionTypeAppService, IPurchaseOrderAppService purchaseOrderAppService
         )
     {
         _purchaseReturnRequestAppService = purchaseReturnRequestAppService;
         _transactionTypeAppService = transactionTypeAppService;
+        _purchaseOrderAppService = purchaseOrderAppService;
     }
 
     /// <summary>
@@ -44,8 +46,12 @@ public class PurchaseReturnRequestController : AbpController
             entity.ReturnTime = DateTime.Now;
             await SetRequestAutoPropertiesAsync(entity).ConfigureAwait(false);
             entity.Details = new List<PurchaseReturnRequestDetailInput>();
+            var order = await _purchaseOrderAppService.GetListByNumberWithDetailAsync(entity.PoNumber).ConfigureAwait(false);
+            var orderDetails = order.Details;
             foreach (var item in list)
             {
+                var orderDetail = orderDetails.FirstOrDefault(r => r.ItemCode == item.ItemCode);
+                item.PoLine= orderDetail.PoLine;
                 var detail = ObjectMapper.Map<PurchaseReturnRequestPdaInput, PurchaseReturnRequestDetailInput>(item);
                 entity.Details.Add(detail);
             }

be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/Balances/BalanceAppService.cs

@@ -323,10 +323,11 @@ public class BalanceAppService
             && p.LocationCode == locationCode
             && p.PackingCode == packingCode
             && p.Status == status
-            && p.LastCountTime==datetime
-            && p.LastCountPlanNumber== countPlanNumber).ConfigureAwait(false);
+           ).ConfigureAwait(false);
         if (entity != null)
         {
+            entity.LastCountTime = datetime;
+            entity.LastCountPlanNumber = countPlanNumber;
             await entity.ActiveAsync().ConfigureAwait(false);
             await _repository.UpdateAsync(entity).ConfigureAwait(false);
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/IUnplannedIssueJobAppService.cs

@@ -1,7 +1,9 @@
+using System.Threading.Tasks;
+
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public interface IUnplannedIssueJobAppService
     : ISfsJobAppServiceBase<UnplannedIssueJobDTO, SfsJobRequestInputBase, UnplannedIssueJobCheckInput, UnplannedIssueJobEditInput>
 {
-
+    Task CancelByRequestNumberAsync(string number);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/IUnplannedReceiptJobAppService.cs

@@ -1,7 +1,9 @@
+using System.Threading.Tasks;
+
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public interface IUnplannedReceiptJobAppService
     : ISfsJobAppServiceBase<UnplannedReceiptJobDTO, SfsJobRequestInputBase, UnplannedReceiptJobCheckInput, UnplannedReceiptJobEditInput>
 {
-
+    Task CancelByRequestNumberAsync(string number);
 }

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

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

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -13,9 +14,27 @@ public class UnplannedIssueJobAppService
     : SfsJobAppServiceBase<UnplannedIssueJob, UnplannedIssueJobDetail, UnplannedIssueJobDTO, SfsJobRequestInputBase, UnplannedIssueJobCheckInput, UnplannedIssueJobEditInput>,
     IUnplannedIssueJobAppService
 {
+
+    private readonly IUnplannedIssueJobManager  _unplannedIssueJobManager;
     public UnplannedIssueJobAppService(
-        IUnplannedIssueJobRepository repository, IUnplannedIssueJobManager UnplannedIssueJobManager
-        ) : base(repository, UnplannedIssueJobManager)
+        IUnplannedIssueJobRepository repository, IUnplannedIssueJobManager unplannedIssueJobManager
+        ) : base(repository, unplannedIssueJobManager)
+    {
+        _unplannedIssueJobManager = unplannedIssueJobManager;
+}
+
+    /// <summary>
+    /// 根据申请单号作废任务
+    /// </summary>
+    /// <param name="number"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-by-number}")]
+    public virtual async Task CancelByRequestNumberAsync(string number)
     {
+        var entities = await _repository.GetListAsync(p => p.UnplannedIssueRequestNumber == number).ConfigureAwait(false);
+        foreach (var entity in entities)
+        {
+            await _unplannedIssueJobManager.CancelAsync(entity).ConfigureAwait(false);
+        }
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs

@@ -1,3 +1,4 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
@@ -13,9 +14,28 @@ public class UnplannedReceiptJobAppService
     : SfsJobAppServiceBase<UnplannedReceiptJob, UnplannedReceiptJobDetail, UnplannedReceiptJobDTO, SfsJobRequestInputBase, UnplannedReceiptJobCheckInput, UnplannedReceiptJobEditInput>,
     IUnplannedReceiptJobAppService
 {
+
+    private readonly IUnplannedReceiptJobManager _unplannedReceiptJobManager;
     public UnplannedReceiptJobAppService(
         IUnplannedReceiptJobRepository repository, IUnplannedReceiptJobManager UnplannedReceiptJobManager
         ) : base(repository, UnplannedReceiptJobManager)
     {
+        _unplannedReceiptJobManager = UnplannedReceiptJobManager;
+    }
+
+
+    /// <summary>
+    /// 根据申请单号作废任务
+    /// </summary>
+    /// <param name="number"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-by-number}")]
+    public virtual async Task CancelByRequestNumberAsync(string number)
+    {
+        var entities = await _repository.GetListAsync(p => p.UnplannedReceiptRequestNumber == number).ConfigureAwait(false);
+        foreach (var entity in entities)
+        {
+            await _unplannedReceiptJobManager.CancelAsync(entity).ConfigureAwait(false);
+        }
     }
 }

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

@@ -321,6 +321,15 @@ public class PurchaseOrderAppService :
 
         return dtos;
     }
+    [HttpGet("get-list-by-number-with-detail-async")]
+    public virtual async Task<PurchaseOrderDTO> GetListByNumberWithDetailAsync(string number)
+    {
+        var entity = await _repository.GetAsync(p => p.Number == number,true).ConfigureAwait(false);
+
+        var dto = ObjectMapper.Map<PurchaseOrder, PurchaseOrderDTO>(entity);
+
+        return dto;
+    }
     [HttpGet("get-list-by-number-nad-item-code")]
     public virtual async Task<PurchaseOrderDTO> GetListByNumberAndItemCodeAsync(string number,string itemCode)
     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs

@@ -105,12 +105,21 @@ public class UnplannedIssueRequestEventHandler
             await ExpectOutAppService.RemoveAsync(entity.Number).ConfigureAwait(false);               
         }
     }
+    /// <summary>
+    /// 中止订阅
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
     public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<UnplannedIssueRequest> eventData)
     {
         var entity = eventData.Entity;
-        if (entity.UnplannedIssueType == EnumUnplannedIssueType.Raw)
-        {
+       // if (entity.UnplannedIssueType == EnumUnplannedIssueType.Raw)
+       // {
             await ExpectOutAppService.RemoveAsync(entity.Number).ConfigureAwait(false);
+        // }
+        if (!entity.DirectCreateNote)//作废任务
+        {
+            await _unplannedIssueJobApp.CancelByRequestNumberAsync(entity.Number).ConfigureAwait(false);
         }
     }
     public virtual async Task HandleEventAsync(SfsCancelledEntityEventData<UnplannedIssueRequest> eventData)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedReceiptRequestEventHandler.cs

@@ -13,6 +13,7 @@ public class UnplannedReceiptRequestEventHandler
         , ILocalEventHandler<SfsCreatedEntityEventData<UnplannedReceiptRequest>>
         , ILocalEventHandler<SfsCreatedEntityEventData<List<UnplannedReceiptRequest>>>
         , ILocalEventHandler<SfsHandledEntityEventData<UnplannedReceiptRequest>>
+        , ILocalEventHandler<SfsAbortedEntityEventData<UnplannedReceiptRequest>>
 {
     private readonly IUnplannedReceiptJobAppService _unplannedReceiptJobApp;
     private readonly IUnplannedReceiptNoteAppService _unplannedReceiptNoteApp;
@@ -27,7 +28,19 @@ public class UnplannedReceiptRequestEventHandler
         _unplannedReceiptRequestManager = unplannedReceiptRequestManager;
         _unplannedReceiptJobApp = unplannedReceiptJobApp;
     }
-
+    /// <summary>
+    /// 中止订阅
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(SfsAbortedEntityEventData<UnplannedReceiptRequest> eventData)
+    {
+        var entity = eventData.Entity;
+        if (!entity.DirectCreateNote)//作废任务
+        {
+            await _unplannedReceiptJobApp.CancelByRequestNumberAsync(entity.Number).ConfigureAwait(false);
+        }
+    }
     /// <summary>
     ///     创建后
     /// </summary>