From 1c6430680e73d251645855fae9fff113a2ac9f8d Mon Sep 17 00:00:00 2001 From: jiargcnXPS Date: Tue, 1 Mar 2022 10:49:56 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E4=BD=BF=E7=94=A8address=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86ID=20[fix]=E5=A2=9E=E5=8A=A0Site?= =?UTF-8?q?=E5=92=8CVendID=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnplannedReceiptCreateDTO.cs | 8 ++++++ .../Parts/PartAppService.cs | 7 +++++ .../PurchaseOrders/PurchaseOrderAppService.cs | 9 ++++++ .../Receipts/ReceiptAppService.cs | 10 +++++++ .../ScpV1AutoMapperProfile.cs | 2 +- .../Suppliers/SuppliersAppService.cs | 9 +++++- .../UnplannedReceiptAppService.cs | 11 ++++++++ .../Validator.cs | 28 +++++++++++++++++++ .../UnplannedReceipts/UnplannedReceipt.cs | 8 ++++++ .../WebApiDbContextModelCreatingExtensions.cs | 1 + .../20220110060855_Init.Designer.cs | 2 +- .../20220111031851_AddTraceID.Designer.cs | 2 +- .../20220113030842_Decimal.Designer.cs | 2 +- .../20220126082355_ModifyPoDetail.Designer.cs | 2 +- ...ErrorCodeAndErrorMessageToPart.Designer.cs | 2 +- ...dErrorCodeAndErrorMessageToAll.Designer.cs | 2 +- .../appsettings.json | 3 +- .../20220126072541_Init.Designer.cs | 2 +- .../Migrations/V1ScpDbContextModelSnapshot.cs | 2 +- ...n_in.Sfs.Scp.v1.EntityFrameworkCore.csproj | 2 +- 20 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptCreateDTO.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptCreateDTO.cs index ce7179a..c20e716 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptCreateDTO.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/UnplannedReceipts/UnplannedReceiptCreateDTO.cs @@ -90,6 +90,14 @@ public class UnplannedReceiptCreateDTO : EntityDto,ICanTrace public string SoJob { get; set; } + /// + /// 地址(Address) + /// + [XmlElement("address")] + [Display(Name = "地址(Address)")] + + public string Address { get; set; } + /// /// 备注(Remark) diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs index b5bb00b..a627ea3 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Parts/PartAppService.cs @@ -4,11 +4,14 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using AutoMapper; +using AutoMapper.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Uow; using Win_in.Sfs.Scp.v1.Domain; +using Microsoft.Extensions.Configuration; +using IConfiguration = Microsoft.Extensions.Configuration.IConfiguration; namespace Win_in.Sfs.Scp.WebApi { @@ -23,14 +26,17 @@ namespace Win_in.Sfs.Scp.WebApi { private readonly IPartRepository _partRepository; private readonly ITaPartRepository _taPartRepository; + private readonly string _validSites = Validator.VALID_SITES; public PartAppService( IPartRepository repository ,ITaPartRepository taPartRepository + ,IConfiguration configuration ) : base(repository) { _partRepository = repository; _taPartRepository = taPartRepository; + _validSites = configuration["ValidSites"]; } /// @@ -72,6 +78,7 @@ namespace Win_in.Sfs.Scp.WebApi try { + Validator.CheckSite(_validSites,entity.Site); await UpsertTaPartAsync(entity); await CurrentUnitOfWork.SaveChangesAsync(); } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs index e4b545e..7769c7e 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/PurchaseOrders/PurchaseOrderAppService.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win_in.Sfs.Scp.v1.Domain; @@ -20,16 +21,22 @@ namespace Win_in.Sfs.Scp.WebApi private readonly IPurchaseOrderRepository _purchaseOrderRepository; private readonly ITbPoRepository _tbPoRepository; private readonly ITbPoDetailRepository _tbPoDetailRepository; + private readonly ITaVenderRepository _taVenderRepository; + private readonly string _validSites = Validator.VALID_SITES; public PurchaseOrderAppService( IPurchaseOrderRepository repository , ITbPoRepository tbPoRepository , ITbPoDetailRepository tbPoDetailRepository + , ITaVenderRepository taVenderRepository + , IConfiguration configuration ) : base(repository) { _purchaseOrderRepository = repository; _tbPoRepository = tbPoRepository; _tbPoDetailRepository = tbPoDetailRepository; + _taVenderRepository = taVenderRepository; + _validSites = configuration["ValidSites"]; } @@ -75,6 +82,8 @@ namespace Win_in.Sfs.Scp.WebApi try { + Validator.CheckSite(_validSites,entity.Site); + Validator.CheckSupplierCode(_taVenderRepository,entity.Site, entity.SupplierCode); await UpsertTbPoAndTbPoDetailAsync(entity); await CurrentUnitOfWork.SaveChangesAsync(); diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs index 1dc429c..781d9f6 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Receipts/ReceiptAppService.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Uow; @@ -21,16 +22,23 @@ namespace Win_in.Sfs.Scp.WebApi private readonly IReceiptRepository _receiptRepository; private readonly ITbReceiptRepository _tbReceiptRepository; private readonly ITbReceiptDetailRepository _tbReceiptDetailRepository; + private readonly ITaVenderRepository _taVenderRepository; + private readonly string _validSites = Validator.VALID_SITES; public ReceiptAppService( IReceiptRepository repository ,ITbReceiptRepository tbReceiptRepository ,ITbReceiptDetailRepository tbReceiptDetailRepository + ,ITaVenderRepository taVenderRepository + , IConfiguration configuration ) : base(repository) { _receiptRepository = repository; _tbReceiptRepository = tbReceiptRepository; _tbReceiptDetailRepository = tbReceiptDetailRepository; + _taVenderRepository = taVenderRepository; + _validSites = configuration["ValidSites"]; + } @@ -74,6 +82,8 @@ namespace Win_in.Sfs.Scp.WebApi try { + Validator.CheckSite(_validSites,entity.Site); + Validator.CheckSupplierCode(_taVenderRepository,entity.Site, entity.SupplierCode); await UpsertTbReceiptAndTbReceiptDetailAsync(entity); await CurrentUnitOfWork.SaveChangesAsync(); diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ScpV1AutoMapperProfile.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ScpV1AutoMapperProfile.cs index f9963e3..84ad68d 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ScpV1AutoMapperProfile.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/ScpV1AutoMapperProfile.cs @@ -231,7 +231,7 @@ namespace Win_in.Sfs.Scp.WebApi .ForMember(p => p.RecvBillNum, p => p.MapFrom(q => q.TrNbr)) .ForMember(p => p.PoBillNum, p => p.MapFrom(q => "")) .ForMember(p => p.AsnBillNum, p => p.MapFrom(q => q.Order)) - .ForMember(p => p.VendId, p => p.MapFrom(q => q.SoJob))//默认值 + .ForMember(p => p.VendId, p => p.MapFrom(q => q.Address))//默认值 // .ForMember(p => p.ShipTime, p => p.MapFrom(q => DateTime.MinValue))//默认值 .ForMember(p => p.State, p => p.MapFrom(q => 1))//TODO .ForMember(p => p.Remark, p => p.MapFrom(q => q.Remark)) diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs index 2172970..239f133 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Suppliers/SuppliersAppService.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Uow; @@ -21,13 +22,18 @@ namespace Win_in.Sfs.Scp.WebApi { private readonly ISupplierRepository _supplierRepository; private readonly ITaVenderRepository _taVenderRepository; + private readonly string _validSites = Validator.VALID_SITES; public SuppliersAppService( ISupplierRepository repository - ,ITaVenderRepository taVenderRepository) : base(repository) + ,ITaVenderRepository taVenderRepository + , IConfiguration configuration + ) : base(repository) { _supplierRepository = repository; _taVenderRepository = taVenderRepository; + _validSites = configuration["ValidSites"]; + } @@ -70,6 +76,7 @@ namespace Win_in.Sfs.Scp.WebApi try { + Validator.CheckSite(_validSites,entity.Company); UpsertTaVenderAsync(entity).Wait(); await CurrentUnitOfWork.SaveChangesAsync(); diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/UnplannedReceipts/UnplannedReceiptAppService.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/UnplannedReceipts/UnplannedReceiptAppService.cs index db6425e..ba06624 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/UnplannedReceipts/UnplannedReceiptAppService.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/UnplannedReceipts/UnplannedReceiptAppService.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Uow; @@ -21,16 +22,23 @@ namespace Win_in.Sfs.Scp.WebApi private readonly IUnplannedReceiptRepository _unplannedReceiptRepository; private readonly ITbReceiptRepository _tbReceiptRepository; private readonly ITbReceiptDetailRepository _tbReceiptDetailRepository; + private readonly ITaVenderRepository _taVenderRepository; + private readonly string _validSites = Validator.VALID_SITES; public UnplannedReceiptAppService( IUnplannedReceiptRepository repository , ITbReceiptRepository tbReceiptRepository , ITbReceiptDetailRepository tbReceiptDetailRepository + , ITaVenderRepository taVenderRepository + , IConfiguration configuration ) : base(repository) { _unplannedReceiptRepository = repository; _tbReceiptRepository = tbReceiptRepository; _tbReceiptDetailRepository = tbReceiptDetailRepository; + _taVenderRepository = taVenderRepository; + _validSites = configuration["ValidSites"]; + } @@ -73,6 +81,9 @@ namespace Win_in.Sfs.Scp.WebApi try { + Validator.CheckSite(_validSites,entity.Site); + Validator.CheckSupplierCode(_taVenderRepository,entity.Site, entity.Address); + await UpsertTbReceiptAndTbReceiptDetailAsync(entity); await CurrentUnitOfWork.SaveChangesAsync(); diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs new file mode 100644 index 0000000..2ae2e11 --- /dev/null +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Validator.cs @@ -0,0 +1,28 @@ +using System.Collections.Generic; +using System.Linq; +using System.Linq.Dynamic.Core; +using Volo.Abp; +using Win_in.Sfs.Scp.v1.Domain; + +namespace Win_in.Sfs.Scp.WebApi; + +public static class Validator +{ + public const string VALID_SITES = "T8"; + + public static void CheckSite(string validSites,string site) + { + if (!validSites.Contains(site) ) + { + throw new UserFriendlyException($"Site must be in [{validSites}]"); + } + } + + public static void CheckSupplierCode(ITaVenderRepository taVenderRepository, string site, string supplierCode) + { + if (!taVenderRepository.Any(p =>p.Site==site && p.VendId == supplierCode)) + { + throw new UserFriendlyException($"Wrong supplier code: '{supplierCode}' of Site : '{site}'"); + } + } +} diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/UnplannedReceipts/UnplannedReceipt.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/UnplannedReceipts/UnplannedReceipt.cs index cd2fbb8..fa68125 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/UnplannedReceipts/UnplannedReceipt.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain/UnplannedReceipts/UnplannedReceipt.cs @@ -78,6 +78,14 @@ namespace Win_in.Sfs.Scp.WebApi public string SoJob { get; set; } + /// + /// 地址(Address) + /// + [Display(Name = "地址(Address)")] + + public string Address { get; set; } + + /// /// 备注(Remark) /// diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/DbContext/WebApiDbContextModelCreatingExtensions.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/DbContext/WebApiDbContextModelCreatingExtensions.cs index 30287ea..e226f76 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/DbContext/WebApiDbContextModelCreatingExtensions.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/DbContext/WebApiDbContextModelCreatingExtensions.cs @@ -267,6 +267,7 @@ namespace Win_in.Sfs.Scp.WebApi.EntityFrameworkCore b.Property(q => q.Uom).IsRequired().HasMaxLength(8); b.Property(q => q.Qty).IsRequired().HasPrecision(18, 6); b.Property(q => q.SoJob).HasMaxLength(20); + b.Property(q => q.Address).HasMaxLength(8); b.Property(q => q.Remark).HasMaxLength(4096); b.Property(q => q.Site).IsRequired().HasMaxLength(8); b.Property(q => q.Company).IsRequired().HasMaxLength(8); diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220110060855_Init.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220110060855_Init.Designer.cs index d4fa628..42f3f2e 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220110060855_Init.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220110060855_Init.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220111031851_AddTraceID.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220111031851_AddTraceID.Designer.cs index f9f34fd..af949c1 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220111031851_AddTraceID.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220111031851_AddTraceID.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220113030842_Decimal.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220113030842_Decimal.Designer.cs index a4e3b9f..8e47178 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220113030842_Decimal.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220113030842_Decimal.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126082355_ModifyPoDetail.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126082355_ModifyPoDetail.Designer.cs index 2ca4adf..c0e4c92 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126082355_ModifyPoDetail.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126082355_ModifyPoDetail.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126092735_AddErrorCodeAndErrorMessageToPart.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126092735_AddErrorCodeAndErrorMessageToPart.Designer.cs index c95c62c..c545eae 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126092735_AddErrorCodeAndErrorMessageToPart.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220126092735_AddErrorCodeAndErrorMessageToPart.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220127010533_AddErrorCodeAndErrorMessageToAll.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220127010533_AddErrorCodeAndErrorMessageToAll.Designer.cs index 103ea9a..3c86941 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220127010533_AddErrorCodeAndErrorMessageToAll.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220127010533_AddErrorCodeAndErrorMessageToAll.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json index 5292935..72b7f7c 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/appsettings.json @@ -34,5 +34,6 @@ } } }, - "AlwaysAllowAuthorization": true + "AlwaysAllowAuthorization": true, + "ValidSites":"T8," } \ No newline at end of file diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/20220126072541_Init.Designer.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/20220126072541_Init.Designer.cs index f09ea5c..939bf9c 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/20220126072541_Init.Designer.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/20220126072541_Init.Designer.cs @@ -20,7 +20,7 @@ namespace Win_in.Sfs.Scp.v1.EntityFrameworkCore.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Win_in.Sfs.Scp.v1.Domain.TA_PART", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/V1ScpDbContextModelSnapshot.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/V1ScpDbContextModelSnapshot.cs index f385de7..2b7dd4c 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/V1ScpDbContextModelSnapshot.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Migrations/V1ScpDbContextModelSnapshot.cs @@ -18,7 +18,7 @@ namespace Win_in.Sfs.Scp.v1.EntityFrameworkCore.Migrations modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) .HasAnnotation("Relational:MaxIdentifierLength", 128) - .HasAnnotation("ProductVersion", "5.0.13") + .HasAnnotation("ProductVersion", "5.0.9") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); modelBuilder.Entity("Win_in.Sfs.Scp.v1.Domain.TA_PART", b => diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj index a59681b..a9a3eba 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Win_in.Sfs.Scp.v1.EntityFrameworkCore.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive