diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/DTOs/LocationDeliveryDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/DTOs/LocationDeliveryDTO.cs
new file mode 100644
index 000000000..8590557b1
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/DTOs/LocationDeliveryDTO.cs
@@ -0,0 +1,29 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Basedata.Application.Contracts;
+
+[Display(Name = "库位组")]
+
+public class LocationDeliveryDTO : SfsBaseDataDTOBase
+{
+ ///
+ /// 来源库位
+ ///
+ [Display(Name = "来源库位")]
+ public string FromLocationCode { get; set; }
+
+ ///
+ /// 目标库位
+ ///
+ [Display(Name = "目标库位")]
+ public string ToLocationCode { get; set; }
+
+ ///
+ /// 配送方式
+ ///
+ [Display(Name = "配送方式")]
+ public EnumLocationDeliveryType EnumLocationDeliveryType { get; set; }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/ILocationDeliveryAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/ILocationDeliveryAppService.cs
new file mode 100644
index 000000000..88889394e
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/ILocationDeliveryAppService.cs
@@ -0,0 +1,8 @@
+using Win_in.Sfs.Shared.Application.Contracts;
+
+namespace Win_in.Sfs.Basedata.Application.Contracts;
+
+public interface ILocationDeliveryAppService
+ : ISfsBaseDataAppServiceBase
+{
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/Inputs/LocationDeliveryEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/Inputs/LocationDeliveryEditInput.cs
new file mode 100644
index 000000000..086d2ef71
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/Inputs/LocationDeliveryEditInput.cs
@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Basedata.Application.Contracts;
+
+public class LocationDeliveryEditInput : SfsBaseDataWithWarehouseCreateOrUpdateInputBase
+{
+ ///
+ /// 来源库位
+ ///
+ [Display(Name = "来源库位")]
+ public string FromLocationCode { get; set; }
+
+ ///
+ /// 目标库位
+ ///
+ [Display(Name = "目标库位")]
+ public string ToLocationCode { get; set; }
+
+ ///
+ /// 配送方式
+ ///
+ [Display(Name = "配送方式")]
+ public EnumLocationDeliveryType EnumLocationDeliveryType { get; set; }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/Inputs/LocationDeliveryImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/Inputs/LocationDeliveryImportInput.cs
new file mode 100644
index 000000000..b3ddb914b
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/Inputs/LocationDeliveryImportInput.cs
@@ -0,0 +1,42 @@
+using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+
+namespace Win_in.Sfs.Basedata.Application.Contracts;
+
+[Display(Name = "库位配送方式")]
+public class LocationDeliveryImportInput : SfsBaseDataImportInputBase
+{
+ ///
+ /// 来源库位
+ ///
+ [Display(Name = "来源库位")]
+ [Required(ErrorMessage = "{0}是必填项")]
+ [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
+ public string FromLocationCode { get; set; }
+
+ ///
+ /// 目标库位
+ ///
+ [Display(Name = "目标库位")]
+ [Required(ErrorMessage = "{0}是必填项")]
+ [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
+ public string ToLocationCode { get; set; }
+
+ ///
+ /// 配送方式
+ ///
+ [Display(Name = "配送方式")]
+ [Required(ErrorMessage = "{0}是必填项")]
+ [StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
+ public EnumLocationDeliveryType EnumLocationDeliveryType { get; set; }
+
+ ///
+ /// 备注
+ ///
+ [Display(Name = "备注")]
+ [StringLength(SfsEfCorePropertyConst.RemarkLength, ErrorMessage = "{0}最多输入{1}个字符")]
+ public string Remark { get; set; }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/LocationDeliveryPermissions.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/LocationDeliveryPermissions.cs
new file mode 100644
index 000000000..b30724851
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationDeliverys/LocationDeliveryPermissions.cs
@@ -0,0 +1,21 @@
+using Volo.Abp.Authorization.Permissions;
+using Win_in.Sfs.Basedata.Domain;
+
+namespace Win_in.Sfs.Basedata.Application.Contracts;
+
+public static class LocationDeliveryPermissions
+{
+
+ public const string Default = BasedataPermissions.GroupName + "." + nameof(LocationDelivery);
+ public const string Create = Default + "." + BasedataPermissions.CreateStr;
+ public const string Update = Default + "." + BasedataPermissions.UpdateStr;
+ public const string Delete = Default + "." + BasedataPermissions.DeleteStr;
+
+ public static void AddLocationDeliveryPermission(this PermissionGroupDefinition permissionGroup)
+ {
+ var LocationDeliveryPermission = permissionGroup.AddPermission(Default, BasedataPermissionDefinitionProvider.L(nameof(LocationDelivery)));
+ LocationDeliveryPermission.AddChild(Create, BasedataPermissionDefinitionProvider.L(BasedataPermissions.CreateStr));
+ LocationDeliveryPermission.AddChild(Update, BasedataPermissionDefinitionProvider.L(BasedataPermissions.UpdateStr));
+ LocationDeliveryPermission.AddChild(Delete, BasedataPermissionDefinitionProvider.L(BasedataPermissions.DeleteStr));
+ }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Permissions/BasedataPermissionDefinitionProvider.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Permissions/BasedataPermissionDefinitionProvider.cs
index 764e3ec32..3f830ed3b 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Permissions/BasedataPermissionDefinitionProvider.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Permissions/BasedataPermissionDefinitionProvider.cs
@@ -51,11 +51,11 @@ public class BasedataPermissionDefinitionProvider : PermissionDefinitionProvider
basedataGroup.AddItemStoreRelationPermission();
basedataGroup.AddCustomerAddressPermission();
basedataGroup.AddItemGuideBookPermission();
-
basedataGroup.AddDictPermission();
basedataGroup.AddItemSafetyStockPermission();
basedataGroup.AddDocumentSettingPermission();
basedataGroup.AddErpLocationPermission();
+ basedataGroup.AddLocationDeliveryPermission();
basedataGroup.AddLPostionLocationPermission();
}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/LocationDeliverys/LocationDeliveryAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/LocationDeliverys/LocationDeliveryAppService.cs
new file mode 100644
index 000000000..5c1066a6e
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/LocationDeliverys/LocationDeliveryAppService.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Threading.Tasks;
+
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.Caching;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Basedata.Domain;
+using Win_in.Sfs.Basedata.Domain.Shared;
+
+namespace Win_in.Sfs.Basedata.Application;
+
+[Authorize]
+[Route($"{BasedataConsts.RootPath}location-group")]
+
+public class LocationDeliveryAppService
+ : SfsBaseDataAppServiceBase
+ , ILocationDeliveryAppService
+{
+
+ private readonly IAreaAppService _areaAppService;
+
+ private readonly ILocationDeliveryManager _manager;
+ public LocationDeliveryAppService(
+ ILocationDeliveryRepository repository
+ , IDistributedCache cache
+ , ILocationDeliveryManager manager
+ , IAreaAppService areaAppService
+ ) : base(repository, cache)
+ {
+ _areaAppService = areaAppService;
+ base.CreatePolicyName = LocationDeliveryPermissions.Create;
+ base.UpdatePolicyName = LocationDeliveryPermissions.Update;
+ base.DeletePolicyName = LocationDeliveryPermissions.Delete;
+
+ _manager = manager;
+ }
+
+ protected override async Task ValidateImportModelAsync(LocationDeliveryImportInput importInput, List validationRresult)
+ {
+ await base.ValidateImportModelAsync(importInput, validationRresult).ConfigureAwait(false);
+ }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/LocationDeliverys/LocationDeliveryAutoMapperProfile.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/LocationDeliverys/LocationDeliveryAutoMapperProfile.cs
new file mode 100644
index 000000000..d0b25216f
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/LocationDeliverys/LocationDeliveryAutoMapperProfile.cs
@@ -0,0 +1,27 @@
+using AutoMapper;
+using Volo.Abp.AutoMapper;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Basedata.Domain;
+
+namespace Win_in.Sfs.Basedata.Application;
+
+public partial class BasedataApplicationAutoMapperProfile : Profile
+{
+ private void LocationDeliveryAutoMapperProfile()
+ {
+ CreateMap()
+ .ReverseMap();
+
+ CreateMap()
+ .IgnoreAuditedObjectProperties()
+ .Ignore(x => x.TenantId)
+ .Ignore(x => x.ExtraProperties)
+ .Ignore(x => x.ConcurrencyStamp)
+ ;
+
+ CreateMap()
+ .Ignore(x => x.ReportStatus)
+ .Ignore(x => x.ReportReason);
+
+ }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Enum/EnumLocationDeliveryType.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Enum/EnumLocationDeliveryType.cs
new file mode 100644
index 000000000..a2d2d42d9
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain.Shared/Enum/EnumLocationDeliveryType.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+
+public enum EnumLocationDeliveryType
+{
+ ///
+ /// 正常
+ ///
+ [Display(Name = "正常")] Normal = 1,
+
+ ///
+ /// Agv
+ ///
+ [Display(Name = "Agv")] Agv = 2
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/ILocationDeliveryManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/ILocationDeliveryManager.cs
new file mode 100644
index 000000000..e089bc0a3
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/ILocationDeliveryManager.cs
@@ -0,0 +1,8 @@
+using Volo.Abp.Domain.Services;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Basedata.Domain;
+
+public interface ILocationDeliveryManager : IDomainService, IBulkImportService
+{
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/ILocationDeliveryRepository.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/ILocationDeliveryRepository.cs
new file mode 100644
index 000000000..5b92e7d98
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/ILocationDeliveryRepository.cs
@@ -0,0 +1,8 @@
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Basedata.Domain;
+
+public interface ILocationDeliveryRepository : ISfsBaseDataRepositoryBase, ISfsBulkRepositoryBase
+{
+
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/LocationDelivery.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/LocationDelivery.cs
new file mode 100644
index 000000000..48ac30c2f
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/LocationDelivery.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Win_in.Sfs.Basedata.Domain;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Basedata.Domain;
+///
+/// 配送方式
+///
+public class LocationDelivery : SfsBaseDataAggregateRootBase
+{
+ ///
+ /// 来源库位
+ ///
+ [Display(Name = "来源库位")]
+ public string FromLocationCode { get; set; }
+
+ ///
+ /// 目标库位
+ ///
+ [Display(Name = "目标库位")]
+ public string ToLocationCode { get; set; }
+
+ ///
+ /// 配送方式
+ ///
+ [Display(Name = "配送方式")]
+ public EnumLocationDeliveryType EnumLocationDeliveryType{ get; set; }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/LocationDeliveryManager.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/LocationDeliveryManager.cs
new file mode 100644
index 000000000..bab851360
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/LocationDeliverys/LocationDeliveryManager.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Services;
+
+namespace Win_in.Sfs.Basedata.Domain;
+
+public class LocationDeliveryManager : DomainService, ILocationDeliveryManager
+{
+ private readonly ILocationDeliveryRepository _repository;
+
+ private readonly IWarehouseRepository _warehourseRepository;
+ private readonly IAreaRepository _areaRepository;
+
+ public LocationDeliveryManager(ILocationDeliveryRepository repository, IWarehouseRepository warehourseRepository, IAreaRepository areaRepository)
+ {
+ _repository = repository;
+ _warehourseRepository = warehourseRepository;
+ _areaRepository = areaRepository;
+ }
+
+ ///
+ /// 执行导入
+ ///
+ public virtual async Task ImportDataAsync(List mergeEntities, List deleteEntities = null)
+ {
+ if (deleteEntities != null && deleteEntities.Count > 0)
+ {
+ await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
+ }
+
+ await _repository.BulkMergeAsync(mergeEntities).ConfigureAwait(false);
+ }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContext.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContext.cs
index 0e05cb4c9..16b132e5d 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContext.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContext.cs
@@ -60,7 +60,7 @@ public class BasedataDbContext : AbpDbContext, IBasedataDbCon
public DbSet SplitPackingRecs { get; set; }
public DbSet PostionLocations { get; set; }
-
+ public DbSet LocationDeliverys { get; set; }
public BasedataDbContext(DbContextOptions options)
: base(options)
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContextModelCreatingExtensions.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContextModelCreatingExtensions.cs
index 54cb6b6ef..3d63b29b0 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContextModelCreatingExtensions.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataDbContextModelCreatingExtensions.cs
@@ -74,7 +74,7 @@ public static class BasedataDbContextModelCreatingExtensions
builder.ConfigureEquipmentLoc(options);
builder.ConfigureEquipmentPartCode(options);
builder.ConfigurePostionLocation(options);
-
+ builder.ConfigureLocationDelivery(options);
}
}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataEntityFrameworkCoreModule.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataEntityFrameworkCoreModule.cs
index 6a35c1ebb..827cee3f7 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataEntityFrameworkCoreModule.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/BasedataEntityFrameworkCoreModule.cs
@@ -78,6 +78,7 @@ public class BasedataEntityFrameworkCoreModule : AbpModule
context.Services.AddTransient();
context.Services.AddTransient();
context.Services.AddTransient();
+ context.Services.AddTransient();
ConfigureEntity();
}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/IBasedataDbContext.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/IBasedataDbContext.cs
index 8dcd0c307..44e67cb70 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/IBasedataDbContext.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/IBasedataDbContext.cs
@@ -56,5 +56,5 @@ public interface IBasedataDbContext : IEfCoreDbContext
public DbSet SplitPackingRecs { get; set; }
-
+ public DbSet LocationDeliverys { get; set; }
}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/LocationDeliverys/LocationDeliveryDbContextModelCreatingExtensions.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/LocationDeliverys/LocationDeliveryDbContextModelCreatingExtensions.cs
new file mode 100644
index 000000000..e520ccdd7
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/LocationDeliverys/LocationDeliveryDbContextModelCreatingExtensions.cs
@@ -0,0 +1,32 @@
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Win_in.Sfs.Basedata.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.EntityFrameworkCore;
+
+namespace Win_in.Sfs.Basedata.EntityFrameworkCore;
+
+public static class LocationDeliveryDbContextModelCreatingExtensions
+{
+ public static void ConfigureLocationDelivery(this ModelBuilder builder, BasedataModelBuilderConfigurationOptions options)
+ {
+ builder.Entity(b =>
+ {
+ //Configure table & schema name
+ b.ToTable(options.TablePrefix + nameof(LocationDelivery), options.Schema);
+ //Configure ABP properties
+ b.ConfigureByConvention();
+ //Configure Sfs base properties
+ b.ConfigureSfsBase();
+
+ //Properties
+
+ b.Property(q => q.FromLocationCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+ b.Property(q => q.ToLocationCode).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength);
+
+ b.Property(q => q.Remark).HasMaxLength(SfsPropertyConst.RemarkLength);
+
+ b.HasIndex(q => new { q.FromLocationCode,q.ToLocationCode }).IsUnique();
+ });
+ }
+}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/LocationDeliverys/LocationDeliveryEfCoreRepository.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/LocationDeliverys/LocationDeliveryEfCoreRepository.cs
new file mode 100644
index 000000000..f23adf643
--- /dev/null
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/LocationDeliverys/LocationDeliveryEfCoreRepository.cs
@@ -0,0 +1,12 @@
+using Volo.Abp.EntityFrameworkCore;
+using Win_in.Sfs.Basedata.Domain;
+using Win_in.Sfs.Shared.Domain;
+
+namespace Win_in.Sfs.Basedata.EntityFrameworkCore;
+
+public class LocationDeliveryEfCoreRepository : SfsBaseDataEfCoreRepositoryBase, ILocationDeliveryRepository, ISfsBulkRepositoryBase
+{
+ public LocationDeliveryEfCoreRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider)
+ {
+ }
+}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs
index 750e7ee2f..beac4305f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/IAssembleIssueJobAppService.cs
@@ -28,4 +28,5 @@ public interface IAssembleIssueJobAppService
Task GetByNumber2Async(string number);
Task GetJobByPackingCodeAsync(string packingCode);
+ Task CallBackAgvAsync(AgvRequestDto request);
}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
index d3aaff283..500a2ded1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs
@@ -872,7 +872,12 @@ public class AssembleIssueJobAppService
return res;
}
- [HttpPost("call-back-agv")]
+ ///
+ /// Agv 回调 接口
+ ///
+ ///
+ ///
+ [HttpPost("call-back-agv")]
public async Task CallBackAgvAsync(AgvRequestDto request)
{
var json = JsonSerializer.Serialize(request);