From 7ba59008871805f1ab7e2338f1eaa2e7735f222f Mon Sep 17 00:00:00 2001 From: zhaoxinyu <89237069@qq.com> Date: Mon, 18 Mar 2024 09:14:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Equipments/EquipmentLocAppService.cs | 11 ++++++++++- .../BasedataDbContext.cs | 1 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs index 4ca8b9718..14ad08e9e 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Equipments/EquipmentLocAppService.cs @@ -33,18 +33,22 @@ public class EquipmentLocAppService private readonly IEquipmentLocManager _manager; private new readonly IEquipmentLocRepository _repository; + private new readonly ILocationAppService _locRepository; + private readonly IExportImportService _importService; public EquipmentLocAppService( IEquipmentLocRepository repository, IDistributedCache cache, IExportImportService importService, + ILocationAppService locRepository, IEquipmentLocManager manager) : base(repository, cache) { _importService=importService; _repository = repository; _manager = manager; + _locRepository= locRepository; base.CreatePolicyName = EquipmentPermissions.Create; base.UpdatePolicyName = EquipmentPermissions.Update; base.DeletePolicyName = EquipmentPermissions.Delete; @@ -99,7 +103,12 @@ public class EquipmentLocAppService return list; } - + protected override async Task ValidateImportModelAsync(EquipmentLocImportInput importInput, List validationRresult) + { + await base.CheckItemBasicItemCodeAsync(importInput.Code, validationRresult).ConfigureAwait(false); + await base.CheckRawLocationAsync(importInput.LocCode, validationRresult).ConfigureAwait(false); + //await base.CheckComponentAndComponentQtyAsync(importInput.Component, importInput.ComponentQty, validationRresult).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 7ea3e0afd..239048798 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 @@ -52,7 +52,6 @@ public class BasedataDbContext : AbpDbContext, IBasedataDbCon public DbSet CustomerAddresses { get; set; } public DbSet ItemGuideBooks { get; set; } public DbSet Dicts { get; set; } - public DbSet PositionCodes { get; set; } public DbSet Equipments { get; set; }