From 23f81799edc7ac0942b40705096cf1859cd51d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Wed, 12 Jul 2023 11:51:41 +0800 Subject: [PATCH] update --- .../Controllers/BBAC_PD_DETAILController.cs | 1 + .../Controllers/BBAC_SE_DETAILController.cs | 4 - .../CentralizedControlController.cs | 2 +- .../Controllers/HBPO_SE_DETAILController.cs | 8 +- .../Controllers/INVOICE_GRPController.cs | 4 +- .../Controllers/JIT_PUB_SAController.cs | 12 + .../Identity/Data/Config/BaseDataDbConfig.cs | 244 ++---------------- .../Identity/Data/IdentityDbSeed.cs | 5 + .../Entities/SystemManagement/Department.cs | 2 +- .../SystemManagement/JIT_SE_SA_REPORT.cs | 2 +- .../Entities/SystemManagement/Material.cs | 2 +- .../Entities/SystemManagement/PUB_SA.cs | 2 +- .../Entities/SystemManagement/Permission.cs | 2 +- .../Entities/SystemManagement/Post.cs | 2 +- .../Entities/SystemManagement/Role.cs | 2 +- .../Attributes/OneToManyAttribute.cs | 2 +- 16 files changed, 51 insertions(+), 245 deletions(-) diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs index 65fdd5f7..e45d213d 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs @@ -44,4 +44,5 @@ public class BBAC_PD_DETAILController : GenericController - /// 未确定 - /// - /// [HttpPost, Display(Name = "同步"), Multiple] public IActionResult? Synchronous() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs index 2e923890..10745c2f 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs @@ -38,7 +38,7 @@ public class CentralizedControlController : GenericController - /// 未确定 - /// - /// [HttpPost, Display(Name = "同步"), Multiple] public IActionResult? Synchronous() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs index 44c25b70..b93754e9 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs @@ -46,8 +46,8 @@ public class INVOICE_GRPController : GenericController [Order(1)] public class JIT_PUB_SA : IResource { + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单据")] + [OneToMany] + public string BillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; } diff --git a/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs b/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs index eded0d34..f9e881e0 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs @@ -11,78 +11,23 @@ IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -//IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, @@ -101,7 +46,8 @@ IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration +IEntityTypeConfiguration, +IEntityTypeConfiguration { public void Configure(EntityTypeBuilder builder) { } @@ -112,21 +58,12 @@ IEntityTypeConfiguration public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } @@ -139,165 +76,27 @@ IEntityTypeConfiguration public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } @@ -310,33 +109,12 @@ IEntityTypeConfiguration public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } public void Configure(EntityTypeBuilder builder) { } - //public void Configure(EntityTypeBuilder builder) - //{ } - public void Configure(EntityTypeBuilder builder) { } @@ -351,32 +129,50 @@ IEntityTypeConfiguration public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) { } + + public void Configure(EntityTypeBuilder builder) + { } + } diff --git a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs index 6887bcc3..8c1d841c 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs @@ -171,6 +171,11 @@ public class IdentityDbSeed : IDbSeed context.Set().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系456", InvGroupNum = "发票和结算分组对应关系分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); context.Set().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); context.Set().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); + context.Set().Add(new HBPO_SE_REPORT { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", SeqNumber = "测试数据", AssemblyCode = "测试数据", InjectionCode = "测试数据", BeginDate = new DateTime(), ShippingDate = new DateTime(), WmsBillNum = "测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "1号测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "2号测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "1号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "2号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); } private static void InitDictionaries(DbContext context) diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs index d08417a9..31735380 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs @@ -2,7 +2,7 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - +[Hidden] [Order(4)] [SystemManagement] public class Department : BaseTreeEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs index b040cc03..799690e5 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs @@ -1,9 +1,9 @@ using System.ComponentModel.DataAnnotations; -using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; + [Hidden] [Display(Name = "JIT发运数据与结算数据对比实体")] public class JIT_SE_SA_REPORT : BaseEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs index 3a0c935f..ac8abcfb 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs @@ -4,7 +4,7 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Order(7)] +[Order(2)] [SystemManagement] [Display(Name = "物料主数据")] public class Material : BaseEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs index aeb07fa0..3adbf451 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs @@ -39,7 +39,7 @@ public class PUB_SA_DETAIL : BaseEntity /// /// 结算单号 /// - [Display(Name = "结算单号")] + [Display(Name = "结算单据")] public string BillNum { get; set; } = null!; /// diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs index 64a5c933..71cc2cb7 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs @@ -3,7 +3,7 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - +[Hidden] [Order(3)] [SystemManagement] public class Permission : BaseTreeEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs index 4f76e75e..6dceb6d1 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs @@ -2,7 +2,7 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - +[Hidden] [Order(5)] [SystemManagement] public class Post : BaseEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs index c13eb638..27b99de4 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs @@ -2,7 +2,7 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - +[Hidden] [Order(2)] [SystemManagement] public class Role : BaseEntity diff --git a/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs b/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs index d38b45db..ef50797f 100644 --- a/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs +++ b/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs @@ -1,6 +1,6 @@ namespace WTA.Shared.Attributes; -[AttributeUsage(AttributeTargets.Property,AllowMultiple =true)] +[AttributeUsage(AttributeTargets.Property, AllowMultiple = true)] public class OneToManyAttribute : Attribute, ITypeAttribute { public Type Type { get; set; } = null!;