From 23e3c45e3eba3e7d0b27c09241a98596a2567806 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: Mon, 10 Jul 2023 16:36:35 +0800 Subject: [PATCH] update --- .../Controllers/BBAC_CAN_SAController.cs | 48 +++++++++++++ .../BBAC_CAN_SA_DETAILController.cs | 41 +++++++++++ .../BBAC_NOT_SA_DETAILController.cs | 48 +++++++++++++ .../Controllers/BBAC_PD_DETAILController.cs | 47 ++++++++++++ .../Identity/Controllers/BBAC_SAController.cs | 4 +- .../Controllers/BBAC_SA_DETAILController.cs | 1 - .../Controllers/BBAC_SE_DETAILController.cs | 1 + .../Controllers/BBAC_SE_EDIController.cs | 34 +++++++++ .../Controllers/BBAC_SE_REPORTController.cs | 6 ++ .../BJ_JIT_SE_SA_REPORTController.cs | 57 +++++++++++++++ .../Controllers/BJ_PUB_CAN_SAController.cs | 25 ++----- .../BJ_PUB_CAN_SA_DETAILController.cs | 10 +-- .../BJ_PUB_NOT_SA_DETAILController.cs | 45 ++++++++++++ .../Controllers/BJ_PUB_PD_DETAILController.cs | 50 +++++++++++++ .../Controllers/BJ_PUB_SAController.cs | 60 ++++++++++++++++ .../Controllers/BJ_PUB_SA_DETAILController.cs | 46 ++++++++++++ .../Controllers/BJ_PUB_SE_DETAILController.cs | 6 ++ .../Identity/Controllers/BOMController.cs | 10 ++- .../CentralizedControlController.cs | 34 +++++++++ .../Controllers/HBPO_CAN_SAController.cs | 48 +++++++++++++ .../HBPO_CAN_SA_DETAILController.cs | 41 +++++++++++ .../HBPO_NOT_SA_DETAILController.cs | 48 +++++++++++++ .../Controllers/HBPO_PD_DETAILController.cs | 47 ++++++++++++ .../Identity/Controllers/HBPO_SAController.cs | 4 +- .../Controllers/HBPO_SA_DETAILController.cs | 1 - .../Controllers/HBPO_SE_DETAILController.cs | 3 +- .../Controllers/HBPO_SE_EDIController.cs | 34 +++++++++ .../Controllers/HBPO_SE_REPORTController.cs | 12 ++-- .../Controllers/INVOICE_GRPController.cs | 6 ++ .../IN_JIT_SE_SA_REPORTController.cs | 57 +++++++++++++++ .../Controllers/IN_PUB_CAN_SAController.cs | 25 ++----- .../IN_PUB_CAN_SA_DETAILController.cs | 11 +-- .../IN_PUB_NOT_SA_DETAILController.cs | 45 ++++++++++++ .../Controllers/IN_PUB_PD_DETAILController.cs | 50 +++++++++++++ .../Controllers/IN_PUB_SAController.cs | 60 ++++++++++++++++ .../Controllers/IN_PUB_SA_DETAILController.cs | 47 ++++++++++++ .../Controllers/IN_PUB_SE_DETAILController.cs | 17 +++-- .../JIT_JIT_SE_SA_REPORTController.cs | 57 +++++++++++++++ .../Controllers/JIT_PUB_CAN_SAController.cs | 25 ++----- .../JIT_PUB_CAN_SA_DETAILController.cs | 10 +-- .../JIT_PUB_NOT_SA_DETAILController.cs | 45 ++++++++++++ .../JIT_PUB_PD_DETAILController.cs | 50 +++++++++++++ .../Controllers/JIT_PUB_SAController.cs | 72 +++++++++++++++++++ .../JIT_PUB_SA_DETAILController.cs | 46 ++++++++++++ .../JIT_PUB_SE_DETAILController.cs | 6 ++ .../Controllers/MaterialController.cs | 10 ++- .../Second_BBAC_SE_SA_REPORTController.cs | 57 +++++++++++++++ .../Second_HBPO_SE_SA_REPORTController.cs | 57 +++++++++++++++ .../Controllers/TB_PRICE_LISTController.cs | 1 - .../Third_BBAC_SE_SA_REPORTController.cs | 57 +++++++++++++++ .../Entities/SystemManagement/BBAC_CAN_SA.cs | 3 +- .../SystemManagement/BBAC_NOT_SA_DETAIL.cs | 2 + .../SystemManagement/BBAC_PD_DETAIL.cs | 2 + .../Entities/SystemManagement/HBPO_CAN_SA.cs | 2 + .../SystemManagement/HBPO_PD_DETAIL.cs | 2 + .../SystemManagement/HBPO_SE_SA_REPORT.cs | 3 +- 56 files changed, 1515 insertions(+), 121 deletions(-) create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_NOT_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_EDIController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_JIT_SE_SA_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_PD_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_EDIController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_JIT_SE_SA_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_NOT_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_PD_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_JIT_SE_SA_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_NOT_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_PD_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/Second_BBAC_SE_SA_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/Second_HBPO_SE_SA_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/Third_BBAC_SE_SA_REPORTController.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 new file mode 100644 index 00000000..c56b538a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SAController.cs @@ -0,0 +1,48 @@ +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.Attributes; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class BBAC_CAN_SAController : GenericController +{ + public BBAC_CAN_SAController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] BBAC_CAN_SA 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); + } + + [Multiple, Display(Name = "生成发票数据")] + public IActionResult? GenerateInvoice() + { + return null; + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SA_DETAILController.cs new file mode 100644 index 00000000..0a8e5c0a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_CAN_SA_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 BBAC_CAN_SA_DETAILController : GenericController +{ + public BBAC_CAN_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] BBAC_CAN_SA_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/BBAC_NOT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_NOT_SA_DETAILController.cs new file mode 100644 index 00000000..b2deb79c --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_NOT_SA_DETAILController.cs @@ -0,0 +1,48 @@ +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.Attributes; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class BBAC_NOT_SA_DETAILController : GenericController +{ + public BBAC_NOT_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] BBAC_NOT_SA_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); + } + + [Multiple, Display(Name = "生成可结算单")] + public IActionResult? GenerateSettlementOrder() + { + return null; + } +} 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 new file mode 100644 index 00000000..65fdd5f7 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs @@ -0,0 +1,47 @@ +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.Attributes; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class BBAC_PD_DETAILController : GenericController +{ + public BBAC_PD_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] BBAC_PD_DETAIL 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); + } + + [HttpPost, Display(Name = "审核通过"), Multiple] + public IActionResult? ApprovalPassed() + { + return null; + } + + [HttpPost, Display(Name = "退回"), Multiple] + public IActionResult? Reject() + { + return null; + } +} 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 0dfbecaa..80696e58 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SAController.cs @@ -23,9 +23,9 @@ public class BBAC_SAController : GenericController /// 未确定 /// diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_EDIController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_EDIController.cs new file mode 100644 index 00000000..3603a33f --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_EDIController.cs @@ -0,0 +1,34 @@ +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.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class BBAC_SE_EDIController : GenericController +{ + public BBAC_SE_EDIController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] BBAC_SE_EDI 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); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs index c74300de..587eefdb 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs @@ -51,4 +51,10 @@ public class BBAC_SE_REPORTController : GenericController +{ + private readonly GenericController _genericController; + + public BJ_JIT_SE_SA_REPORTController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpPost, Display(Name = "下载")] + public virtual IActionResult? DownloadAsync() + { + return null; + } + + [HttpPost, Display(Name = "生成对比"), Multiple] + public virtual IActionResult? Comparison() + { + return null; + } +} + +[Order(2)] +[Display(Name = "发运与结算二次比对")] +[BJDataComparisonGroup] +public class BJ_JIT_SE_SA_REPORT : IResource +{ +} 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 1dee8766..e61eabbb 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 @@ -1,6 +1,4 @@ using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using WTA.Application.Identity.Entities.SystemManagement; using WTA.Application.Identity.Entities.SystemManagement.Group; @@ -32,29 +30,16 @@ public class BJ_PUB_CAN_SAController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) - { - return this._genericController.Export(model, includeAll, includeDeleted); - } } [Hidden] -[Display(Name = "结算数据")] -[BJDataInputGroup] +[Display(Name = "可结算单明细")] +[BJSettlementInvoicingGroup] public class BJ_PUB_CAN_SA_DETAIL : IResource { } 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 new file mode 100644 index 00000000..898e126f --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_NOT_SA_DETAILController.cs @@ -0,0 +1,45 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class BJ_PUB_NOT_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_NOT_SA_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Display(Name = "生成可结算单")] + public virtual IActionResult? GenerateSettlementOrder() + { + return null; + } +} + +[Order(2)] +[Display(Name = "不可结算单")] +[BJSettlementInvoicingGroup] +public class BJ_PUB_NOT_SA_DETAIL : IResource +{ +} 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 new file mode 100644 index 00000000..a8fee760 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_PD_DETAILController.cs @@ -0,0 +1,50 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class BJ_PUB_PD_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_PD_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + 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? ApprovalPassed() + { + return null; + } +} + +[Order(4)] +[Display(Name = "寄售库库存扣减审批")] +[BJSettlementInvoicingGroup] +public class BJ_PUB_PD_DETAIL : IResource +{ } diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SAController.cs new file mode 100644 index 00000000..27a5955d --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SAController.cs @@ -0,0 +1,60 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class BJ_PUB_SAController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_SAController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpGet, AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")] + public virtual IActionResult Import() + { + return this._genericController.Import(); + } + + [Consumes("multipart/form-data")] + [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")] + public virtual IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + { + return this._genericController.Import(file, partial, replace); + } +} + +[Order(1)] +[BJDataInputGroup] +[Display(Name = "结算数据")] +public class BJ_PUB_SA : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SA_DETAILController.cs new file mode 100644 index 00000000..0ed64cc2 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SA_DETAILController.cs @@ -0,0 +1,46 @@ +using System.ComponentModel.DataAnnotations; +using DocumentFormat.OpenXml.Wordprocessing; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class BJ_PUB_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_SA_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + 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); + } +} + +[Hidden] +[Display(Name = "结算数据明细")] +[BJDataInputGroup] +public class BJ_PUB_SA_DETAIL : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs index 99bbe143..f2db7cba 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs @@ -36,6 +36,12 @@ public class BJ_PUB_SE_DETAILController : BaseController, IResourceService { public BOMController(ILogger logger, IRepository repository) : base(logger, repository) { } + [NonAction] public override IActionResult Create([FromBody] BOM 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) { diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs new file mode 100644 index 00000000..b5c43b6a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs @@ -0,0 +1,34 @@ +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.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class CentralizedControlController : GenericController +{ + public CentralizedControlController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [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] CentralizedControl model) + { + return base.Create(model); + } + + [NonAction] + public override IActionResult Delete([FromBody] Guid[] guids) + { + return base.Delete(guids); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SAController.cs new file mode 100644 index 00000000..a53d68a0 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SAController.cs @@ -0,0 +1,48 @@ +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.Attributes; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class HBPO_CAN_SAController : GenericController +{ + public HBPO_CAN_SAController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] HBPO_CAN_SA 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); + } + + [Multiple, Display(Name = "生成发票数据")] + public IActionResult? GenerateInvoice() + { + return null; + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SA_DETAILController.cs new file mode 100644 index 00000000..a479ac4e --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_CAN_SA_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 HBPO_CAN_SA_DETAILController : GenericController +{ + public HBPO_CAN_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] HBPO_CAN_SA_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/HBPO_NOT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs new file mode 100644 index 00000000..45df727a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_NOT_SA_DETAILController.cs @@ -0,0 +1,48 @@ +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.Attributes; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class HBPO_NOT_SA_DETAILController : GenericController +{ + public HBPO_NOT_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] HBPO_NOT_SA_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); + } + + [Multiple, Display(Name = "生成可结算单")] + public IActionResult? GenerateSettlementOrder() + { + return null; + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_PD_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_PD_DETAILController.cs new file mode 100644 index 00000000..39f7ca7b --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_PD_DETAILController.cs @@ -0,0 +1,47 @@ +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.Attributes; +using WTA.Shared.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class HBPO_PD_DETAILController : GenericController +{ + public HBPO_PD_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] HBPO_PD_DETAIL 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); + } + + [Display(Name = "审核通过"), Multiple, HttpPost] + public IActionResult? ApprovalPassed() + { + return null; + } + + [Display(Name = "退回"), Multiple, HttpPost] + public IActionResult? Reject() + { + return null; + } +} 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 f5fbd24d..3838df6d 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SAController.cs @@ -29,9 +29,9 @@ public class HBPO_SAController : GenericController /// 未确定 /// /// - [HttpPost,Display(Name ="同步"),Multiple] + [HttpPost, Display(Name = "同步"), Multiple] public IActionResult? Synchronous() { return null; diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_EDIController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_EDIController.cs new file mode 100644 index 00000000..e47e9731 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_EDIController.cs @@ -0,0 +1,34 @@ +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.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; + +public class HBPO_SE_EDIController : GenericController +{ + public HBPO_SE_EDIController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] HBPO_SE_EDI 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); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_REPORTController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_REPORTController.cs index 2d966e0e..16b8567c 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_REPORTController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_REPORTController.cs @@ -22,12 +22,6 @@ public class HBPO_SE_REPORTController : GenericController model, bool includeAll = false, bool includeDeleted = false) { @@ -51,4 +45,10 @@ public class HBPO_SE_REPORTController : GenericController +{ + private readonly GenericController _genericController; + + public IN_JIT_SE_SA_REPORTController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpPost, Display(Name = "下载")] + public virtual IActionResult? DownloadAsync() + { + return null; + } + + [HttpPost, Display(Name = "生成对比"), Multiple] + public virtual IActionResult? Comparison() + { + return null; + } +} + +[Order(2)] +[Display(Name = "发运与结算二次比对")] +[INDataComparisonGroup] +public class IN_JIT_SE_SA_REPORT : IResource +{ +} 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 a59224f2..3a095096 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 @@ -1,6 +1,4 @@ using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using WTA.Application.Identity.Entities.SystemManagement; using WTA.Application.Identity.Entities.SystemManagement.Group; @@ -32,29 +30,16 @@ public class IN_PUB_CAN_SAController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) - { - return this._genericController.Export(model, includeAll, includeDeleted); - } } + [Hidden] -[Display(Name = "结算数据")] -[INDataInputGroup] +[Display(Name = "可结算单明细")] +[INSettlementInvoicingGroup] [Order(1)] public class IN_PUB_CAN_SA_DETAIL : IResource { 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 new file mode 100644 index 00000000..d629ae4c --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_NOT_SA_DETAILController.cs @@ -0,0 +1,45 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class IN_PUB_NOT_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public IN_PUB_NOT_SA_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Display(Name = "生成可结算单")] + public virtual IActionResult? GenerateSettlementOrder() + { + return null; + } +} + +[Order(2)] +[Display(Name = "不可结算单")] +[INSettlementInvoicingGroup] +public class IN_PUB_NOT_SA_DETAIL : IResource +{ +} 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 new file mode 100644 index 00000000..79fd7143 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_PD_DETAILController.cs @@ -0,0 +1,50 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class IN_PUB_PD_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public IN_PUB_PD_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + 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? ApprovalPassed() + { + return null; + } +} + +[Order(4)] +[Display(Name = "寄售库库存扣减审批")] +[INSettlementInvoicingGroup] +public class IN_PUB_PD_DETAIL : IResource +{ } diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SAController.cs new file mode 100644 index 00000000..22ca767e --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SAController.cs @@ -0,0 +1,60 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class IN_PUB_SAController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public IN_PUB_SAController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpGet, AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")] + public virtual IActionResult Import() + { + return this._genericController.Import(); + } + + [Consumes("multipart/form-data")] + [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")] + public virtual IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + { + return this._genericController.Import(file, partial, replace); + } +} + +[Order(1)] +[INDataInputGroup] +[Display(Name = "结算数据")] +public class IN_PUB_SA : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SA_DETAILController.cs new file mode 100644 index 00000000..5c3de75d --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SA_DETAILController.cs @@ -0,0 +1,47 @@ +using System.ComponentModel.DataAnnotations; +using DocumentFormat.OpenXml.Wordprocessing; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class IN_PUB_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public IN_PUB_SA_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + 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); + } +} + +[Hidden] +[Display(Name = "可结算单明细")] +[INDataInputGroup] +[Order(1)] +public class IN_PUB_SA_DETAIL : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SE_DETAILController.cs index 70332d5b..579c6748 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SE_DETAILController.cs @@ -1,11 +1,4 @@ -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using DocumentFormat.OpenXml.Wordprocessing; -using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Mvc; using WTA.Application.Identity.Entities.SystemManagement; using WTA.Application.Identity.Entities.SystemManagement.Group; @@ -15,6 +8,7 @@ using WTA.Shared.Controllers; using RouteAttribute = Microsoft.AspNetCore.Mvc.RouteAttribute; namespace WTA.Application.Identity.Controllers; + [Route("api/{culture=zh}/[controller]/[action]")] public class IN_PUB_SE_DETAILController : BaseController, IResourceService { @@ -42,12 +36,17 @@ public class IN_PUB_SE_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_JIT_SE_SA_REPORTController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpPost, Display(Name = "下载")] + public virtual IActionResult? DownloadAsync() + { + return null; + } + + [HttpPost, Display(Name = "生成对比"), Multiple] + public virtual IActionResult? Comparison() + { + return null; + } +} + +[Order(2)] +[Display(Name = "发运与结算二次比对")] +[JITDataComparisonGroup] +public class JIT_JIT_SE_SA_REPORT : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SAController.cs index fc41502f..a9abe909 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SAController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SAController.cs @@ -1,6 +1,4 @@ using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using WTA.Application.Identity.Entities.SystemManagement; using WTA.Application.Identity.Entities.SystemManagement.Group; @@ -44,28 +42,15 @@ public class JIT_PUB_CAN_SAController : BaseController, IResourceService model, bool includeAll = false, bool includeDeleted = false) - { - return this._genericController.Export(model, includeAll, includeDeleted); - } } [Hidden] -[Display(Name = "结算数据")] -[JITDataInputGroup] +[Display(Name = "可结算单明细")] +[JITSettlementInvoicingGroup] public class JIT_PUB_CAN_SA_DETAIL : IResource { } 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 new file mode 100644 index 00000000..740d4a1b --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_NOT_SA_DETAILController.cs @@ -0,0 +1,45 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class JIT_PUB_NOT_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_NOT_SA_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Display(Name = "生成可结算单")] + public virtual IActionResult? GenerateSettlementOrder() + { + return null; + } +} + +[Order(2)] +[Display(Name = "不可结算单")] +[JITSettlementInvoicingGroup] +public class JIT_PUB_NOT_SA_DETAIL : IResource +{ +} 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 new file mode 100644 index 00000000..067a8e07 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_PD_DETAILController.cs @@ -0,0 +1,50 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class JIT_PUB_PD_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_PD_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + 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? ApprovalPassed() + { + return null; + } +} + +[Order(4)] +[Display(Name = "寄售库库存扣减审批")] +[JITSettlementInvoicingGroup] +public class JIT_PUB_PD_DETAIL : IResource +{ } diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs new file mode 100644 index 00000000..e9d620ad --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs @@ -0,0 +1,72 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class JIT_PUB_SAController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_SAController(GenericController genericController) + { + this._genericController = genericController; + } + + //[NonAction] + //public override IActionResult Create([FromBody] PUB_CAN_SA model) + //{ + // return base.Create(model); + //} + + //[NonAction] + //public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) + //{ + // return base.Export(model, includeAll, includeDeleted); + //} + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpGet, AllowAnonymous, Multiple, Order(-2), HtmlClass("el-button--primary")] + public virtual IActionResult Import() + { + return this._genericController.Import(); + } + + [Consumes("multipart/form-data")] + [HttpPost, Multiple, Order(-2), HtmlClass("el-button--primary")] + public virtual IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + { + return this._genericController.Import(file, partial, replace); + } +} + +[Display(Name = "结算数据")] +[JITDataInputGroup] +[Order(1)] +public class JIT_PUB_SA : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SA_DETAILController.cs new file mode 100644 index 00000000..08c7bdf2 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SA_DETAILController.cs @@ -0,0 +1,46 @@ +using System.ComponentModel.DataAnnotations; +using DocumentFormat.OpenXml.Wordprocessing; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class JIT_PUB_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_SA_DETAILController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + 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); + } +} + +[Hidden] +[Display(Name = "结算数据明细明细")] +[JITDataInputGroup] +public class JIT_PUB_SA_DETAIL : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SE_DETAILController.cs index 66c11d11..30499bdd 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SE_DETAILController.cs @@ -36,6 +36,12 @@ public class JIT_PUB_SE_DETAILController : BaseController, IResourceService { public MaterialController(ILogger logger, IRepository repository) : base(logger, repository) { } + [NonAction] public override IActionResult Create([FromBody] Material model) { return base.Create(model); } + [NonAction] public override IActionResult Delete([FromBody] Guid[] guids) { return base.Delete(guids); } + [NonAction] public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false) { return base.Import(importexcelfile, partial, replace); } - } diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/Second_BBAC_SE_SA_REPORTController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/Second_BBAC_SE_SA_REPORTController.cs new file mode 100644 index 00000000..4a53fe05 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/Second_BBAC_SE_SA_REPORTController.cs @@ -0,0 +1,57 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class Second_BBAC_SE_SA_REPORTController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public Second_BBAC_SE_SA_REPORTController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpPost, Display(Name = "下载")] + public virtual IActionResult? DownloadAsync() + { + return null; + } + + [HttpPost, Display(Name = "生成对比"), Multiple] + public virtual IActionResult? Comparison() + { + return null; + } +} + +[Order(3)] +[JISBBACDataComparisonGroup] +[Display(Name = "发运与结算数据二次比对")] +public class Second_BBAC_SE_SA_REPORT : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/Second_HBPO_SE_SA_REPORTController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/Second_HBPO_SE_SA_REPORTController.cs new file mode 100644 index 00000000..09b44049 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/Second_HBPO_SE_SA_REPORTController.cs @@ -0,0 +1,57 @@ +using System.ComponentModel.DataAnnotations; +using Microsoft.AspNetCore.Mvc; +using WTA.Application.Identity.Entities.SystemManagement; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +using WTA.Shared.Controllers; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class Second_HBPO_SE_SA_REPORTController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public Second_HBPO_SE_SA_REPORTController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpPost, Display(Name = "下载")] + public virtual IActionResult? DownloadAsync() + { + return null; + } + + [HttpPost, Display(Name = "生成对比"), Multiple] + public virtual IActionResult? Comparison() + { + return null; + } +} + +[Order(3)] +[JISHBPODataComparisonGroup] +[Display(Name = "发运与结算数据二次比对")] +public class Second_HBPO_SE_SA_REPORT : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_LISTController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_LISTController.cs index 529d7fc7..af4ead6d 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_LISTController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_LISTController.cs @@ -17,5 +17,4 @@ public class TB_PRICE_LISTController : GenericController +{ + private readonly GenericController _genericController; + + public Third_BBAC_SE_SA_REPORTController(GenericController genericController) + { + this._genericController = genericController; + } + + [HttpGet] + public virtual IActionResult Index() + { + return this._genericController.Index(); + } + + [HttpPost, Multiple, Order(-4), HtmlClass("el-button--primary")] + public virtual IActionResult Index([FromBody] PaginationModel model) + { + return this._genericController.Index(model); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } + + [HttpPost, Display(Name = "下载")] + public virtual IActionResult? DownloadAsync() + { + return null; + } + + [HttpPost, Display(Name = "生成对比"), Multiple] + public virtual IActionResult? Comparison() + { + return null; + } +} + +[Display(Name = "买单件发运与结算数据三次比对")] +[Order(4)] +[JISBBACDataComparisonGroup] +public class Third_BBAC_SE_SA_REPORT : IResource +{ +} 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 6985bc27..30f134dc 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,8 @@ 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/BBAC_NOT_SA_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_NOT_SA_DETAIL.cs index 04c9a3d4..56bfcd62 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_NOT_SA_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_NOT_SA_DETAIL.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; @@ -31,6 +32,7 @@ namespace WTA.Application.Identity.Entities.SystemManagement; // public string RecordCount { get; set; } = null!; //} [JISBBACSettlementInvoicingGroup] +[Order(2)] [Display(Name = "不可结明细")] //BBAC不可结算导入明细 public class BBAC_NOT_SA_DETAIL : BaseEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_PD_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_PD_DETAIL.cs index 399d063b..2b248b96 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_PD_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_PD_DETAIL.cs @@ -1,10 +1,12 @@ using System.ComponentModel.DataAnnotations; using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISBBACSettlementInvoicingGroup] [Display(Name = "寄售库库存扣减审批")] +[Order(4)] //BBAC寄售库库存扣减审批 public class BBAC_PD_DETAIL : BaseEntity { diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs index 47617309..88257a77 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs @@ -6,6 +6,7 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISHBPOSettlementInvoicingGroup] [Display(Name = "可结算单")] +[Order(1)] //HBPO可结算导入 public class HBPO_CAN_SA : BaseEntity { @@ -31,6 +32,7 @@ public class HBPO_CAN_SA : BaseEntity } [Hidden] [Display(Name = "HBPO可结算导入明细")] +[Order(2)] public class HBPO_CAN_SA_DETAIL : BaseEntity { diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_PD_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_PD_DETAIL.cs index 19ec6270..6c63acaa 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_PD_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_PD_DETAIL.cs @@ -1,10 +1,12 @@ 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; [JISHBPOSettlementInvoicingGroup] [Display(Name = "寄售库库存扣减审批")] +[Order(4)] //HBPO待扣减实体 public class HBPO_PD_DETAIL : BaseEntity { diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs index d2586b15..7b42a76f 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs @@ -4,8 +4,9 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Display(Name = "HBPO发运数据与结算数据对比实体")] [Hidden] +[Display(Name = "HBPO发运数据与结算数据对比实体")] + public class HBPO_SE_SA_REPORT : BaseEntity { [Display(Name = "LU+ASN单号")]