From 0f7d598a6fd07465079daf66f97ad1e49fade092 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 17:19:24 +0800 Subject: [PATCH] update --- .../Controllers/CodeSettingController.cs | 32 +++++++++++++++++++ .../Identity/Data/IdentityDbSeed.cs | 10 ++++++ .../SystemManagement/BBAC_SE_DETAIL.cs | 2 +- .../Entities/SystemManagement/CodeSetting.cs | 29 +++++++++++++++++ .../SystemManagement/HBPO_NOT_SA_DETAIL.cs | 2 ++ .../Entities/SystemManagement/HBPO_SA.cs | 1 + .../SystemManagement/HBPO_SE_DETAIL.cs | 3 +- .../Entities/SystemManagement/HBPO_SE_EDI.cs | 2 ++ 8 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/CodeSettingController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CodeSetting.cs diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/CodeSettingController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/CodeSettingController.cs new file mode 100644 index 00000000..db3a32b9 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/CodeSettingController.cs @@ -0,0 +1,32 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Shared.Application; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class CodeSettingController : GenericController +{ + public CodeSettingController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [Display(Name = "导出Excel")] + public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + { + return base.Export(model, includeAll, includeDeleted); + } + [Display(Name = "搜索")] + public override IActionResult Index([FromBody] PaginationModel model) + { + return base.Index(model); + } + [Display(Name = "新增")] + public override IActionResult Create([FromBody] CodeSetting model) + { + return base.Create(model); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs index 8c1d841c..214a9e21 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs @@ -172,10 +172,20 @@ public class IdentityDbSeed : IDbSeed 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 BBAC_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 { Version = "测试数据", State = "测试数据", BillNum = "3号测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "一号测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "二号测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "三号测试数据" }); 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 = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "3号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "一号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "二号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "三号测试数据", 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/BBAC_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_DETAIL.cs index 4d2a8004..f84ac70e 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_DETAIL.cs @@ -5,7 +5,7 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Order(4)] +[Order(2)] [JISBBACDataInputGroup] [Display(Name = "JIS发运数据")] //BBAC发运单 diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CodeSetting.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CodeSetting.cs new file mode 100644 index 00000000..ca38904d --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CodeSetting.cs @@ -0,0 +1,29 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; + +[SystemManagement] +[Order(4)] +[Display(Name = "通用代码")] +public class CodeSetting : BaseEntity +{ + /// + /// 项目 + /// + [Display(Name = "项目")] + public string Project { set; get; } = null!; + + /// + /// 值 + /// + [Display(Name = "值")] + public string Value { set; get; } = null!; + + /// + /// 描述 + /// + [Display(Name = "描述")] + public string Description { set; get; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs index 98177610..c3613e89 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs @@ -1,5 +1,6 @@ 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; @@ -29,6 +30,7 @@ namespace WTA.Application.Identity.Entities.SystemManagement; // [Display(Name = "明细记录行数")] // public string RecordCount { get; set; } = null!; //} +[Order(2)] [JISHBPOSettlementInvoicingGroup] [Display(Name = "不可结算单")] //HBPO不可结算导入明细 diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SA.cs index 7fa6e32d..74489aae 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SA.cs @@ -4,6 +4,7 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; +[Order(1)] [JISHBPODataInputGroup] [Display(Name = "JIS结算数据")] //HBPO结算导入 diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs index 55c5bf25..2b543d5e 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs @@ -1,9 +1,10 @@ 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; - +[Order(2)] [Display(Name = "JIS发运数据")] //HBPO发运数据 [JISHBPODataInputGroup] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs index 7617b0e8..5cdcd2db 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs @@ -1,8 +1,10 @@ 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; +[Order(3)] [JISHBPODataInputGroup] [Display(Name = "EDI数据")] //HBPO的EDI数据