From 0fff5b3d7739c6991106bac37e99e374becf6e3e 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 08:29:06 +0800 Subject: [PATCH] la qu --- .../Controllers/BBAC_SE_DETAILController.cs | 14 +++- .../Controllers/BBAC_SE_REPORTController.cs | 54 ++++++++++++++ .../Controllers/BJ_PUB_CAN_SAController.cs | 60 ++++++++++++++++ .../BJ_PUB_CAN_SA_DETAILController.cs | 45 ++++++++++++ .../Controllers/BJ_PUB_SE_DETAILController.cs | 46 ++++++++++++ ...E_DETAILController.cs => BOMController.cs} | 22 +++--- .../Controllers/HBPO_SE_DETAILController.cs | 10 +++ .../Controllers/HBPO_SE_REPORTController.cs | 54 ++++++++++++++ .../Controllers/IN_PUB_CAN_SAController.cs | 60 ++++++++++++++++ .../IN_PUB_CAN_SA_DETAILController.cs | 45 ++++++++++++ .../Controllers/IN_PUB_SE_DETAILController.cs | 53 ++++++++++++++ .../Controllers/IN_SE_DETAILController.cs | 34 --------- .../Controllers/JIT_PUB_CAN_SAController.cs | 72 +++++++++++++++++++ .../JIT_PUB_CAN_SA_DETAILController.cs | 45 ++++++++++++ .../JIT_PUB_SE_DETAILController.cs | 46 ++++++++++++ .../Controllers/JIT_SE_DETAILController.cs | 34 --------- .../Controllers/PURCHASE_PRICEController.cs | 20 ++++++ .../Identity/Data/Config/BaseDataDbConfig.cs | 18 ++--- .../Entities/SystemManagement/BBAC_CAN_SA.cs | 3 +- .../SystemManagement/BBAC_NOT_SA_DETAIL.cs | 3 +- .../SystemManagement/BBAC_PD_DETAIL.cs | 3 +- .../Entities/SystemManagement/BBAC_SA.cs | 3 +- .../SystemManagement/BBAC_SE_DETAIL.cs | 3 +- .../Entities/SystemManagement/BBAC_SE_EDI.cs | 5 +- .../SystemManagement/BBAC_SE_REPORT.cs | 5 +- .../SystemManagement/BBAC_SE_SA_REPORT.cs | 4 +- .../Entities/SystemManagement/BJ_SE_DETAIL.cs | 33 --------- .../{ => Group}/CaiWuShenHeGroup.cs | 0 .../Entities/SystemManagement/HBPO_CAN_SA.cs | 3 +- .../SystemManagement/HBPO_NOT_SA_DETAIL.cs | 3 +- .../SystemManagement/HBPO_PD_DETAIL.cs | 3 +- .../Entities/SystemManagement/HBPO_SA.cs | 3 +- .../SystemManagement/HBPO_SE_DETAIL.cs | 3 +- .../Entities/SystemManagement/HBPO_SE_EDI.cs | 3 +- .../SystemManagement/HBPO_SE_REPORT.cs | 3 +- .../SystemManagement/HBPO_SE_SA_REPORT.cs | 3 +- .../Entities/SystemManagement/INVOICE_GRP.cs | 3 +- .../Entities/SystemManagement/IN_SE_DETAIL.cs | 34 --------- .../SystemManagement/JIT_SE_DETAIL.cs | 35 --------- .../SystemManagement/JIT_SE_SA_REPORT.cs | 3 +- .../Entities/SystemManagement/PUB_CAN_SA.cs | 3 +- .../Entities/SystemManagement/TB_PRICE_BJ.cs | 2 +- .../Controllers/GenericController.cs | 2 +- 43 files changed, 687 insertions(+), 213 deletions(-) create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs rename docs/demo/src/WTA.Application/Identity/Controllers/{BJ_SE_DETAILController.cs => BOMController.cs} (59%) create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_REPORTController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SE_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SAController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SE_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/PURCHASE_PRICEController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SE_DETAIL.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{ => Group}/CaiWuShenHeGroup.cs (100%) delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SE_DETAIL.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_DETAIL.cs diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs index b5981897..55f670cc 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs @@ -3,6 +3,7 @@ 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; @@ -15,9 +16,9 @@ public class BBAC_SE_DETAILController : GenericController + /// 未确定 + /// + /// + [HttpPost, Display(Name = "同步"), Multiple] + public IActionResult? Synchronous() + { + return null; + } } 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 new file mode 100644 index 00000000..c74300de --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_REPORTController.cs @@ -0,0 +1,54 @@ +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_SE_REPORTController : GenericController +{ + public BBAC_SE_REPORTController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] BBAC_SE_REPORT 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); + } + + [NonAction] + public override IActionResult Update([FromBody] BBAC_SE_REPORT model) + { + return base.Update(model); + } + + [HttpPost, Display(Name = "生成比对"), Multiple] + public IActionResult? ExportEDIJob() + { + return null; + } +} 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 new file mode 100644 index 00000000..1dee8766 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_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_CAN_SAController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_CAN_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); + } + + [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); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } +} + +[Order(1)] +[BJDataInputGroup] +[Display(Name = "结算数据")] +public class BJ_PUB_CAN_SA : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_SA_DETAILController.cs new file mode 100644 index 00000000..12cb3b57 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_CAN_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_CAN_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_CAN_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_CAN_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 new file mode 100644 index 00000000..99bbe143 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_PUB_SE_DETAILController.cs @@ -0,0 +1,46 @@ +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; +using RouteAttribute = Microsoft.AspNetCore.Mvc.RouteAttribute; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class BJ_PUB_SE_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public BJ_PUB_SE_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); + } +} + +[Order(2)] +[BJDataInputGroup] +[Display(Name = "发运数据")] +public class BJ_PUB_SE_DETAIL : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BOMController.cs similarity index 59% rename from docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs rename to docs/demo/src/WTA.Application/Identity/Controllers/BOMController.cs index de404d21..62e1641b 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BOMController.cs @@ -1,34 +1,36 @@ +using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; 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 BJ_SE_DETAILController : GenericController +public class BOMController : GenericController { - public BJ_SE_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) + public BOMController(ILogger logger, IRepository repository) : base(logger, repository) { } - [NonAction] - public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) + public override IActionResult Create([FromBody] BOM model) { - return base.Import(file); + return base.Create(model); } - [NonAction] public override IActionResult Delete([FromBody] Guid[] guids) { return base.Delete(guids); } - [NonAction] - public override IActionResult Create([FromBody] BJ_SE_DETAIL model) + public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) { - return base.Create(model); + return base.Import(file, partial, replace); } } diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs index d4751b25..0c7e8f1f 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs @@ -3,6 +3,7 @@ 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; @@ -31,4 +32,13 @@ public class HBPO_SE_DETAILController : GenericController + /// 未确定 + /// + /// + [HttpPost,Display(Name ="同步"),Multiple] + public IActionResult? Synchronous() + { + return null; + } } 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 new file mode 100644 index 00000000..2d966e0e --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_REPORTController.cs @@ -0,0 +1,54 @@ +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_SE_REPORTController : GenericController +{ + public HBPO_SE_REPORTController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] HBPO_SE_REPORT 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); + } + + [NonAction] + public override IActionResult Update([FromBody] HBPO_SE_REPORT model) + { + return base.Update(model); + } + + [HttpPost, Display(Name = "生成比对"), Multiple] + public IActionResult? ExportEDIJob() + { + return null; + } +} 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 new file mode 100644 index 00000000..a59224f2 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_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_CAN_SAController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public IN_PUB_CAN_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); + } + + [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); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } +} + +[Order(1)] +[INDataInputGroup] +[Display(Name = "结算数据")] +public class IN_PUB_CAN_SA : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_SA_DETAILController.cs new file mode 100644 index 00000000..5c9284d4 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_CAN_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_CAN_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public IN_PUB_CAN_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_CAN_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 new file mode 100644 index 00000000..70332d5b --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/IN_PUB_SE_DETAILController.cs @@ -0,0 +1,53 @@ +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; +using WTA.Shared.Application; +using WTA.Shared.Attributes; +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 +{ + private readonly GenericController _genericController; + + public IN_PUB_SE_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); + } +} +[Order(2)] +[INDataInputGroup] +[Display(Name = "发运数据")] +public class IN_PUB_SE_DETAIL : IResource +{ + +} + diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs deleted file mode 100644 index ea07ce67..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SE_DETAILController.cs +++ /dev/null @@ -1,34 +0,0 @@ -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 IN_SE_DETAILController : GenericController -{ - public IN_SE_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [NonAction] - public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false) - { - return base.Import(importexcelfile); - } - - [NonAction] - public override IActionResult Delete([FromBody] Guid[] guids) - { - return base.Delete(guids); - } - - [NonAction] - public override IActionResult Create([FromBody] IN_SE_DETAIL model) - { - return base.Create(model); - } -} 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 new file mode 100644 index 00000000..fc41502f --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_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_CAN_SAController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_CAN_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); + } + + [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); + } + + [HttpPost, Multiple, Order(0), HtmlClass("el-button--danger")] + public virtual IActionResult Delete([FromBody] Guid[] guids) + { + return this._genericController.Delete(guids); + } +} + +[Display(Name = "结算数据")] +[JITDataInputGroup] +[Order(1)] +public class JIT_PUB_CAN_SA : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_SA_DETAILController.cs new file mode 100644 index 00000000..83a43d5c --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_CAN_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_CAN_SA_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_CAN_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_CAN_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 new file mode 100644 index 00000000..66c11d11 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SE_DETAILController.cs @@ -0,0 +1,46 @@ +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; +using RouteAttribute = Microsoft.AspNetCore.Mvc.RouteAttribute; + +namespace WTA.Application.Identity.Controllers; + +[Route("api/{culture=zh}/[controller]/[action]")] +public class JIT_PUB_SE_DETAILController : BaseController, IResourceService +{ + private readonly GenericController _genericController; + + public JIT_PUB_SE_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); + } +} + +[Order(2)] +[JITDataInputGroup] +[Display(Name = "发运数据")] +public class JIT_PUB_SE_DETAIL : IResource +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs deleted file mode 100644 index 5eeae3d5..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SE_DETAILController.cs +++ /dev/null @@ -1,34 +0,0 @@ -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 JIT_SE_DETAILController : GenericController -{ - public JIT_SE_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [NonAction] - public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false) - { - return base.Import(importexcelfile); - } - - [NonAction] - public override IActionResult Delete([FromBody] Guid[] guids) - { - return base.Delete(guids); - } - - [NonAction] - public override IActionResult Create([FromBody] JIT_SE_DETAIL model) - { - return base.Create(model); - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/PURCHASE_PRICEController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/PURCHASE_PRICEController.cs new file mode 100644 index 00000000..0dbe67e9 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/PURCHASE_PRICEController.cs @@ -0,0 +1,20 @@ +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 PURCHASE_PRICEController : GenericController +{ + public PURCHASE_PRICEController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] PURCHASE_PRICE model) + { + return base.Create(model); + } +} diff --git a/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs b/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs index 368eb7c5..eded0d34 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs @@ -24,16 +24,16 @@ IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, //IEntityTypeConfiguration, @@ -160,8 +160,8 @@ IEntityTypeConfiguration //public void Configure(EntityTypeBuilder builder) //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } //public void Configure(EntityTypeBuilder builder) //{ } @@ -172,8 +172,8 @@ IEntityTypeConfiguration //public void Configure(EntityTypeBuilder builder) //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } //public void Configure(EntityTypeBuilder builder) //{ } @@ -187,8 +187,8 @@ IEntityTypeConfiguration //public void Configure(EntityTypeBuilder builder) //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } //public void Configure(EntityTypeBuilder builder) //{ } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs index eb7c5e3e..6985bc27 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 = "BBAC可结算导入")] +[Display(Name = "发票分组号")] +//BBAC可结算导入 public class BBAC_CAN_SA : BaseEntity { [Display(Name = "期间")] 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 1f88e4ab..04c9a3d4 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 @@ -31,7 +31,8 @@ namespace WTA.Application.Identity.Entities.SystemManagement; // public string RecordCount { get; set; } = null!; //} [JISBBACSettlementInvoicingGroup] -[Display(Name = "BBAC不可结算导入明细")] +[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 6c631cce..399d063b 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 @@ -4,7 +4,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISBBACSettlementInvoicingGroup] -[Display(Name = "BBAC待扣减实体")] +[Display(Name = "寄售库库存扣减审批")] +//BBAC寄售库库存扣减审批 public class BBAC_PD_DETAIL : BaseEntity { [Display(Name = "LU+ASN单号")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs index d2604ada..0ea044d6 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs @@ -7,7 +7,8 @@ namespace WTA.Application.Identity.Entities.SystemManagement; [Order(2)] [JISBBACDataInputGroup] -[Display(Name = "BBAC结算导入")] +[Display(Name = "JIS结算数据")] +//BBAC结算导入 public class BBAC_SA : BaseEntity { [Display(Name = "期间")] 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 ea3a68f0..4d2a8004 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 @@ -7,7 +7,8 @@ namespace WTA.Application.Identity.Entities.SystemManagement; [Order(4)] [JISBBACDataInputGroup] -[Display(Name = "BBAC发运单")] +[Display(Name = "JIS发运数据")] +//BBAC发运单 public class BBAC_SE_DETAIL : BaseEntity { [Display(Name = "LU+生产码")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_EDI.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_EDI.cs index ae51bfce..027e33b0 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_EDI.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_EDI.cs @@ -1,10 +1,13 @@ 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; [JISBBACDataInputGroup] -[Display(Name = "BBAC的EDI数据")] +[Order(3)] +[Display(Name = "EDI数据")] +//BBAC的EDI数据 public class BBAC_SE_EDI : BaseEntity { [Display(Name = "LU+生产码")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_REPORT.cs index 11543f38..b6299738 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_REPORT.cs @@ -1,9 +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; -[Display(Name = "BBAC发运数据和EDI对比实体")] +[Order(1)] +[Display(Name = "EDI与发运数据比对")] +//BBAC发运数据和EDI对比实体 [JISBBACDataComparisonGroup] public class BBAC_SE_REPORT : BaseEntity { diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs index d986e3f1..96746d9d 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs @@ -1,13 +1,13 @@ 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; -[JISBBACDataComparisonGroup] +[Hidden] [Display(Name = "BBAC发运数据与结算数据对比实体")] public class BBAC_SE_SA_REPORT : BaseEntity { - [Display(Name = "LU+ASN单号")] public string KeyCode { get; set; } = null!; /// diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SE_DETAIL.cs deleted file mode 100644 index 192ac34e..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SE_DETAIL.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Application.Identity.Entities.SystemManagement.Group; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; -[BJDataInputGroup] -[Display(Name = "备件发运数据查询")] -public class BJ_SE_DETAIL : BaseEntity -{ - [Display(Name = "LU+生产码")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = ("ASN单号"))] - public string PN { get; set; } = null!; - - [Display(Name = ("发货数量"))] - public decimal Qty { get; set; } - - [Display(Name = ("订单时间"))] - public DateTime BeginDate { get; set; } - - [Display(Name = ("发货时间"))] - public DateTime ShippingDate { get; set; } - - [Display(Name = ("Wms发货单号"))] - public string WmsBillNum { get; set; } = null!; -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CaiWuShenHeGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/CaiWuShenHeGroup.cs similarity index 100% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CaiWuShenHeGroup.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/CaiWuShenHeGroup.cs 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 0e6820b9..47617309 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 @@ -5,7 +5,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISHBPOSettlementInvoicingGroup] -[Display(Name = "HBPO可结算导入")] +[Display(Name = "可结算单")] +//HBPO可结算导入 public class HBPO_CAN_SA : BaseEntity { [Display(Name = "期间")] 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 a964c085..98177610 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 @@ -30,7 +30,8 @@ namespace WTA.Application.Identity.Entities.SystemManagement; // public string RecordCount { get; set; } = null!; //} [JISHBPOSettlementInvoicingGroup] -[Display(Name = "HBPO不可结算导入明细")] +[Display(Name = "不可结算单")] +//HBPO不可结算导入明细 public class HBPO_NOT_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 1cdabdc7..19ec6270 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 @@ -4,7 +4,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISHBPOSettlementInvoicingGroup] -[Display(Name = "HBPO待扣减实体")] +[Display(Name = "寄售库库存扣减审批")] +//HBPO待扣减实体 public class HBPO_PD_DETAIL : BaseEntity { [Display(Name = "LU+ASN单号")] 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 72667cf7..7fa6e32d 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 @@ -5,7 +5,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISHBPODataInputGroup] -[Display(Name = "HBPO结算导入")] +[Display(Name = "JIS结算数据")] +//HBPO结算导入 public class HBPO_SA : BaseEntity { [Display(Name = "期间")] 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 9c3db4c4..55c5bf25 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 @@ -4,7 +4,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Display(Name = "HBPO发运数据")] +[Display(Name = "JIS发运数据")] +//HBPO发运数据 [JISHBPODataInputGroup] public class HBPO_SE_DETAIL : BaseEntity { 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 2d7143c6..7617b0e8 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 @@ -4,7 +4,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [JISHBPODataInputGroup] -[Display(Name = "HBPO的EDI数据")] +[Display(Name = "EDI数据")] +//HBPO的EDI数据 public class HBPO_SE_EDI : BaseEntity { [Display(Name = "LU+生产码")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_REPORT.cs index 6f35e706..c6ad50e8 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_REPORT.cs @@ -3,8 +3,9 @@ using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Display(Name = "HBPO发运数据和EDI对比实体")] +[Display(Name = "EDI与发运数据比对")] [JISHBPODataComparisonGroup] +//HBPO发运数据和EDI对比实体 public class HBPO_SE_REPORT : BaseEntity { [Display(Name = "LU+生产码")] 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 91066058..d2586b15 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 @@ -1,10 +1,11 @@ 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; [Display(Name = "HBPO发运数据与结算数据对比实体")] -[JISHBPODataComparisonGroup] +[Hidden] public class HBPO_SE_SA_REPORT : BaseEntity { [Display(Name = "LU+ASN单号")] 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 faac7b91..f07d0c02 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 @@ -5,7 +5,8 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [ShangWuShenHeGroup] -[Display(Name = "发票分组")] +[Display(Name = "财务管理审核")] +//发票分组 public class INVOICE_GRP : BaseEntity { [Display(Name = "实际纸质发票号")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SE_DETAIL.cs deleted file mode 100644 index a413d1ab..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SE_DETAIL.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Application.Identity.Entities.SystemManagement.Group; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[INDataInputGroup] -[Display(Name = "印度件发运数据查询")] -public class IN_SE_DETAIL : BaseEntity -{ - [Display(Name = "LU+生产码")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = "交付识别号")] - public string PN { get; set; } = null!; - - [Display(Name = "发货数量")] - public decimal Qty { get; set; } - - [Display(Name = "开始时间")] - public DateTime BeginDate { get; set; } - - [Display(Name = "发货时间")] - public DateTime ShippingDate { get; set; } - - [Display(Name = "WMS发货单号")] - public string WmsBillNum { get; set; } = null!; -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_DETAIL.cs deleted file mode 100644 index b6e3f79c..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_DETAIL.cs +++ /dev/null @@ -1,35 +0,0 @@ -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; -[JITDataInputGroup] -[Display(Name = "JIT发运数据查询")] -public class JIT_SE_DETAIL : BaseEntity -{ - [Display(Name = "LU+生产码")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = ("ASN单号"))] - public string PN { get; set; } = null!; - - [Display(Name = ("发货数量"))] - public decimal Qty { get; set; } - - [Display(Name = ("订单时间"))] - public DateTime BeginDate { get; set; } - - [Display(Name = ("发货时间"))] - public DateTime ShippingDate { get; set; } - - [Display(Name = ("Wms发货单号"))] - public string WmsBillNum { get; set; } = null!; - -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs index 96186b5f..b040cc03 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs @@ -1,9 +1,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; -[JITDataComparisonGroup] +[Hidden] [Display(Name = "JIT发运数据与结算数据对比实体")] public class JIT_SE_SA_REPORT : BaseEntity { diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs index a920b53a..8910a9c5 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs @@ -32,8 +32,9 @@ public class PUB_CAN_SA : BaseEntity [Display(Name = "明细记录行数")] public string InvGroupNum { get; set; } = null!; } -[Display(Name = "PUB可结算导入明细")] [Hidden] +[Display(Name = "PUB可结算导入明细")] + public class PUB_CAN_SA_DETAIL : BaseEntity { [Display(Name = "LU+ASN单号")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_BJ.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_BJ.cs index 59c3d37e..9ccfda06 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_BJ.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_BJ.cs @@ -5,7 +5,7 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; [Order(11)] -[Display(Name = "备件价格表")] +[Display(Name = "备件价格单")] [SystemManagement] public class TB_PRICE_BJ : BaseEntity { diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs index cea4d81c..5025bbca 100644 --- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs +++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs @@ -99,7 +99,7 @@ public class GenericController model) { return Json(new {