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 09a3b16e9..cf50200fa 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
@@ -45,5 +45,9 @@ public enum EnumExchangeDataType
/// 装配发料
///
AssembleIssue=32,
+ ///
+ /// 三方库
+ ///
+ ThirdLocation = 33,
}
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/KittingIssueNoteEventHandler.cs
new file mode 100644
index 000000000..8f4a54e09
--- /dev/null
+++ b/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;
+
+///
+/// Kitting区=>装配线边库移记录传给TYRP(线边仓领料单)
+///
+public class KittingIssueNoteEventHandler
+ : StoreDataExchangeEventHandlerBase
+ , ILocalEventHandler>
+ , ILocalEventHandler>>
+{
+
+ private const EnumExchangeDataType ExchangeDataType = EnumExchangeDataType.Issue;
+
+ [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 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);
+ }
+ }
+
+}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ThirdLocationNoteEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ThirdLocationNoteEventHandler.cs
index 7adb5dde4..22374322d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/DataExchanges/ThirdLocationNoteEventHandler.cs
+++ b/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
, ILocalEventHandler>
{
- 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 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> eventData)
+ {
+ var entities = eventData.Entity;
+ await AddExchangeDataAsync(entities).ConfigureAwait(false);
+ }
+
protected override async Task AddExchangeDataAsync(List entities)
{
var dtos = ObjectMapper.Map, List>(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);
}