diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/AssembleIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/AssembleIssueNoteEventHandler.cs
similarity index 100%
rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/AssembleIssueNoteEventHandler.cs
rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/AssembleIssueNoteEventHandler.cs
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/CoatingIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/CoatingIssueNoteEventHandler.cs
similarity index 58%
rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/CoatingIssueNoteEventHandler.cs
rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/CoatingIssueNoteEventHandler.cs
index ad795164a..698184507 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/CoatingIssueNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/CoatingIssueNoteEventHandler.cs
@@ -37,44 +37,45 @@ public class CoatingIssueNoteEventHandler
 
     protected override async Task AddExchangeDataAsync(List<CoatingIssueNote> entities)
     {
-        var dtos = ObjectMapper.Map<List<CoatingIssueNote>, List<CoatingIssueNoteDTO>>(entities);
+        var dtos = ObjectMapper.Map<List<CoatingIssueNote>, List<IssueNoteDTO>>(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;
+            await detail.TrySetLocationAsync(LocationAclService).ConfigureAwait(false);
+            //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.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.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;
-                    }
-                }
-            }
+            //        if (string.IsNullOrEmpty(detail.HandledToWarehouseCode))
+            //        {
+            //            detail.HandledToWarehouseCode = location.WarehouseCode;
+            //        }
+            //    }
+            //}
 
         }
 
-        var toErpDto = new List<CoatingIssueNoteDTO>();
+        var toErpDto = new List<IssueNoteDTO>();
         foreach (var item in dtos)
         {
             if (item.Details != null && item.Details.Count != 0)
@@ -84,10 +85,10 @@ public class CoatingIssueNoteEventHandler
         }
 
         //2023-12-6要求同储位不传入接口  按历史规则
-        var result = new List<CoatingIssueNoteDTO>();
+        var result = new List<IssueNoteDTO>();
         foreach (var coatingIssueNoteDto in toErpDto)
         {
-            coatingIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
+            coatingIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.ToLocationErpCode);
             if (coatingIssueNoteDto.Details.Count > 0)
             {
                 result.Add(coatingIssueNoteDto);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/InjectionIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/InjectionIssueNoteEventHandler.cs
similarity index 59%
rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/InjectionIssueNoteEventHandler.cs
rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/InjectionIssueNoteEventHandler.cs
index 34d324950..022d1d360 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/InjectionIssueNoteEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/InjectionIssueNoteEventHandler.cs
@@ -37,44 +37,45 @@ public class InjectionIssueNoteEventHandler
 
     protected override async Task AddExchangeDataAsync(List<InjectionIssueNote> entities)
     {
-        var dtos = ObjectMapper.Map<List<InjectionIssueNote>, List<InjectionIssueNoteDTO>>(entities);
+        var dtos = ObjectMapper.Map<List<InjectionIssueNote>, List<IssueNoteDTO>>(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;
+            await detail.TrySetLocationAsync(LocationAclService).ConfigureAwait(false);
+            //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.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.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;
-                    }
-                }
-            }
+            //        if (string.IsNullOrEmpty(detail.HandledToWarehouseCode))
+            //        {
+            //            detail.HandledToWarehouseCode = location.WarehouseCode;
+            //        }
+            //    }
+            //}
 
         }        
 
-        var toErpDto = new List<InjectionIssueNoteDTO>();
+        var toErpDto = new List<IssueNoteDTO>();
         foreach (var item in dtos)
         {
             if (item.Details != null && item.Details.Count != 0)
@@ -84,10 +85,10 @@ public class InjectionIssueNoteEventHandler
         }
 
         //2023-12-6要求同储位不传入接口  按历史规则
-        var result = new List<InjectionIssueNoteDTO>();
+        var result = new List<IssueNoteDTO>();
         foreach (var injectionIssueNoteDto in toErpDto)
         {
-            injectionIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
+            injectionIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.ToLocationErpCode);
             if (injectionIssueNoteDto.Details.Count > 0)
             {
                 result.Add(injectionIssueNoteDto);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/KittingIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/KittingIssueNoteEventHandler.cs
similarity index 100%
rename from be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/KittingIssueNoteEventHandler.cs
rename to be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/KittingIssueNoteEventHandler.cs
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/SparePartIssueNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/SparePartIssueNoteEventHandler.cs
new file mode 100644
index 000000000..bc03a1ed9
--- /dev/null
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/Issue/SparePartIssueNoteEventHandler.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;
+
+namespace Win_in.Sfs.Wms.Store.Event.DataExchanges;
+
+/// <summary>
+/// 备品发料记录传给TYRP(线边仓领料单)
+/// </summary>
+public class SparePartIssueNoteEventHandler
+    : StoreDataExchangeEventHandlerBase<SparePartIssueNote>
+    , ILocalEventHandler<SfsCreatedEntityEventData<SparePartIssueNote>>
+    , ILocalEventHandler<SfsCreatedEntityEventData<List<SparePartIssueNote>>>
+{
+    //线边仓领料单
+    private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<SparePartIssueNote> eventData)
+    {
+        var entity = eventData.Entity;
+        await AddExchangeDataAsync(entity).ConfigureAwait(false);
+    }
+
+    [UnitOfWork]
+    public virtual async Task HandleEventAsync(SfsCreatedEntityEventData<List<SparePartIssueNote>> eventData)
+    {
+        var entities = eventData.Entity;
+        await AddExchangeDataAsync(entities).ConfigureAwait(false);
+    }
+
+    protected override async Task AddExchangeDataAsync(List<SparePartIssueNote> entities)
+    {
+        var dtos = ObjectMapper.Map<List<SparePartIssueNote>, List<IssueNoteDTO>>(entities);
+        foreach (var detail in dtos.SelectMany(dto => dto.Details))
+        {
+            await detail.TrySetLocationAsync(LocationAclService).ConfigureAwait(false);
+            //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<IssueNoteDTO>();
+        foreach (var item in dtos)
+        {
+            if (item.Details != null && item.Details.Count != 0)
+            {
+                toErpDto.Add(item);
+            }
+        }
+
+        //2023-12-6要求同储位不传入接口  按历史规则
+        var result = new List<IssueNoteDTO>();
+        foreach (var sparePartIssueNoteDto in toErpDto)
+        {
+            sparePartIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.ToLocationErpCode);
+            if (sparePartIssueNoteDto.Details.Count > 0)
+            {
+                result.Add(sparePartIssueNoteDto);
+            }
+        }
+
+        if (result.Count > 0)
+        {
+            var exchangeDataerp =
+                await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, result)
+                    .ConfigureAwait(false);
+            await AddManyAsync(exchangeDataerp).ConfigureAwait(false);
+        }
+    }
+
+}