diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/EnumExchangeDataType.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/EnumExchangeDataType.cs
index e1aee60b2..09a3b16e9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/EnumExchangeDataType.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/ExchangeDatas/EnumExchangeDataType.cs
@@ -41,5 +41,9 @@ public enum EnumExchangeDataType
/// 涂装发料
///
CoatingIssue=31,
+ ///
+ /// 装配发料
+ ///
+ AssembleIssue=32,
}
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/AssembleIssueNoteEventHandler.cs
new file mode 100644
index 000000000..bfcaccd94
--- /dev/null
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/AssembleIssueNoteEventHandler.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;
+
+///
+/// 装配发料记录传给TYRP(线边仓领料单)
+///
+public class AssembleIssueNoteEventHandler
+ : StoreDataExchangeEventHandlerBase
+ , ILocalEventHandler>
+ , ILocalEventHandler>>
+{
+
+ private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.AssembleIssue;
+
+ [UnitOfWork]
+ public virtual async Task HandleEventAsync(SfsCreatedEntityEventData eventData)
+ {
+ var entity = eventData.Entity;
+ await AddExchangeDataAsync(entity).ConfigureAwait(false);
+ }
+
+ [UnitOfWork]
+ public virtual async Task HandleEventAsync(SfsCreatedEntityEventData> eventData)
+ {
+ var entities = eventData.Entity;
+ await AddExchangeDataAsync(entities).ConfigureAwait(false);
+ }
+
+ protected override async Task AddExchangeDataAsync(List entities)
+ {
+ var dtos = ObjectMapper.Map, List>(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();
+ foreach (var item in dtos)
+ {
+ if (item.Details != null && item.Details.Count != 0)
+ {
+ toErpDto.Add(item);
+ }
+ }
+
+ //2023-12-6要求同储位不传入接口 按历史规则
+ var result = new List();
+ foreach (var assembleIssueNoteDto in toErpDto)
+ {
+ assembleIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
+ if (assembleIssueNoteDto.Details.Count > 0)
+ {
+ result.Add(assembleIssueNoteDto);
+ }
+ }
+
+ if (result.Count > 0)
+ {
+ var exchangeDataerp =
+ await BuildExchangeDataAsync(StoreEventConsts.WMS, StoreEventConsts.ERP, ExchangeDataType, result)
+ .ConfigureAwait(false);
+ await AddManyAsync(exchangeDataerp).ConfigureAwait(false);
+ }
+ }
+
+}
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/CoatingIssueNoteEventHandler.cs
index de0a95320..523e5973f 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/CoatingIssueNoteEventHandler.cs
@@ -12,7 +12,7 @@ using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
namespace Win_in.Sfs.Wms.Store.Event.DataExchanges;
///
-/// 涂装发料记录传给TYRP(线边领料单)
+/// 涂装发料记录传给TYRP(线边仓领料单)
///
public class CoatingIssueNoteEventHandler
: StoreDataExchangeEventHandlerBase
@@ -86,12 +86,12 @@ public class CoatingIssueNoteEventHandler
//2023-12-6要求同储位不传入接口 按历史规则
var result = new List();
- foreach (var injectionIssueNoteDto in toErpDto)
+ foreach (var coatingIssueNoteDto in toErpDto)
{
- injectionIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
- if (injectionIssueNoteDto.Details.Count > 0)
+ coatingIssueNoteDto.Details.RemoveAll(p => p.HandledFromLocationErpCode == p.HandledToLocationErpCode);
+ if (coatingIssueNoteDto.Details.Count > 0)
{
- result.Add(injectionIssueNoteDto);
+ 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/InjectionIssueNoteEventHandler.cs
index f5e09482f..10600d8ce 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/InjectionIssueNoteEventHandler.cs
@@ -11,7 +11,7 @@ using Win_in.Sfs.Wms.Store.Domain;
namespace Win_in.Sfs.Wms.Store.Event.DataExchanges;
///
-/// 注塑发料记录传给TYRP(线边领料单)
+/// 注塑发料记录传给TYRP(线边仓领料单)
///
public class InjectionIssueNoteEventHandler
: StoreDataExchangeEventHandlerBase