From 9479a92a730b2f624f4b5300f055c0ad878d84e6 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: Tue, 11 Jul 2023 11:40:34 +0800 Subject: [PATCH] UPDATE --- .../Controllers/BBAC_CAN_SAController.cs | 13 +++--- .../BBAC_NOT_SA_DETAILController.cs | 11 +++-- .../Identity/Controllers/BBAC_SAController.cs | 33 ++++++++------- .../Controllers/BBAC_SE_REPORTController.cs | 10 ++--- .../Controllers/BJ_PUB_CAN_SAController.cs | 6 +++ .../BJ_PUB_NOT_SA_DETAILController.cs | 6 +++ .../Controllers/BJ_PUB_PD_DETAILController.cs | 6 +++ .../Controllers/HBPO_CAN_SAController.cs | 11 +++-- .../HBPO_NOT_SA_DETAILController.cs | 11 +++-- .../Identity/Controllers/HBPO_SAController.cs | 35 ++++++++-------- .../INVOICE_MAP_GROUPController.cs | 41 +++++++++++++++++++ .../INVOICE_NOT_SETTLEController.cs | 41 +++++++++++++++++++ .../INVOICE_WAIT_DETAILController.cs | 41 +++++++++++++++++++ .../Controllers/IN_PUB_CAN_SAController.cs | 6 +++ .../IN_PUB_NOT_SA_DETAILController.cs | 6 +++ .../Controllers/IN_PUB_PD_DETAILController.cs | 8 +++- .../Controllers/JIT_PUB_CAN_SAController.cs | 6 +++ .../JIT_PUB_NOT_SA_DETAILController.cs | 6 +++ .../JIT_PUB_PD_DETAILController.cs | 6 +++ .../Controllers/MaterialController.cs | 4 +- .../MaterialRelationshipController.cs | 8 ---- .../Identity/Data/IdentityDbSeed.cs | 14 +------ .../Entities/SystemManagement/BBAC_CAN_SA.cs | 2 +- .../Entities/SystemManagement/INVOICE_GRP.cs | 2 + 24 files changed, 244 insertions(+), 89 deletions(-) create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_MAP_GROUPController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_NOT_SETTLEController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_WAIT_DETAILController.cs diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs index c56b538a..2e29841b 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using WTA.Application.Identity.Entities.SystemManagement; -using WTA.Shared.Application; using WTA.Shared.Attributes; using WTA.Shared.Controllers; using WTA.Shared.Data; @@ -28,11 +27,11 @@ public class BBAC_CAN_SAController : GenericController model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } + //[NonAction] + //public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + //{ + // return base.Export(model, includeAll, includeDeleted); + //} [NonAction] public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) @@ -40,7 +39,7 @@ public class BBAC_CAN_SAController : GenericController model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } + //[NonAction] + //public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + //{ + // return base.Export(model, includeAll, includeDeleted); + //} [NonAction] public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs index 80696e58..1b938fab 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using WTA.Application.Identity.Entities.SystemManagement; using WTA.Shared.Application; -using WTA.Shared.Attributes; using WTA.Shared.Controllers; using WTA.Shared.Data; @@ -16,11 +15,11 @@ public class BBAC_SAController : GenericController model, bool includeAll = false, bool includeDeleted = false) diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SAController.cs index e61eabbb..11f1bdf3 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SAController.cs @@ -30,6 +30,12 @@ public class BJ_PUB_CAN_SAController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) + { + return this._genericController.Export(model, includeAll, includeDeleted); + } + [HttpPost, Multiple, Display(Name = "生成发票数据")] public virtual IActionResult? GenerateInvoice() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs index 898e126f..d4ffd405 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs @@ -30,6 +30,12 @@ public class BJ_PUB_NOT_SA_DETAILController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) + { + return this._genericController.Export(model, includeAll, includeDeleted); + } + [HttpPost, Multiple, Display(Name = "生成可结算单")] public virtual IActionResult? GenerateSettlementOrder() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs index a8fee760..272bc540 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs @@ -41,6 +41,12 @@ public class BJ_PUB_PD_DETAILController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } + //[NonAction] + //public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + //{ + // return base.Export(model, includeAll, includeDeleted); + //} [NonAction] public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs index 45df727a..315ad567 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using WTA.Application.Identity.Entities.SystemManagement; -using WTA.Shared.Application; using WTA.Shared.Attributes; using WTA.Shared.Controllers; using WTA.Shared.Data; @@ -28,11 +27,11 @@ public class HBPO_NOT_SA_DETAILController : GenericController model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } + //[NonAction] + //public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + //{ + // return base.Export(model, includeAll, includeDeleted); + //} [NonAction] public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs index 3838df6d..b7d29d56 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using WTA.Application.Identity.Entities.SystemManagement; using WTA.Shared.Application; -using WTA.Shared.Attributes; using WTA.Shared.Controllers; using WTA.Shared.Data; @@ -34,21 +33,21 @@ public class HBPO_SAController : GenericController +{ + public INVOICE_MAP_GROUPController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] INVOICE_MAP_GROUP model) + { + return base.Create(model); + } + + [NonAction] + public override IActionResult Delete([FromBody] Guid[] guids) + { + return base.Delete(guids); + } + + [NonAction] + public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + { + return base.Import(file, partial, replace); + } + + [NonAction] + public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + { + return base.Export(model, includeAll, includeDeleted); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_NOT_SETTLEController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_NOT_SETTLEController.cs new file mode 100644 index 00000000..2f248380 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_NOT_SETTLEController.cs @@ -0,0 +1,41 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http; +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 INVOICE_NOT_SETTLEController : GenericController +{ + public INVOICE_NOT_SETTLEController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Delete([FromBody] Guid[] guids) + { + return base.Delete(guids); + } + + [NonAction] + public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + { + return base.Export(model, includeAll, includeDeleted); + } + + [NonAction] + public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + { + return base.Import(file, partial, replace); + } + + [NonAction] + public override IActionResult Create([FromBody] INVOICE_NOT_SETTLE model) + { + return base.Create(model); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_WAIT_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_WAIT_DETAILController.cs new file mode 100644 index 00000000..a7e41d7f --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_WAIT_DETAILController.cs @@ -0,0 +1,41 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Http; +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 INVOICE_WAIT_DETAILController : GenericController +{ + public INVOICE_WAIT_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] INVOICE_WAIT_DETAIL model) + { + return base.Create(model); + } + + [NonAction] + public override IActionResult Delete([FromBody] Guid[] guids) + { + return base.Delete(guids); + } + + [NonAction] + public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + { + return base.Export(model, includeAll, includeDeleted); + } + + [NonAction] + public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + { + return base.Import(file, partial, replace); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SAController.cs index 3a095096..9e3ece6c 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SAController.cs @@ -30,6 +30,12 @@ public class IN_PUB_CAN_SAController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) + { + return this._genericController.Export(model, includeAll, includeDeleted); + } + [HttpPost, Multiple, Display(Name = "生成发票数据")] public virtual IActionResult? GenerateInvoice() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_NOT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_NOT_SA_DETAILController.cs index d629ae4c..d3368807 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_NOT_SA_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_NOT_SA_DETAILController.cs @@ -30,6 +30,12 @@ public class IN_PUB_NOT_SA_DETAILController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) + { + return this._genericController.Export(model, includeAll, includeDeleted); + } + [HttpPost, Multiple, Display(Name = "生成可结算单")] public virtual IActionResult? GenerateSettlementOrder() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_PD_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_PD_DETAILController.cs index 79fd7143..c025d9ef 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_PD_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_PD_DETAILController.cs @@ -41,10 +41,16 @@ public class IN_PUB_PD_DETAILController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) + { + return this._genericController.Export(model, includeAll, includeDeleted); + } } [Display(Name = "可结算单")] diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_NOT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_NOT_SA_DETAILController.cs index 740d4a1b..cd888f02 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_NOT_SA_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_NOT_SA_DETAILController.cs @@ -30,6 +30,12 @@ public class JIT_PUB_NOT_SA_DETAILController : BaseController, IResourceService< return this._genericController.Index(model); } + [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")] + public virtual IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + { + return this._genericController.Export(model, includeAll, includeDeleted); + } + [HttpPost, Multiple, Display(Name = "生成可结算单")] public virtual IActionResult? GenerateSettlementOrder() { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_PD_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_PD_DETAILController.cs index 067a8e07..0afdf01e 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_PD_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_PD_DETAILController.cs @@ -41,6 +41,12 @@ public class JIT_PUB_PD_DETAILController : BaseController, IResourceService context.Set().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" }); context.Set().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); context.Set().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); - context.Set().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" }); - context.Set().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" }); + context.Set().Add(new INVOICE_GRP { Version = "测试数据", RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" }); + context.Set().Add(new INVOICE_GRP { Version = "测试数据", RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" }); context.Set().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细123", InvGroupNum = "待开票明细分组号测试数据一", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" }); context.Set().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细456", InvGroupNum = "待开票明细分组号测试数据二", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" }); context.Set().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系123", InvGroupNum = "发票和结算分组对应关系分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); 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 PUB_SA { Version = "测试数据", BillNum = "一号", State = "测试数据" }); - context.Set().Add(new PUB_SA { Version = "测试数据", BillNum = "二号", State = "测试数据" }); - 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_CAN_SA { Version = "测试数据", BillNum = "一号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", State = "测试数据" }); - context.Set().Add(new PUB_CAN_SA { Version = "测试数据", BillNum = "二号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", State = "测试数据" }); - context.Set().Add(new PUB_CAN_SA_DETAIL { Version = "测试数据", BillNum = "一号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate=new DateTime(), GroupNum= "测试数据",KeyCode= "测试数据" }); - context.Set().Add(new PUB_CAN_SA_DETAIL { Version = "测试数据", BillNum = "二号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate=new DateTime(), GroupNum= "测试数据",KeyCode="测试数据" }); - } private static void InitDictionaries(DbContext context) diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs index 30f134dc..1d26e962 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs @@ -5,7 +5,7 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISBBACSettlementInvoicingGroup] -[Display(Name = "可结算单")] +[Display(Name = "发票分组号")] [Order(1)] //BBAC可结算导入 public class BBAC_CAN_SA : BaseEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_GRP.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_GRP.cs index f07d0c02..1b1c860a 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_GRP.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_GRP.cs @@ -9,6 +9,8 @@ namespace WTA.Application.Identity.Entities.SystemManagement; //发票分组 public class INVOICE_GRP : BaseEntity { + [Display(Name = "期间")] + public string Version { get; set; } = null!; [Display(Name = "实际纸质发票号")] public string RealnvBillNum { get; set; } = null!; [OneToMany]