增加Kitting区到装配线边TYRP接口

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/EnumExchangeDataType.cs

@@ -45,5 +45,9 @@ public enum EnumExchangeDataType
     /// 装配发料
     /// </summary>
     AssembleIssue=32,
+    /// <summary>
+    /// 三方库
+    /// </summary>
+    ThirdLocation = 33,
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/KittingIssueNoteEventHandler.cs

@@ -0,0 +1,107 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.EventBus;
+using Volo.Abp.Uow;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
+
+namespace Win_in.Sfs.Wms.Store.Event.DataExchanges;
+
+/// <summary>
+/// Kitting区=>装配线边库移记录传给TYRP(线边仓领料单)
+/// </summary>
+public class KittingIssueNoteEventHandler
+    : StoreDataExchangeEventHandlerBase<KittingIssueNote>
+    , ILocalEventHandler<SfsCreatedEntityEventData<KittingIssueNote>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<List<KittingIssueNote>>>
+{
+
+    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<KittingIssueNote> eventData)
+    {
+        var entity = eventData.Entity;
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<KittingIssueNote>> eventData)
+    {
+        var entities = eventData.Entity;
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
+    }
+
+    protected override async Task AddExchangeDataAsync(List<KittingIssueNote> entities)
+    {
+        var dtos = ObjectMapper.Map<List<KittingIssueNote>, List<KittingIssueNoteDTO>>(entities);
+        foreach (var detail in dtos.SelectMany(dto => dto.Details))
+        {
+            if (string.IsNullOrEmpty(detail.HandledFromLocationErpCode))
+            {
+                var location = await LocationAclService.GetByCodeAsync(detail.HandledFromLocationCode).ConfigureAwait(false);
+                if (location != null)
+                {
+                    detail.HandledFromLocationErpCode = location.ErpLocationCode;
+                    detail.HandledFromLocationGroup = location.LocationGroupCode;
+                    detail.HandledFromLocationArea = location.AreaCode;
+
+                    if (string.IsNullOrEmpty(detail.HandledFromWarehouseCode))
+                    {
+                        detail.HandledFromWarehouseCode = location.WarehouseCode;
+                    }
+                }
+            }
+
+            if (string.IsNullOrEmpty(detail.HandledToLocationErpCode))
+            {
+                var location = await LocationAclService.GetByCodeAsync(detail.HandledToLocationCode).ConfigureAwait(false);
+                if (location != null)
+                {
+                    detail.HandledToLocationErpCode = location.ErpLocationCode;
+                    detail.HandledToLocationGroup = location.LocationGroupCode;
+                    detail.HandledToLocationArea = location.AreaCode;
+
+                    if (string.IsNullOrEmpty(detail.HandledToWarehouseCode))
+                    {
+                        detail.HandledToWarehouseCode = location.WarehouseCode;
+                    }
+                }
+            }
+
+        }
+
+        var toErpDto = new List<KittingIssueNoteDTO>();
+        foreach (var item in dtos)
+        {
+            if (item.Details != null && item.Details.Count != 0)
+            {
+                toErpDto.Add(item);
+            }
+        }
+
+        //2023-12-6要求同储位不传入接口  按历史规则
+        var result = new List<KittingIssueNoteDTO>();
+        foreach (var kittingIssueNoteDto in toErpDto)
+        {
+            kittingIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
+            if (kittingIssueNoteDto.Details.Count > 0)
+            {
+                result.Add(kittingIssueNoteDto);
+            }
+        }
+
+        if (result.Count > 0)
+        {
+            var exchangeDataerp =
+                await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, result)
+                    .ConfigureAwait(false);
+            await AddManyAsync(exchangeDataerp).ConfigureAwait(false);
+        }
+    }
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ThirdLocationNoteEventHandler.cs

@@ -18,12 +18,8 @@ namespace Win_in.Sfs.Wms.Store.Event.DataExchanges
         StoreDataExchangeEventHandlerBase<ThirdLocationNote>
         , ILocalEventHandler<SfsCreatedEntityEventData<ThirdLocationNote>>
     {
-        private readonly Domain.Acl.Location.ILocationAclService _locationAclService;
-
-        public ThirdLocationNoteEventHandler(ILocationAclService locationAclService)
-        {
-            _locationAclService = locationAclService;
-        }
+        
+        private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.ThirdLocation;               
 
         [UnitOfWork]
         public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<ThirdLocationNote> eventData)
@@ -32,11 +28,22 @@ namespace Win_in.Sfs.Wms.Store.Event.DataExchanges
             await AddExchangeDataAsync(entity).ConfigureAwait(false);
         }
 
+        [UnitOfWork]
+        public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<ThirdLocationNote>> eventData)
+        {
+            var entities = eventData.Entity;
+            await AddExchangeDataAsync(entities).ConfigureAwait(false);
+        }
+
         protected override async Task AddExchangeDataAsync(List<ThirdLocationNote> entities)
         {
             var dtos = ObjectMapper.Map<List<ThirdLocationNote>, List<ThirdLocationNoteDTO>>(entities);
-           
-            var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, EnumExchangeDataType.Transfer, dtos).ConfigureAwait(false);
+            foreach (var detail in dtos.SelectMany(dto => dto.Details))
+            {
+                await detail.TrySetLocationAsync(LocationAclService).ConfigureAwait(false);
+            }
+
+            var exchangeData = await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, dtos).ConfigureAwait(false);
             await AddManyAsync(exchangeData).ConfigureAwait(false);
 
         }