From 85e4abd65ef7d9375504e01b06651a869ec19fc1 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Fri, 7 Jul 2023 17:05:55 +0800 Subject: [PATCH 1/4] update --- .../Identity/Data/IdentityDbSeed.cs | 26 +++++++++++++++++++ .../Entities/SystemManagement/Department.cs | 1 - .../Entities/SystemManagement/Post.cs | 1 - .../WTA/wwwroot/components/form/form-input.js | 2 +- .../src/WTA/wwwroot/components/icon/index.js | 3 +-- docs/demo/src/WTA/wwwroot/router/index.js | 1 + 6 files changed, 29 insertions(+), 5 deletions(-) diff --git a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs index 5309fc32..50fb412f 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs @@ -59,6 +59,32 @@ public class IdentityDbSeed : IDbSeed // 权限初始化 InitPermissions(context); + //岗位初始化 + context.Set().Add(new Post + { + Name = "董事长", + Number = "001", + Order = 1, + }.SetIdBy(o => o.Number)); + context.Set().Add(new Post + { + Name = "项目经理", + Number = "002", + Order = 2 + }.SetIdBy(o => o.Number)); + context.Set().Add(new Post + { + Name = "人力资源", + Number = "003", + Order = 3 + }.SetIdBy(o => o.Number)); + context.Set().Add(new Post + { + Name = "普通员工", + Number = "004", + Order = 4 + }.SetIdBy(o => o.Number)); + //部门初始化 context.Set().Add( new Department diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs index fe4b2ed6..d08417a9 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs @@ -3,7 +3,6 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Hidden] [Order(4)] [SystemManagement] public class Department : BaseTreeEntity diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs index 9f196856..4f76e75e 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs @@ -3,7 +3,6 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Hidden] [Order(5)] [SystemManagement] public class Post : BaseEntity diff --git a/docs/demo/src/WTA/wwwroot/components/form/form-input.js b/docs/demo/src/WTA/wwwroot/components/form/form-input.js index 677140f2..88b9af6c 100644 --- a/docs/demo/src/WTA/wwwroot/components/form/form-input.js +++ b/docs/demo/src/WTA/wwwroot/components/form/form-input.js @@ -23,7 +23,7 @@ export default { style="width:100%" :title="JSON.stringify(options)" > - + `; + svg.value = ``; } } } diff --git a/docs/demo/src/WTA/wwwroot/router/index.js b/docs/demo/src/WTA/wwwroot/router/index.js index 175d83b5..7e7dad73 100644 --- a/docs/demo/src/WTA/wwwroot/router/index.js +++ b/docs/demo/src/WTA/wwwroot/router/index.js @@ -81,6 +81,7 @@ router.afterEach((to) => { if (to.meta.title) { useTitle().value = `${to.meta.title}`; } + to.meta.cache = new Map(); } finally { NProgress.done(); } From 2806c0e20f0377e073736d12f1f01ea133f64f99 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: Fri, 7 Jul 2023 17:20:34 +0800 Subject: [PATCH 2/4] update --- .../Identity/Controllers/BBAC_DNController.cs | 60 --- .../Controllers/BBAC_DN_DETAILController.cs | 35 -- .../Controllers/BBAC_SA_DETAILController.cs | 2 +- .../Identity/Controllers/BJ_DNController.cs | 60 --- .../Controllers/BJ_DN_DETAILController.cs | 35 -- .../Identity/Controllers/BJ_SAController.cs | 54 --- .../Controllers/BJ_SA_DETAILController.cs | 21 - .../Controllers/BJ_SE_DETAILController.cs | 4 +- .../Identity/Controllers/HBPO_DNController.cs | 60 --- .../Controllers/HBPO_DN_DETAILController.cs | 35 -- .../Controllers/INVOICE_DETAILController.cs | 41 -- ...Controller.cs => INVOICE_GRPController.cs} | 12 +- .../Identity/Controllers/IN_DNController.cs | 60 --- .../Controllers/IN_DN_DETAILController.cs | 35 -- .../Identity/Controllers/IN_SAController.cs | 55 --- .../Controllers/IN_SA_DETAILController.cs | 21 - .../Identity/Controllers/JIT_DNController.cs | 60 --- .../Controllers/JIT_DN_DETAILController.cs | 35 -- .../Identity/Controllers/JIT_SAController.cs | 54 --- .../Controllers/JIT_SA_DETAILController.cs | 21 - .../Controllers/MaterialController.cs | 36 ++ .../MaterialRelationshipController.cs | 34 ++ .../Controllers/TB_PRICE_LISTController.cs | 1 - .../TB_ReAssemblyRelationshipController.cs | 20 - .../Identity/Data/Config/BaseDataDbConfig.cs | 396 ++++++++++++------ .../Identity/Data/IdentityDbSeed.cs | 64 ++- .../Entities/SystemManagement/BBAC_CAN_SA.cs | 112 +++++ .../SystemManagement/BBAC_NOT_SA_DETAIL.cs | 111 +++++ .../SystemManagement/BBAC_PD_DETAIL.cs | 48 +++ .../Entities/SystemManagement/BBAC_SA.cs | 8 +- .../SystemManagement/BBAC_SE_DETAIL.cs | 8 +- .../Entities/SystemManagement/BBAC_SE_EDI.cs | 39 ++ .../SystemManagement/BBAC_SE_REPORT.cs | 45 ++ .../SystemManagement/BBAC_SE_SA_REPORT.cs | 64 +++ .../Entities/SystemManagement/BJ_DN.cs | 72 ---- .../Entities/SystemManagement/BJ_SE_DETAIL.cs | 13 +- .../SystemManagement/{Class7.cs => BOM.cs} | 8 +- .../BeiJianDataInputAttribute.cs | 11 - .../BeiJianDataOutputAttribute.cs | 11 - .../SystemManagement/BeiJianModule.cs | 11 - .../{Class5.cs => CentralizedControl.cs} | 2 +- .../SystemManagement/ChuKuDanGroup.cs | 10 - .../Entities/SystemManagement/Class13.cs | 12 - .../Entities/SystemManagement/Class14.cs | 12 - .../Entities/SystemManagement/Class15.cs | 12 - .../Entities/SystemManagement/Class16.cs | 12 - .../Entities/SystemManagement/Class17.cs | 12 - .../Entities/SystemManagement/Class18.cs | 12 - .../Entities/SystemManagement/Class21.cs | 12 - .../Entities/SystemManagement/Class22.cs | 12 - .../Entities/SystemManagement/Class23.cs | 12 - .../Entities/SystemManagement/Class26.cs | 12 - .../Entities/SystemManagement/Class27.cs | 12 - .../Entities/SystemManagement/Class28.cs | 12 - .../Entities/SystemManagement/Class29.cs | 12 - .../Entities/SystemManagement/Class32.cs | 12 - .../Entities/SystemManagement/Class33.cs | 12 - .../Entities/SystemManagement/Class34.cs | 12 - .../Entities/SystemManagement/Class35.cs | 12 - .../Entities/SystemManagement/Class41.cs | 12 - .../Entities/SystemManagement/Class43.cs | 12 - .../Entities/SystemManagement/Class44.cs | 12 - .../Entities/SystemManagement/Class45.cs | 12 - .../Entities/SystemManagement/Class46.cs | 12 - .../Entities/SystemManagement/Class47.cs | 12 - .../Entities/SystemManagement/EdiAttribute.cs | 10 - .../Group/BJDataComparisonGroup.cs | 12 + .../Group/BJDataInputGroup.cs | 12 + .../Group/BJSettlementInvoicingGroup.cs | 12 + .../Group/INDataComparisonGroup.cs | 12 + .../Group/INDataInputGroup.cs | 12 + .../Group/INSettlementInvoicingGroup.cs | 12 + .../Group/JISBBACDataComparisonGroup.cs | 12 + .../Group/JISBBACDataInputGroup.cs | 12 + .../Group/JISBBACSettlementInvoicingGroup.cs | 12 + .../Group/JISHBPODataComparisonGroup.cs | 12 + .../Group/JISHBPODataInputGroup.cs | 12 + .../Group/JISHBPOSettlementInvoicingGroup.cs | 12 + .../Group/JITDataComparisonGroup.cs | 12 + .../Group/JITDataInputGroup.cs | 12 + .../Group/JITSettlementInvoicingGroup.cs | 12 + .../{BJ_SA.cs => HBPO_CAN_SA.cs} | 55 +-- .../Entities/SystemManagement/HBPO_DN.cs | 75 ---- .../SystemManagement/HBPO_NOT_SA_DETAIL.cs | 95 +++++ .../SystemManagement/HBPO_PD_DETAIL.cs | 46 ++ .../Entities/SystemManagement/HBPO_SA.cs | 14 +- .../SystemManagement/HBPO_SE_DETAIL.cs | 8 +- .../Entities/SystemManagement/HBPO_SE_EDI.cs | 39 ++ .../SystemManagement/HBPO_SE_REPORT.cs | 45 ++ .../SystemManagement/HBPO_SE_SA_REPORT.cs | 80 ++++ .../Entities/SystemManagement/INVOICE.cs | 57 --- .../Entities/SystemManagement/INVOICE_GRP.cs | 96 +++++ .../SystemManagement/INVOICE_MAP_GROUP.cs | 31 ++ .../SystemManagement/INVOICE_NOT_SETTLE.cs | 31 ++ .../SystemManagement/INVOICE_WAIT_DETAIL.cs | 49 +++ .../Entities/SystemManagement/IN_DN.cs | 73 ---- .../Entities/SystemManagement/IN_SE_DETAIL.cs | 6 +- .../SystemManagement/JISDataInputAttribute.cs | 11 - .../JISDataOutputAttribute.cs | 11 - .../Entities/SystemManagement/JISModule.cs | 11 - .../SystemManagement/JITDataInputAttribute.cs | 11 - .../JITDataOutputAttribute.cs | 11 - .../Entities/SystemManagement/JIT_DN.cs | 73 ---- .../SystemManagement/JIT_SE_DETAIL.cs | 7 +- .../SystemManagement/JIT_SE_SA_REPORT.cs | 80 ++++ .../Entities/SystemManagement/M_PD_DETAIL.cs | 48 +++ .../MaiDanJianDataInputAttribute.cs | 11 - .../MaiDanJianDataOutputAttribute.cs | 11 - .../SystemManagement/MaiDanJianModule.cs | 11 - .../{Class1.cs => Material.cs} | 14 +- .../{Class2.cs => MaterialRelationship.cs} | 2 +- .../SystemManagement/Module/BJModule.cs | 11 + .../SystemManagement/Module/INModule.cs | 11 + .../SystemManagement/Module/JISBBACModule.cs | 11 + .../SystemManagement/Module/JISHBPOModule.cs | 11 + .../{ => Module}/JITModule.cs | 6 +- .../{IN_SA.cs => PUB_CAN_SA.cs} | 63 +-- .../{BBAC_DN.cs => PUB_NOT_SA_DETAIL.cs} | 63 ++- .../SystemManagement/PUB_PD_DETAIL.cs | 54 +++ .../SystemManagement/{JIT_SA.cs => PUB_SA.cs} | 52 ++- .../SystemManagement/PUB_SE_DETAIL.cs | 49 +++ .../{Class8.cs => PURCHASE_PRICE.cs} | 9 +- .../Entities/SystemManagement/TB_PRICE_BJ.cs | 2 +- .../SystemManagement/TB_PRICE_LIST.cs | 3 +- .../TB_ReAssemblyRelationship.cs | 30 -- .../TB_RePartsRelationship.cs | 5 +- .../Attributes/OneToManyAttribute.cs | 2 +- 127 files changed, 1931 insertions(+), 1913 deletions(-) delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/BJ_SA_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs rename docs/demo/src/WTA.Application/Identity/Controllers/{INVOICEController.cs => INVOICE_GRPController.cs} (67%) delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/IN_SA_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/JIT_SA_DETAILController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/MaterialController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/MaterialRelationshipController.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Controllers/TB_ReAssemblyRelationshipController.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_NOT_SA_DETAIL.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_PD_DETAIL.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_EDI.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_REPORT.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_DN.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{Class7.cs => BOM.cs} (64%) delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataInputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataOutputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianModule.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{Class5.cs => CentralizedControl.cs} (83%) delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/ChuKuDanGroup.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class13.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class14.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class15.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class16.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class17.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class18.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class21.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class22.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class23.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class26.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class27.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class28.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class29.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class32.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class33.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class34.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class35.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class41.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class43.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class44.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class45.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class46.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class47.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/EdiAttribute.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataComparisonGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataInputGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJSettlementInvoicingGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataComparisonGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataInputGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INSettlementInvoicingGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataComparisonGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataInputGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACSettlementInvoicingGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataComparisonGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataInputGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPOSettlementInvoicingGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataComparisonGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataInputGroup.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITSettlementInvoicingGroup.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{BJ_SA.cs => HBPO_CAN_SA.cs} (62%) delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_PD_DETAIL.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_REPORT.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_GRP.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_MAP_GROUP.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_NOT_SETTLE.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_WAIT_DETAIL.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_DN.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataInputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataOutputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISModule.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataInputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataOutputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_DN.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/M_PD_DETAIL.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataInputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataOutputAttribute.cs delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianModule.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{Class1.cs => Material.cs} (98%) rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{Class2.cs => MaterialRelationship.cs} (83%) create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/BJModule.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/INModule.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISBBACModule.cs create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISHBPOModule.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{ => Module}/JITModule.cs (56%) rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{IN_SA.cs => PUB_CAN_SA.cs} (56%) rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{BBAC_DN.cs => PUB_NOT_SA_DETAIL.cs} (57%) create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_PD_DETAIL.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{JIT_SA.cs => PUB_SA.cs} (69%) create mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs rename docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/{Class8.cs => PURCHASE_PRICE.cs} (60%) delete mode 100644 docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_ReAssemblyRelationship.cs diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs deleted file mode 100644 index 8aa828cf..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs +++ /dev/null @@ -1,60 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class BBAC_DNController : GenericController -{ - public BBAC_DNController(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 Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] BBAC_DN model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "审核出库单"), Multiple] - public IActionResult? OutboundAuditAsync() - { - return null; - } - - [HttpPost, Display(Name = "生成待开票报表"), Multiple] - public IActionResult? AddBackGroundJob() - { - return null; - } - - [HttpPost, Display(Name = "撤销出库审核"), Multiple] - public IActionResult? RevokeReviewAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs deleted file mode 100644 index 2f4d8e6a..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs +++ /dev/null @@ -1,35 +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.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class BBAC_DN_DETAILController : GenericController -{ - public BBAC_DN_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 Create([FromBody] BBAC_DN_DETAIL model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "取消出库单"), Multiple] - public IActionResult? CancelOutbound() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SA_DETAILController.cs index 3357372c..bfa84454 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SA_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SA_DETAILController.cs @@ -1,4 +1,4 @@ -using System.ComponentModel.DataAnnotations; + using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using WTA.Application.Identity.Entities.SystemManagement; diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs deleted file mode 100644 index 836c4b27..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs +++ /dev/null @@ -1,60 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class BJ_DNController : GenericController -{ - public BJ_DNController(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 Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] BJ_DN model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "审核出库单"), Multiple] - public IActionResult? OutboundAuditAsync() - { - return null; - } - - [HttpPost, Display(Name = "生成待开票报表"), Multiple] - public IActionResult? AddBackGroundJob() - { - return null; - } - - [HttpPost, Display(Name = "撤销出库审核"), Multiple] - public IActionResult? RevokeReviewAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs deleted file mode 100644 index 1b2b0682..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs +++ /dev/null @@ -1,35 +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.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class BJ_DN_DETAILController : GenericController -{ - public BJ_DN_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); - } - - [HttpPost, Display(Name = "取消出库单"), Multiple] - public IActionResult? CancelOutbound() - { - return null; - } - - [NonAction] - public override IActionResult Create([FromBody] BJ_DN_DETAIL model) - { - return base.Create(model); - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs deleted file mode 100644 index 3bff1fc9..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs +++ /dev/null @@ -1,54 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class BJ_SAController : GenericController -{ - public BJ_SAController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [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); - } - - [NonAction] - public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] BJ_SA model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "下载")] - public IActionResult? Download()//download - { - return null; - } - - [HttpPost, Display(Name = "生成出库单"), Multiple] - public IActionResult? CreateOutOrdersAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SA_DETAILController.cs deleted file mode 100644 index 7491966f..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SA_DETAILController.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; -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 BJ_SA_DETAILController : GenericController -{ - public BJ_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [NonAction] - public override IActionResult Create([FromBody] BJ_SA_DETAIL model) - { - return base.Create(model); - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs index 78125e13..de404d21 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs @@ -15,9 +15,9 @@ public class BJ_SE_DETAILController : GenericController -{ - public HBPO_DNController(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 Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] HBPO_DN model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "审核出库单"), Multiple] - public IActionResult? OutboundAuditAsync() - { - return null; - } - - [HttpPost, Display(Name = "生成待开票报表"), Multiple] - public IActionResult? AddBackGroundJob() - { - return null; - } - - [HttpPost, Display(Name = "撤销出库审核"), Multiple] - public IActionResult? RevokeReviewAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs deleted file mode 100644 index fcd0bb3f..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs +++ /dev/null @@ -1,35 +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.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class HBPO_DN_DETAILController : GenericController -{ - public HBPO_DN_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 Create([FromBody] HBPO_DN_DETAIL model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "取消出库单"), Multiple] - public IActionResult? CancelOutbound() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs deleted file mode 100644 index 17da7bad..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs +++ /dev/null @@ -1,41 +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.Application; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class INVOICE_DETAILController : GenericController -{ - public INVOICE_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 Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] INVOICE_DETAIL model) - { - return base.Create(model); - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs similarity index 67% rename from docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs rename to docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs index a3d9447e..b7c64527 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs @@ -10,16 +10,16 @@ using WTA.Shared.Data; namespace WTA.Application.Identity.Controllers; -public class INVOICEController : GenericController +public class INVOICE_GRPController : GenericController { - public INVOICEController(ILogger logger, IRepository repository) : base(logger, repository) + public INVOICE_GRPController(ILogger logger, IRepository repository) : base(logger, repository) { } [NonAction] - public override IActionResult Import([Required] IFormFile importexcelfile, bool partial = false, bool replace = false) + public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false) { - return base.Import(importexcelfile); + return base.Import(file); } [NonAction] @@ -29,13 +29,13 @@ public class INVOICEController : GenericController model, bool includeAll = false, bool includeDeleted = false) + public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) { return base.Export(model, includeAll, includeDeleted); } [NonAction] - public override IActionResult Create([FromBody] INVOICE model) + public override IActionResult Create([FromBody] INVOICE_GRP model) { return base.Create(model); } diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs deleted file mode 100644 index 71fbff76..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs +++ /dev/null @@ -1,60 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class IN_DNController : GenericController -{ - public IN_DNController(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 Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] IN_DN model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "审核出库单"), Multiple] - public IActionResult? OutboundAuditAsync() - { - return null; - } - - [HttpPost, Display(Name = "生成待开票报表"), Multiple] - public IActionResult? AddBackGroundJob() - { - return null; - } - - [HttpPost, Display(Name = "撤销出库审核"), Multiple] - public IActionResult? RevokeReviewAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs deleted file mode 100644 index a3d41746..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs +++ /dev/null @@ -1,35 +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.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class IN_DN_DETAILController : GenericController -{ - public IN_DN_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 Create([FromBody] IN_DN_DETAIL model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "取消出库单"), Multiple] - public IActionResult? CancelOutbound() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs deleted file mode 100644 index 51370924..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs +++ /dev/null @@ -1,55 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class IN_SAController : GenericController -{ - public IN_SAController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [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); - } - - [NonAction] - public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] IN_SA model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "下载")] - public IActionResult? Download()//download - { - return null; - } - - [HttpPost, Display(Name = "生成出库单"), Multiple] - public IActionResult? CreateOutOrdersAsync() - { - return null; - } - -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/IN_SA_DETAILController.cs deleted file mode 100644 index 54c6f179..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/IN_SA_DETAILController.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; -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_SA_DETAILController : GenericController -{ - public IN_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [NonAction] - public override IActionResult Create([FromBody] IN_SA_DETAIL model) - { - return base.Create(model); - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs deleted file mode 100644 index 8378e470..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs +++ /dev/null @@ -1,60 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class JIT_DNController : GenericController -{ - public JIT_DNController(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 Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] JIT_DN model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "审核出库单"), Multiple] - public IActionResult? OutboundAuditAsync() - { - return null; - } - - [HttpPost, Display(Name = "生成待开票报表"), Multiple] - public IActionResult? AddBackGroundJob() - { - return null; - } - - [HttpPost, Display(Name = "撤销出库审核"), Multiple] - public IActionResult? RevokeReviewAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs deleted file mode 100644 index 9896474b..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs +++ /dev/null @@ -1,35 +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.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class JIT_DN_DETAILController : GenericController -{ - public JIT_DN_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 Create([FromBody] JIT_DN_DETAIL model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "取消出库单"), Multiple] - public IActionResult? CancelOutbound() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs deleted file mode 100644 index f83c72a1..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs +++ /dev/null @@ -1,54 +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.Application; -using WTA.Shared.Attributes; -using WTA.Shared.Controllers; -using WTA.Shared.Data; - -namespace WTA.Application.Identity.Controllers; - -public class JIT_SAController : GenericController -{ - public JIT_SAController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [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); - } - - [NonAction] - public override IActionResult Export([FromBody] PaginationModel model, bool includeAll = false, bool includeDeleted = false) - { - return base.Export(model, includeAll, includeDeleted); - } - - [NonAction] - public override IActionResult Create([FromBody] JIT_SA model) - { - return base.Create(model); - } - - [HttpPost, Display(Name = "下载")] - public IActionResult? Download()//download - { - return null; - } - - [HttpPost, Display(Name = "生成出库单"), Multiple] - public IActionResult? CreateOutOrdersAsync() - { - return null; - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SA_DETAILController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SA_DETAILController.cs deleted file mode 100644 index 29264102..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/JIT_SA_DETAILController.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.ComponentModel.DataAnnotations; -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_SA_DETAILController : GenericController -{ - public JIT_SA_DETAILController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - - [NonAction] - public override IActionResult Create([FromBody] JIT_SA_DETAIL model) - { - return base.Create(model); - } -} diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/MaterialController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/MaterialController.cs new file mode 100644 index 00000000..d140e75c --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/MaterialController.cs @@ -0,0 +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.Controllers; +using WTA.Shared.Data; + +namespace WTA.Application.Identity.Controllers; +public class MaterialController : GenericController +{ + 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/MaterialRelationshipController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/MaterialRelationshipController.cs new file mode 100644 index 00000000..638d19ae --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Controllers/MaterialRelationshipController.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 MaterialRelationshipController : GenericController +{ + public MaterialRelationshipController(ILogger logger, IRepository repository) : base(logger, repository) + { + } + + [NonAction] + public override IActionResult Create([FromBody] MaterialRelationship 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/TB_PRICE_LISTController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_LISTController.cs index 08347484..529d7fc7 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 @@ -1,4 +1,3 @@ -using System.ComponentModel.DataAnnotations; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using WTA.Application.Identity.Entities.SystemManagement; diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/TB_ReAssemblyRelationshipController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/TB_ReAssemblyRelationshipController.cs deleted file mode 100644 index e5551c12..00000000 --- a/docs/demo/src/WTA.Application/Identity/Controllers/TB_ReAssemblyRelationshipController.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.ComponentModel.DataAnnotations; -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 TB_ReAssemblyRelationshipController : GenericController -{ - public TB_ReAssemblyRelationshipController(ILogger logger, IRepository repository) : base(logger, repository) - { - } - [NonAction] - public override IActionResult Create([FromBody] TB_ReAssemblyRelationship 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 e429265a..368eb7c5 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs @@ -6,89 +6,126 @@ using WTA.Shared.Data; namespace WTA.Application.Identity.Data.Config; public class BaseDataDbConfig : IDbConfig, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration, -IEntityTypeConfiguration +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +//IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration, +IEntityTypeConfiguration { - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } public void Configure(EntityTypeBuilder builder) { } @@ -102,145 +139,244 @@ IEntityTypeConfiguration public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } - - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } - - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) - { } + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + //public void Configure(EntityTypeBuilder builder) + //{ } + + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } - public void Configure(EntityTypeBuilder builder) + public void Configure(EntityTypeBuilder builder) { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } + public void Configure(EntityTypeBuilder builder) + { } } diff --git a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs index 5309fc32..ccb9f8a4 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs @@ -123,48 +123,32 @@ public class IdentityDbSeed : IDbSeed { context.Set().Add(new HBPO_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); context.Set().Add(new HBPO_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new HBPO_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new HBPO_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new HBPO_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new HBPO_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); context.Set().Add(new BBAC_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); context.Set().Add(new BBAC_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new BBAC_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); - context.Set().Add(new BBAC_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); - context.Set().Add(new JIT_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new JIT_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new JIT_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new JIT_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new BJ_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new BJ_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new BJ_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new BJ_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new IN_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据" }); - context.Set().Add(new IN_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据" }); - context.Set().Add(new IN_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new IN_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); - context.Set().Add(new HBPO_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); - context.Set().Add(new HBPO_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" }); - context.Set().Add(new HBPO_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" }); - context.Set().Add(new HBPO_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" }); - context.Set().Add(new BBAC_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); - context.Set().Add(new BBAC_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" }); - context.Set().Add(new BBAC_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" }); - context.Set().Add(new BBAC_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" }); - context.Set().Add(new JIT_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); - context.Set().Add(new JIT_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" }); - context.Set().Add(new JIT_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" }); - context.Set().Add(new JIT_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" }); - context.Set().Add(new BJ_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); - context.Set().Add(new BJ_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" }); - context.Set().Add(new BJ_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" }); - context.Set().Add(new BJ_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" }); - context.Set().Add(new IN_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); - context.Set().Add(new IN_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" }); - context.Set().Add(new IN_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" }); - context.Set().Add(new IN_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" }); - context.Set().Add(new INVOICE { RealnvBillNum = "测试数据", InvbillNum = "123", INVGroupNum = "测试数据", FileName = "测试数据", BusinessType = "测试数据" }); - context.Set().Add(new INVOICE { RealnvBillNum = "测试数据", InvbillNum = "456", INVGroupNum = "测试数据", FileName = "测试数据", BusinessType = "测试数据" }); - context.Set().Add(new INVOICE_DETAIL { LU = "测试数据", InvbillNum = "123" }); - context.Set().Add(new INVOICE_DETAIL { LU = "测试数据", InvbillNum = "456" }); + context.Set().Add(new BBAC_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new BBAC_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new HBPO_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "123", State = "测试数据", InvGroupNum = "测试数据" }); + context.Set().Add(new HBPO_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" }); + context.Set().Add(new HBPO_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new HBPO_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "123", State = "测试数据", InvGroupNum = "测试数据" }); + context.Set().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" }); + context.Set().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" }); + context.Set().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" }); + context.Set().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细123", InvGroupNum = "待开票明细分组号测试数据一", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" }); + context.Set().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细456", InvGroupNum = "待开票明细分组号测试数据二", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" }); + context.Set().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系123", InvGroupNum = "发票和结算分组对应关系分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); + context.Set().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系456", InvGroupNum = "发票和结算分组对应关系分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); + context.Set().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); + context.Set().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", BillNum = "一号", State = "测试数据" }); + context.Set().Add(new PUB_SA { Version = "测试数据", BillNum = "二号", State = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "一号", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); + context.Set().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "二号", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" }); } private static void InitDictionaries(DbContext context) diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs new file mode 100644 index 00000000..eb7c5e3e --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs @@ -0,0 +1,112 @@ +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 = "BBAC可结算导入")] +public class BBAC_CAN_SA : BaseEntity +{ + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单据")] + [OneToMany] + public string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + + /// + /// 1、新建 2、已有出库3、已有扣减寄售库 + /// + [Display(Name = "状态")] + public string State { get; set; } = null!; + + /// + /// 明细记录行数 + /// + [Display(Name = "明细记录行数")] + public string InvGroupNum { get; set; } = null!; +} + +[Hidden] +[Display(Name = "BBAC可结算导入明细")] +public class BBAC_CAN_SA_DETAIL : BaseEntity +{ + /// + /// 对应字段（Material+ExternalCalNumber） + /// + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + /// + /// 期间 + /// + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + /// + /// 结算单号 + /// + [Display(Name = "结算单号")] + public string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + /// + /// 对应字段Material + /// + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 对应字段ExternalCalNumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + /// + /// 选择工厂导入 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + /// + /// 匹配价格表对应区间对应地点带出 + /// + [Display(Name = "单价")] + public decimal Price { get; set; } + + /// + /// ExternalCallNumber包含（R0）为买单件 1为JIS 2.为买单件 + /// + [Display(Name = "业务类别")] + public string Category { get; set; } = null!; + + /// + /// 对应字段MovementType，996正常，997为退货 + /// + [Display(Name = "是否退货")] + public string IsReturn { get; set; } = null!; + + /// + /// 对应字段PostingDate + /// + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + /// + /// 对应字段Reference + /// + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; +} 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 new file mode 100644 index 00000000..1f88e4ab --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_NOT_SA_DETAIL.cs @@ -0,0 +1,111 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; + +//[Display(Name = "BBAC不可结算导入")] +// +//public class BBAC_NOT_SA : BaseEntity +//{ +// [Display(Name = "期间")] +// public string Version { get; set; } = null!; + +// [Display(Name = "结算单据")] +// [OneToMany] +// public string BillNum { get; set; } = null!; + +// [Display(Name = "出库单号")] +// public string DNBillNum { get; set; } = null!; + +// /// +// /// 1、新建 2、已有出库3、已有扣减寄售库 +// /// +// [Display(Name = "状态")] +// public string State { get; set; } = null!; + +// /// +// /// 明细记录行数 +// /// +// [Display(Name = "明细记录行数")] +// public string RecordCount { get; set; } = null!; +//} +[JISBBACSettlementInvoicingGroup] +[Display(Name = "BBAC不可结算导入明细")] +public class BBAC_NOT_SA_DETAIL : BaseEntity +{ + /// + /// 对应字段（Material+ExternalCalNumber） + /// + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + /// + /// 期间 + /// + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + /// + /// 结算单号 + /// + [Display(Name = "结算单号")] + public string SettleBillNum { get; set; } = null!; + + /// + /// 对应字段Material + /// + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 对应字段ExternalCalNumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + /// + /// 选择工厂导入 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Quantity + /// + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + /// + /// 匹配价格表对应区间对应地点带出 + /// + [Display(Name = "单价")] + public decimal Price { get; set; } + + /// + /// ExternalCallNumber包含（R0）为买单件 1为JIS 2.为买单件 + /// + [Display(Name = "业务类别")] + public string Category { get; set; } = null!; + + /// + /// 对应字段MovementType，996正常，997为退货 + /// + [Display(Name = "是否退货")] + public string IsReturn { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + /// + /// 对应字段PostingDate + /// + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + /// + /// 对应字段Reference + /// + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; +} 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 new file mode 100644 index 00000000..6c631cce --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_PD_DETAIL.cs @@ -0,0 +1,48 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[JISBBACSettlementInvoicingGroup] +[Display(Name = "BBAC待扣减实体")] +public class BBAC_PD_DETAIL : BaseEntity +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单号")] + public string BillNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "替换零件号")] + public string RELU { get; set; } = null!; + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "替换生产号")] + public string REPN { get; set; } = null!; + + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "单价")] + public decimal Price { get; set; } + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; +} 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 0d6794e7..d2604ada 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 @@ -1,11 +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; [Order(2)] -[JISDataInput] +[JISBBACDataInputGroup] [Display(Name = "BBAC结算导入")] public class BBAC_SA : BaseEntity { @@ -34,7 +35,7 @@ public class BBAC_SA : BaseEntity } [Display(Name = "BBAC结算导入明细")] -[JISDataInput] + [Hidden] public class BBAC_SA_DETAIL : BaseEntity { @@ -109,4 +110,7 @@ public class BBAC_SA_DETAIL : BaseEntity /// [Display(Name = "结算分组")] public string GroupNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; } 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 1dcb437f..ea3a68f0 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 @@ -1,12 +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; [Order(4)] -[JISDataInput] -[Display(Name = "BBAC发运数据")] +[JISBBACDataInputGroup] +[Display(Name = "BBAC发运单")] public class BBAC_SE_DETAIL : BaseEntity { [Display(Name = "LU+生产码")] @@ -33,9 +34,6 @@ public class BBAC_SE_DETAIL : BaseEntity [Display(Name = "发货数量")] public decimal Qty { get; set; } - [Display(Name = "EDI数量")] - public decimal EDIQty { get; set; } - [Display(Name = "订单时间")] public DateTime BeginDate { get; set; } 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 new file mode 100644 index 00000000..ae51bfce --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_EDI.cs @@ -0,0 +1,39 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[JISBBACDataInputGroup] +[Display(Name = "BBAC的EDI数据")] +public class BBAC_SE_EDI : 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!; + + /// + /// 对应字段ExternalCalNumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "EDI数量")] + public decimal Qty { get; set; } + + [Display(Name = "订货时间")] + public DateTime BeginDate { get; set; } +} 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 new file mode 100644 index 00000000..11543f38 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_REPORT.cs @@ -0,0 +1,45 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Display(Name = "BBAC发运数据和EDI对比实体")] +[JISBBACDataComparisonGroup] +public class BBAC_SE_REPORT : 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 string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "发货数量")] + public decimal Qty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { 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/BBAC_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs new file mode 100644 index 00000000..d986e3f1 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs @@ -0,0 +1,64 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Attribute; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[JISBBACDataComparisonGroup] +[Display(Name = "BBAC发运数据与结算数据对比实体")] +public class BBAC_SE_SA_REPORT : BaseEntity +{ + + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + /// + /// 有结算无发货（无EDI数据) + ///有结算无发货（有EDI数据) + ///有结算有发货（无EDI数据) + ///有结算有发货（无价格信息) + ///有结算有发货（有EDI数据) + ///无结算有发货（有EDI数据) + ///无结算有发货（无EDI数据) + ///有结算有发货（有EDI数据) + ///有结算有发货（WMS多发） + /// + [Display(Name = "类别")] + public string Category { get; set; } = null!; + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + [Display(Name = "PJIS日顺序号")] + public string PJISSeqNumber { get; set; } = null!; + [Display(Name = "物料号")] + public string MaterialNumber { get; set; } = null!; + [Display(Name = "物料描述")] + public string MaterialDes { get; set; } = null!; + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + /// + /// 结算数据中的过账日期 + /// + [Display(Name = "客户下线时间")] + public DateTime CustomerOfflineTime { get; set; } + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + [Display(Name = "结算数量")] + public decimal SEQty { get; set; } + [Display(Name = "发货数量")] + public decimal WMSQty { get; set; } + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + [Display(Name = "匹配类型")] + public string MateType { get; set; } = null!; + [Display(Name = "定价")] + public decimal FixPrice { get; set; } + [Display(Name = "期间")] + public string Version { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_DN.cs deleted file mode 100644 index 74b69e1f..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_DN.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(4)] -[ChuKuDanGroup] -[Display(Name = "备件出库单")] -public class BJ_DN : BaseEntity -{ - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - /// - /// 如 J2023060212 - /// - [Display(Name = "出库单号")] - [OneToMany] - public string DNBillNum { get; set; } = null!; - - /// - /// 定时统计记录数量 - /// - [Display(Name = "各种状态统计显示")] - public string StockCount { get; set; } = null!; - -} -[Display(Name = "备件出库单明细")] -[ChuKuDanGroup] -[Hidden] -public class BJ_DN_DETAIL : BaseEntity -{ - [Display(Name = "LU+交付识别号")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; - - [Display(Name = "发票分组号")] - public string INVGroupNum { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = "交付识别号")] - public string PN { get; set; } = null!; - - [Display(Name = "工厂地点")] - public string Site { get; set; } = null!; - - /// - /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票分组 - /// - [Display(Name = "状态")] - public string State { get; set; } = null!; - - [Display(Name = "结算数量")] - public decimal Qty { get; set; } - - [Display(Name = "单价")] - public decimal Price { get; set; } - - [Display(Name = "结算日期（收货日期)")] - public DateTime SettleDate { get; set; } - - [Display(Name = "结算分组")] - public string GroupNum { 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 index b3283866..192ac34e 100644 --- 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 @@ -1,11 +1,9 @@ using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; +using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[BeiJianDataInput] +[BJDataInputGroup] [Display(Name = "备件发运数据查询")] public class BJ_SE_DETAIL : BaseEntity { @@ -17,14 +15,19 @@ public class BJ_SE_DETAIL : BaseEntity [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 ShppingDate { get; set; } + 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/Class7.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BOM.cs similarity index 64% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class7.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BOM.cs index 7b153e2b..dac3f358 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class7.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BOM.cs @@ -4,9 +4,9 @@ using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Order(1)] -[Edi] -[Display(Name = "EDI和HBPO核对")] -public class Class7 : BaseEntity +[SystemManagement] +[Display(Name = "BOM结构")] +[Order(9)] +public class BOM : BaseEntity { } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataInputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataInputAttribute.cs deleted file mode 100644 index 4c39b87a..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataInputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[Module] -[Display(Name = "数据输入")] -public class BeiJianDataInputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataOutputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataOutputAttribute.cs deleted file mode 100644 index 65efc9d4..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataOutputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Module] -[Display(Name = "数据输出")] -public class BeiJianDataOutputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianModule.cs deleted file mode 100644 index 8b78114f..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Module; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(4)] -[Display(Name = "备件业务")] -public class BeiJianModule : BaseModule -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class5.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CentralizedControl.cs similarity index 83% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class5.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CentralizedControl.cs index 1d3ab1d5..305f9654 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class5.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/CentralizedControl.cs @@ -7,6 +7,6 @@ namespace WTA.Application.Identity.Entities.SystemManagement; [Order(11)] [SystemManagement] [Display(Name = "期间设置")] -public class Class5 : BaseEntity +public class CentralizedControl : BaseEntity { } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/ChuKuDanGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/ChuKuDanGroup.cs deleted file mode 100644 index ca2ecb30..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/ChuKuDanGroup.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(6)] -[Display(Name = "出库单")] -public class ChuKuDanGroup : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class13.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class13.cs deleted file mode 100644 index f26a66db..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class13.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[JISDataOutput] -[Display(Name = "HBPO结算核对明细输出")] -public class Class13 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class14.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class14.cs deleted file mode 100644 index ebb7ad9e..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class14.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[JISDataOutput] -[Display(Name = "BBAC结算核对明细输出")] -public class Class14 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class15.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class15.cs deleted file mode 100644 index ca2676ed..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class15.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(3)] -[JISDataOutput] -[Display(Name = "HBPO无法出库明细与汇总输出")] -public class Class15 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class16.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class16.cs deleted file mode 100644 index 0ecbdd03..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class16.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(4)] -[JISDataOutput] -[Display(Name = "BBAC无法出库明细与汇总输出")] -public class Class16 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class17.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class17.cs deleted file mode 100644 index b0a1927b..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class17.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(5)] -[JISDataOutput] -[Display(Name = "HBPO结算发货明细与汇总")] -public class Class17 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class18.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class18.cs deleted file mode 100644 index c36c1625..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class18.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(6)] -[JISDataOutput] -[Display(Name = "BBAC结算发货明细与汇总")] -public class Class18 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class21.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class21.cs deleted file mode 100644 index fccff5b5..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class21.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[JITDataOutput] -[Display(Name = "JIT件结算核对明细输出")] -public class Class21 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class22.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class22.cs deleted file mode 100644 index 11969c26..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class22.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[JITDataOutput] -[Display(Name = "JIT件寄售库不能出库明细与汇总")] -public class Class22 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class23.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class23.cs deleted file mode 100644 index 40a01eb0..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class23.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(3)] -[JITDataOutput] -[Display(Name = "JIT件结算发货明细与汇总")] -public class Class23 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class26.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class26.cs deleted file mode 100644 index e778b928..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class26.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[BeiJianDataOutput] -[Display(Name = "备件结算核对明细输出")] -public class Class26 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class27.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class27.cs deleted file mode 100644 index d5ee78af..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class27.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[BeiJianDataOutput] -[Display(Name = "备件寄售库不能出库明细与汇总输出")] -public class Class27 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class28.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class28.cs deleted file mode 100644 index 33c9b503..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class28.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(3)] -[BeiJianDataOutput] -[Display(Name = "备件有结算有发货明细与汇总输出")] -public class Class28 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class29.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class29.cs deleted file mode 100644 index 010c15fa..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class29.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(4)] -[BeiJianDataOutput] -[Display(Name = "备件有结算无发货明细与汇总输出")] -public class Class29 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class32.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class32.cs deleted file mode 100644 index e8a18399..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class32.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[MaiDanJianDataOutput] -[Display(Name = "印度件结算核对明细输出")] -public class Class32 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class33.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class33.cs deleted file mode 100644 index f83a3241..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class33.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[MaiDanJianDataOutput] -[Display(Name = "印度件寄售库不能出库明细与汇总输出")] -public class Class33 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class34.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class34.cs deleted file mode 100644 index 2efe4c5b..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class34.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(3)] -[MaiDanJianDataOutput] -[Display(Name = "印度件有结算有发货明细与汇总输出")] -public class Class34 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class35.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class35.cs deleted file mode 100644 index d0d3f7f5..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class35.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(4)] -[MaiDanJianDataOutput] -[Display(Name = "印度件有结算无发货明细与汇总输出")] -public class Class35 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class41.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class41.cs deleted file mode 100644 index 6d9b9bc8..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class41.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(6)] -[ChuKuDanGroup] -[Display(Name = "不能出库记录出库业务")] -public class Class41 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class43.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class43.cs deleted file mode 100644 index b137a329..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class43.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[ShangWuShenHeGroup] -[Display(Name = "BBAC-JIS商务待开票")] -public class Class43 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class44.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class44.cs deleted file mode 100644 index 88c6c1ac..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class44.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(3)] -[ShangWuShenHeGroup] -[Display(Name = "JIT件商务发票待开票")] -public class Class44 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class45.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class45.cs deleted file mode 100644 index b39edcba..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class45.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(4)] -[ShangWuShenHeGroup] -[Display(Name = "备件商务发票待开票")] -public class Class45 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class46.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class46.cs deleted file mode 100644 index 37b32c51..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class46.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(5)] -[ShangWuShenHeGroup] -[Display(Name = "印度件商务发票待开票")] -public class Class46 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class47.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class47.cs deleted file mode 100644 index 785c3dac..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class47.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[CaiWuShenHeGroup] -[Display(Name = " BBAC-JIS财务管理审核")] -public class Class47 : BaseEntity -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/EdiAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/EdiAttribute.cs deleted file mode 100644 index 74e9f29b..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/EdiAttribute.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Display(Name = "EDI业务")] -public class EdiAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataComparisonGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataComparisonGroup.cs new file mode 100644 index 00000000..d0b522fc --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataComparisonGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(2)] +[Display(Name = "数据对比")] +[Module] +public class BJDataComparisonGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataInputGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataInputGroup.cs new file mode 100644 index 00000000..98ef4aa1 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJDataInputGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(1)] +[Display(Name = "数据输入")] +[Module] +public class BJDataInputGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJSettlementInvoicingGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJSettlementInvoicingGroup.cs new file mode 100644 index 00000000..800ede79 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/BJSettlementInvoicingGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(3)] +[Display(Name = "结算开票")] +[Module] +public class BJSettlementInvoicingGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataComparisonGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataComparisonGroup.cs new file mode 100644 index 00000000..2de4950e --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataComparisonGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(2)] +[Display(Name = "数据对比")] +[Module] +public class INDataComparisonGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataInputGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataInputGroup.cs new file mode 100644 index 00000000..076bb099 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INDataInputGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(1)] +[Display(Name = "数据输入")] +[Module] +public class INDataInputGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INSettlementInvoicingGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INSettlementInvoicingGroup.cs new file mode 100644 index 00000000..b46f36c3 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/INSettlementInvoicingGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(3)] +[Display(Name = "结算开票")] +[Module] +public class INSettlementInvoicingGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataComparisonGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataComparisonGroup.cs new file mode 100644 index 00000000..ef8a8405 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataComparisonGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Attribute; + +[Order(2)] +[Module] +[Display(Name = "数据对比")] +public class JISBBACDataComparisonGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataInputGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataInputGroup.cs new file mode 100644 index 00000000..8a2ca1ba --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACDataInputGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Attribute; + +[Order(1)] +[Module] +[Display(Name = "数据输入")] +public class JISBBACDataInputGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACSettlementInvoicingGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACSettlementInvoicingGroup.cs new file mode 100644 index 00000000..904fe18f --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISBBACSettlementInvoicingGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Attribute; + +[Order(3)] +[Module] +[Display(Name = "结算开票")] +public class JISBBACSettlementInvoicingGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataComparisonGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataComparisonGroup.cs new file mode 100644 index 00000000..ca45f531 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataComparisonGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(2)] +[Module] +[Display(Name = "数据对比")] +public class JISHBPODataComparisonGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataInputGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataInputGroup.cs new file mode 100644 index 00000000..4c3b1b0b --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPODataInputGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(1)] +[Module] +[Display(Name = "数据输入")] +public class JISHBPODataInputGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPOSettlementInvoicingGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPOSettlementInvoicingGroup.cs new file mode 100644 index 00000000..0e792f66 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JISHBPOSettlementInvoicingGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(3)] +[Module] +[Display(Name = "结算开票")] +public class JISHBPOSettlementInvoicingGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataComparisonGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataComparisonGroup.cs new file mode 100644 index 00000000..aed0074a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataComparisonGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(2)] +[Module] +[Display(Name = "数据对比")] +public class JITDataComparisonGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataInputGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataInputGroup.cs new file mode 100644 index 00000000..faa1ea62 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITDataInputGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(1)] +[Module] +[Display(Name = "数据输入")] +public class JITDataInputGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITSettlementInvoicingGroup.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITSettlementInvoicingGroup.cs new file mode 100644 index 00000000..eeb54af3 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Group/JITSettlementInvoicingGroup.cs @@ -0,0 +1,12 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Module; +using WTA.Shared.Attributes; + +namespace WTA.Application.Identity.Entities.SystemManagement.Group; + +[Order(3)] +[Module] +[Display(Name = "结算开票")] +public class JITSettlementInvoicingGroup : GroupAttribute +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs similarity index 62% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SA.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs index 832174d7..0e6820b9 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_CAN_SA.cs @@ -1,24 +1,21 @@ using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[BeiJianDataInput] -[Display(Name = "备件结算导入")] -public class BJ_SA : BaseEntity +[JISHBPOSettlementInvoicingGroup] +[Display(Name = "HBPO可结算导入")] +public class HBPO_CAN_SA : BaseEntity { [Display(Name = "期间")] public string Version { get; set; } = null!; - - [Display(Name = "结算单据号")] - [OneToMany] + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + [Display(Name = "结算单据")] + [OneToMany] public string BillNum { get; set; } = null!; - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; - /// /// 1、新建 2、已有出库3、已有扣减寄售库 /// @@ -29,21 +26,21 @@ public class BJ_SA : BaseEntity /// 明细记录行数 /// [Display(Name = "明细记录行数")] - public string RecordCount { get; set; } = null!; + public string InvGroupNum { get; set; } = null!; } -[Display(Name = "备件结算导入明细")] -[BeiJianDataInput] [Hidden] -public class BJ_SA_DETAIL : BaseEntity +[Display(Name = "HBPO可结算导入明细")] + +public class HBPO_CAN_SA_DETAIL : BaseEntity { /// - /// 对应字段（零件号+交付识别号） + /// 对应字段（PartNumber+ProductioNumber） /// - [Display(Name = "LU+交付识别号")] + [Display(Name = "LU+生产码")] public string KeyCode { get; set; } = null!; /// - /// 期间号 + /// 期间 /// [Display(Name = "期间")] public string Version { get; set; } = null!; @@ -53,46 +50,50 @@ public class BJ_SA_DETAIL : BaseEntity /// [Display(Name = "结算单号")] public string BillNum { get; set; } = null!; - + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; /// - /// 对应字段【零件号】 + /// 对应字段PartNumber /// [Display(Name = "零件号")] public string LU { get; set; } = null!; /// - /// 对应字段【交付识别号】 + /// 对应字段productionlumber /// - [Display(Name = "交付识别号")] + [Display(Name = "生产码")] public string PN { get; set; } = null!; /// - /// 无 + /// 对应字段filename 区分 cn1、cn5 /// [Display(Name = "工厂地点")] public string Site { get; set; } = null!; /// - /// 对应字段【数量】 + /// 对应字段Qty /// [Display(Name = "结算数量")] public decimal Qty { get; set; } /// - /// 从备件价格单里取 + /// 匹配价格表对应区间带出 /// [Display(Name = "单价")] public decimal Price { get; set; } /// - /// 无 + /// 对应字段ReceiveDate /// [Display(Name = "结算日期（收货日期)")] public DateTime SettleDate { get; set; } /// - /// 对应字段【凭证号】 + /// 对应字段DeliveryNode /// [Display(Name = "结算分组")] public string GroupNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs deleted file mode 100644 index 75818f30..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs +++ /dev/null @@ -1,75 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[ChuKuDanGroup] -[Display(Name = "HBPO-JIS出库单")] -public class HBPO_DN : BaseEntity -{ - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - /// - /// 如 H2023060212 - /// - [Display(Name = "出库单号")] - [OneToMany] - public string DNBillNum { get; set; } = null!; - - /// - /// 定时统计记录数量 - /// - [Display(Name = "出库记状态统计")] - public string StockCount { get; set; } = null!; -} - -[Display(Name = "HBPO出库单明细")] -[ChuKuDanGroup] -[Hidden] -public class HBPO_DN_DETAIL : BaseEntity -{ - [Display(Name = "LU+生产码")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "结算单号")] - public string BillNum { get; set; } = null!; - - [Display(Name = "发票分组号")] - public string INVGroupNum { get; set; } = null!; - - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = "生产码")] - public string PN { get; set; } = null!; - - /// - /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票信息 - /// - [Display(Name = "状态")] - public string State { get; set; } = null!; - - [Display(Name = "工厂地点")] - public string Site { get; set; } = null!; - - [Display(Name = "发货数量")] - public decimal Qty { get; set; } - - [Display(Name = "单价")] - public decimal Price { get; set; } - - [Display(Name = "结算日期（收货日期)")] - public DateTime SettleDate { get; set; } - - [Display(Name = "结算分组")] - public string GroupNum { get; set; } = null!; -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs new file mode 100644 index 00000000..a964c085 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_NOT_SA_DETAIL.cs @@ -0,0 +1,95 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +// +//[Display(Name = "HBPO不可结算导入")] +//public class HBPO_NOT_SA: BaseEntity +//{ +// [Display(Name = "期间")] +// public string Version { get; set; } = null!; + +// [Display(Name = "结算单据")] +// [OneToMany] +// public string BillNum { get; set; } = null!; + +// [Display(Name = "出库单号")] +// public string DNBillNum { get; set; } = null!; + +// /// +// /// 1、新建 2、已有出库3、已有扣减寄售库 +// /// +// [Display(Name = "状态")] +// public string State { get; set; } = null!; + +// /// +// /// 明细记录行数 +// /// +// [Display(Name = "明细记录行数")] +// public string RecordCount { get; set; } = null!; +//} +[JISHBPOSettlementInvoicingGroup] +[Display(Name = "HBPO不可结算导入明细")] +public class HBPO_NOT_SA_DETAIL : BaseEntity +{ + /// + /// 对应字段（PartNumber+ProductioNumber） + /// + [Display(Name = "LU+生产码")] + public string KeyCode { get; set; } = null!; + + /// + /// 期间 + /// + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单号")] + public string SettleBillNum { get; set; } = null!; + + /// + /// 对应字段PartNumber + /// + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 对应字段productionlumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + /// + /// 对应字段filename 区分 cn1、cn5 + /// + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + /// + /// 对应字段Qty + /// + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + /// + /// 匹配价格表对应区间带出 + /// + [Display(Name = "单价")] + public decimal Price { get; set; } + + /// + /// 对应字段ReceiveDate + /// + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + /// + /// 对应字段DeliveryNode + /// + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; +} 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 new file mode 100644 index 00000000..1cdabdc7 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_PD_DETAIL.cs @@ -0,0 +1,46 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[JISHBPOSettlementInvoicingGroup] +[Display(Name = "HBPO待扣减实体")] +public class HBPO_PD_DETAIL : BaseEntity +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单号")] + public string BillNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "替换零件号")] + public string RELU { get; set; } = null!; + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "替换生产号")] + public string REPN { get; set; } = null!; + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "单价")] + public decimal Price { get; set; } + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; +} 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 cb1bf997..72667cf7 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 @@ -1,11 +1,10 @@ using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[JISDataInput] +[JISHBPODataInputGroup] [Display(Name = "HBPO结算导入")] public class HBPO_SA : BaseEntity { @@ -30,14 +29,15 @@ public class HBPO_SA : BaseEntity /// [Display(Name = "明细记录行数")] public string RecordCount { get; set; } = null!; - //集合导航 + } + [Display(Name = "HBPO结算导入明细")] -[JISDataInput] + [Hidden] public class HBPO_SA_DETAIL : BaseEntity - + { /// /// 对应字段（PartNumber+ProductioNumber） @@ -99,4 +99,6 @@ public class HBPO_SA_DETAIL : BaseEntity [Display(Name = "结算分组")] public string GroupNum { get; set; } = null!; + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; } 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 825f9a26..9c3db4c4 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs @@ -1,9 +1,11 @@ using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; + [Display(Name = "HBPO发运数据")] -[JISDataInput] +[JISHBPODataInputGroup] public class HBPO_SE_DETAIL : BaseEntity { [Display(Name = "LU+生产码")] @@ -30,9 +32,6 @@ public class HBPO_SE_DETAIL : BaseEntity [Display(Name = "发货数量")] public decimal Qty { get; set; } - [Display(Name = "EDI数量")] - public decimal EDIQty { get; set; } - [Display(Name = "订单时间")] public DateTime BeginDate { get; set; } @@ -41,5 +40,4 @@ public class HBPO_SE_DETAIL : BaseEntity [Display(Name = "Wms发货单号")] public string WmsBillNum { get; set; } = null!; - } 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 new file mode 100644 index 00000000..2d7143c6 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs @@ -0,0 +1,39 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[JISHBPODataInputGroup] +[Display(Name = "HBPO的EDI数据")] +public class HBPO_SE_EDI : 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!; + + /// + /// 对应字段ExternalCalNumber + /// + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "EDI数量")] + public decimal Qty { get; set; } + + [Display(Name = "订货时间")] + public DateTime BeginDate { get; set; } +} 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 new file mode 100644 index 00000000..6f35e706 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_REPORT.cs @@ -0,0 +1,45 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Display(Name = "HBPO发运数据和EDI对比实体")] +[JISHBPODataComparisonGroup] +public class HBPO_SE_REPORT : 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 string SeqNumber { get; set; } = null!; + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "发货数量")] + public decimal Qty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { 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/HBPO_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs new file mode 100644 index 00000000..91066058 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs @@ -0,0 +1,80 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Display(Name = "HBPO发运数据与结算数据对比实体")] +[JISHBPODataComparisonGroup] +public class HBPO_SE_SA_REPORT : BaseEntity +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + /// + /// 有结算无发货（无EDI数据) + ///有结算无发货（有EDI数据) + ///有结算有发货（无EDI数据) + ///有结算有发货（无价格信息) + ///有结算有发货（有EDI数据) + ///无结算有发货（有EDI数据) + ///无结算有发货（无EDI数据) + ///有结算有发货（有EDI数据) + ///有结算有发货（WMS多发） + /// + [Display(Name = "类别")] + public string Category { get; set; } = null!; + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "PJIS日顺序号")] + public string PJISSeqNumber { get; set; } = null!; + + [Display(Name = "物料号")] + public string MaterialNumber { get; set; } = null!; + + [Display(Name = "物料描述")] + public string MaterialDes { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 结算数据中的过账日期 + /// + [Display(Name = "客户下线时间")] + public DateTime CustomerOfflineTime { get; set; } + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal SEQty { get; set; } + + [Display(Name = "发货数量")] + public decimal WMSQty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + + [Display(Name = "匹配类型")] + public string MateType { get; set; } = null!; + + [Display(Name = "定价")] + public decimal FixPrice { get; set; } + + [Display(Name = "期间")] + public string Version { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE.cs deleted file mode 100644 index e5bcf554..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[ShangWuShenHeGroup] -[Display(Name = "财务管理审核主表")] -public class INVOICE : BaseEntity -{ - [Display(Name = "实际纸质发票号")] - public string RealnvBillNum { get; set; } = null!; - - [Display(Name = "系统生成发票号")] - [OneToMany] - public string InvbillNum { get; set; } = null!; - - [Display(Name = "未税金额")] - public decimal Amt { get; set; } - - [Display(Name = "税后金额")] - public decimal TaxAmt { get; set; } - - [Display(Name = "发票分组号")] - public string INVGroupNum { get; set; } = null!; - - [Display(Name = "开票Excel文件")] - public string FileName { get; set; } = null!; - - /// - /// 1-HBPO 2-BBAC(和买单件一起开票,扣减库存时要注意分开) 3-JIT 4-备件、5-印度件 - /// - [Display(Name = "业务类别")] - public string BusinessType { get; set; } = null!; - -} - -[ShangWuShenHeGroup] -[Hidden] -[Display(Name = "财务管理审核明细")] -public class INVOICE_DETAIL : BaseEntity -{ - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = "单价")] - public decimal PRICE { get; set; } - - [Display(Name = "数量")] - public decimal Qty { get; set; } - - [Display(Name = "金额")] - public decimal Amt { get; set; } - [Display(Name = "系统生成发票号")] - public string InvbillNum { get; set; } = null!; -} 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 new file mode 100644 index 00000000..faac7b91 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_GRP.cs @@ -0,0 +1,96 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; + +[ShangWuShenHeGroup] +[Display(Name = "发票分组")] +public class INVOICE_GRP : BaseEntity +{ + [Display(Name = "实际纸质发票号")] + public string RealnvBillNum { get; set; } = null!; + [OneToMany] + [OneToMany] + [Display(Name = "系统生成发票号")] + public string InvbillNum { get; set; } = null!; + + [Display(Name = "未税金额")] + public decimal Amt { get; set; } + + [Display(Name = "税后金额")] + public decimal TaxAmt { get; set; } + [OneToMany] + [OneToMany] + [OneToOne] + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "开票Excel文件")] + public string FileName { get; set; } = null!; + + /// + /// 1-HBPO 2-BBAC(和买单件一起开票,扣减库存时要注意分开) 3-JIT 4-备件、5-印度件 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } = null!; +} + +//[ShangWuShenHeGroup] +//[Hidden] +//[Display(Name = "财务管理审核明细")] +//public class INVOICE_DETAIL : BaseEntity +//{ +// [Display(Name = "零件号")] +// public string LU { get; set; } = null!; + +// [Display(Name = "单价")] +// public decimal PRICE { get; set; } + +// [Display(Name = "数量")] +// public decimal Qty { get; set; } + +// [Display(Name = "金额")] +// public decimal Amt { get; set; } + +// [Display(Name = "发票号")] +// public string InvbillNum { get; set; } = null!; +// [Display(Name = "发票分组号")] +// public string InvGroupNum { get; set; } = null!; +//[ShangWuShenHeGroup] +//[Display(Name = "待开票明细")] +//public class INVOICE_WAIT_DETAIL : BaseEntity +//{ +// [Display(Name = "发票号")] +// public string InvbillNum { get; set; } = null!; + +// [Display(Name = "零件号")] +// public string LU { get; set; } = null!; + +// [Display(Name = "单价")] +// public decimal PRICE { get; set; } + +// [Display(Name = "数量")] +// public decimal Qty { get; set; } + +// [Display(Name = "金额")] +// public decimal Amt { get; set; } + +// [Display(Name = "扩展字段1")] +// public string Extend1 { get; set; } = null!; + +// [Display(Name = "扩展字段2")] +// public string Extend2 { get; set; } = null!; + +// [Display(Name = "扩展字段3")] +// public string Extend3 { get; set; } = null!; + +// [Display(Name = "扩展字段4")] +// public string Extend4 { get; set; } = null!; +// [Display(Name = "期间")] +// public string Version { get; set; } = null!; +// [Display(Name = "发票分组号")] +// public string InvGroupNum { get; set; } = null!; +// [Display(Name = "业务分类")] +// public string BussiessType { get; set; } = null!; +//} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_MAP_GROUP.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_MAP_GROUP.cs new file mode 100644 index 00000000..6d89172a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_MAP_GROUP.cs @@ -0,0 +1,31 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Hidden] +[Display(Name = "发票和结算分组对应关系")] +[ShangWuShenHeGroup] +public class INVOICE_MAP_GROUP : BaseEntity +{ + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "发票号")] + public string InvbillNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算分组号")] + public string SettleGroupNum { get; set; } = null!; + + [Display(Name = "金额")] + public decimal Amt { get; set; } + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_NOT_SETTLE.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_NOT_SETTLE.cs new file mode 100644 index 00000000..29d5c0d1 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_NOT_SETTLE.cs @@ -0,0 +1,31 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Hidden] +[Display(Name = "不可结算零件号")] +[ShangWuShenHeGroup] +public class INVOICE_NOT_SETTLE : BaseEntity +{ + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算分组号")] + public string SettleGroupNum { get; set; } = null!; + + [Display(Name = "可结算零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "不可结算零件号")] + public string LU1 { get; set; } = null!; + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_WAIT_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_WAIT_DETAIL.cs new file mode 100644 index 00000000..cddbd3bc --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE_WAIT_DETAIL.cs @@ -0,0 +1,49 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Hidden] +[ShangWuShenHeGroup] +[Display(Name = "待开票明细")] +public class INVOICE_WAIT_DETAIL : BaseEntity +{ + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "发票号")] + public string InvbillNum { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "单价")] + public decimal PRICE { get; set; } + + [Display(Name = "数量")] + public decimal Qty { get; set; } + + [Display(Name = "金额")] + public decimal Amt { get; set; } + + /// + /// 1、BBAC-JIS 2、HBPO-JIS 3、JIT 4、备件 5、印度件 + /// + [Display(Name = "业务分类")] + public string BussiessType { get; set; } = null!; + + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展字段3")] + public string Extend3 { get; set; } = null!; + + [Display(Name = "扩展字段4")] + public string Extend4 { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_DN.cs deleted file mode 100644 index 977dbeb5..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_DN.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(5)] -[ChuKuDanGroup] -[Display(Name = "印度件出库单")] -public class IN_DN : BaseEntity -{ - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - /// - /// 如 J2023060212 - /// - [Display(Name = "出库单号")] - [OneToMany] - public string DNBillNum { get; set; } = null!; - - /// - /// 定时统计记录数量 - /// - [Display(Name = "各种状态统计显示")] - public string StockCount { get; set; } = null!; -} -[ChuKuDanGroup] -[Display(Name = "印度件出库单明细")] -[Hidden] -public class IN_DN_DETAIL : BaseEntity -{ - [Display(Name = "LU+交付识别号")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "出库单号")] - - public string DNBillNum { get; set; } = null!; - - [Display(Name = "发票分组号")] - public string INVGroupNum { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = "交付识别号")] - public string PU { get; set; } = null!; - - [Display(Name = "工厂地点")] - public string Site { get; set; } = null!; - - /// - /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票分组 - /// - [Display(Name = "状态")] - public string State { get; set; } = null!; - - [Display(Name = "结算数量")] - public decimal Qty { get; set; } - - [Display(Name = "单价")] - public decimal Price { get; set; } - - [Display(Name = "结算日期（收货日期)")] - public DateTime SettleDate { get; set; } - - [Display(Name = "结算分组")] - public string GroupNum { get; set; } = null!; - -} 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 index 112e6469..a413d1ab 100644 --- 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 @@ -1,11 +1,10 @@ using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; +using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; -[Order(2)] -[MaiDanJianDataInput] +[INDataInputGroup] [Display(Name = "印度件发运数据查询")] public class IN_SE_DETAIL : BaseEntity { @@ -32,5 +31,4 @@ public class IN_SE_DETAIL : BaseEntity [Display(Name = "WMS发货单号")] public string WmsBillNum { get; set; } = null!; - } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataInputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataInputAttribute.cs deleted file mode 100644 index 1ea76d7e..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataInputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[Module] -[Display(Name = "数据输入")] -public class JISDataInputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataOutputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataOutputAttribute.cs deleted file mode 100644 index 6bd31ba8..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataOutputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Module] -[Display(Name = "数据输出")] -public class JISDataOutputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISModule.cs deleted file mode 100644 index 027dc78e..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Module; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Display(Name = "JIS业务")] -public class JISModule : BaseModule -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataInputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataInputAttribute.cs deleted file mode 100644 index 67680a8b..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataInputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[Module] -[Display(Name = "数据输入")] -public class JITDataInputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataOutputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataOutputAttribute.cs deleted file mode 100644 index 53e999b1..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITDataOutputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Module] -[Display(Name = "数据输出")] -public class JITDataOutputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_DN.cs deleted file mode 100644 index e402cd84..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_DN.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(3)] -[ChuKuDanGroup] -[Display(Name = "JIT出库单主表")] -public class JIT_DN : BaseEntity -{ - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - /// - /// 如 J2023060212 - /// - [Display(Name = "出库单号")] - [OneToMany] - public string DNBillNum { get; set; } = null!; - - /// - /// 定时统计记录数量 - /// - [Display(Name = "各种状态统计显示")] - public string StockCount { get; set; } = null!; - -} - -[Display(Name = "JIT出库单明细")] -[ChuKuDanGroup] -[Hidden] -public class JIT_DN_DETAIL : BaseEntity -{ - [Display(Name = "LU+ASN单号")] - public string KeyCode { get; set; } = null!; - - [Display(Name = "期间")] - public string Version { get; set; } = null!; - - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; - - [Display(Name = "发票分组号")] - public string INVGroupNum { get; set; } = null!; - - [Display(Name = "零件号")] - public string LU { get; set; } = null!; - - [Display(Name = "发货单号")] - public string PN { get; set; } = null!; - - [Display(Name = "工厂地点")] - public string Site { get; set; } = null!; - - /// - /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票分组 - /// - [Display(Name = "状态")] - public string State { get; set; } = null!; - - [Display(Name = "结算数量")] - public decimal Qty { get; set; } - - [Display(Name = "单价")] - public decimal Price { get; set; } - - [Display(Name = "结算日期（收货日期)")] - public DateTime SettleDate { get; set; } - - [Display(Name = "结算分组")] - public string GroupNum { 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 index 1692a026..b6e3f79c 100644 --- 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 @@ -1,11 +1,10 @@ using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[JITDataInput] +[JITDataInputGroup] [Display(Name = "JIT发运数据查询")] public class JIT_SE_DETAIL : BaseEntity { @@ -28,7 +27,7 @@ public class JIT_SE_DETAIL : BaseEntity public DateTime BeginDate { get; set; } [Display(Name = ("发货时间"))] - public DateTime ShppingDate { get; set; } + 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 new file mode 100644 index 00000000..96186b5f --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs @@ -0,0 +1,80 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[JITDataComparisonGroup] +[Display(Name = "JIT发运数据与结算数据对比实体")] +public class JIT_SE_SA_REPORT : BaseEntity +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + /// + /// 有结算无发货（无EDI数据) + ///有结算无发货（有EDI数据) + ///有结算有发货（无EDI数据) + ///有结算有发货（无价格信息) + ///有结算有发货（有EDI数据) + ///无结算有发货（有EDI数据) + ///无结算有发货（无EDI数据) + ///有结算有发货（有EDI数据) + ///有结算有发货（WMS多发） + /// + [Display(Name = "类别")] + public string Category { get; set; } = null!; + + [Display(Name = "Wms发货单号")] + public string WmsBillNum { get; set; } = null!; + + [Display(Name = "发货时间")] + public DateTime ShippingDate { get; set; } + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "日顺序号")] + public string SeqNumber { get; set; } = null!; + + [Display(Name = "PJIS日顺序号")] + public string PJISSeqNumber { get; set; } = null!; + + [Display(Name = "物料号")] + public string MaterialNumber { get; set; } = null!; + + [Display(Name = "物料描述")] + public string MaterialDes { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + /// + /// 结算数据中的过账日期 + /// + [Display(Name = "客户下线时间")] + public DateTime CustomerOfflineTime { get; set; } + + [Display(Name = "小总成号")] + public string AssemblyCode { get; set; } = null!; + + [Display(Name = "注塑码")] + public string InjectionCode { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal SEQty { get; set; } + + [Display(Name = "发货数量")] + public decimal WMSQty { get; set; } + + [Display(Name = "EDI数量")] + public decimal EDIQty { get; set; } + + [Display(Name = "匹配类型")] + public string MateType { get; set; } = null!; + + [Display(Name = "定价")] + public decimal FixPrice { get; set; } + + [Display(Name = "期间")] + public string Version { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/M_PD_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/M_PD_DETAIL.cs new file mode 100644 index 00000000..0506bf5a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/M_PD_DETAIL.cs @@ -0,0 +1,48 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Hidden] +[Display(Name = "买单件待扣减实体")] +public class M_PD_DETAIL : BaseEntity +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单号")] + public string BillNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "替换零件号")] + public string RELU { get; set; } = null!; + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "替换生产号")] + public string REPN { get; set; } = null!; + + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "单价")] + public decimal Price { get; set; } + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataInputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataInputAttribute.cs deleted file mode 100644 index b73f2ab7..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataInputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[Module] -[Display(Name = "数据输入")] -public class MaiDanJianDataInputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataOutputAttribute.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataOutputAttribute.cs deleted file mode 100644 index a5f3ce57..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianDataOutputAttribute.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Module] -[Display(Name = "数据输出")] -public class MaiDanJianDataOutputAttribute : GroupAttribute -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianModule.cs deleted file mode 100644 index 83b7ec97..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaiDanJianModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Module; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(5)] -[Display(Name = "备件业务")] -public class MaiDanJianModule : BaseModule -{ -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class1.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs similarity index 98% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class1.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs index dfe3431e..3a0c935f 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class1.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs @@ -7,7 +7,7 @@ namespace WTA.Application.Identity.Entities.SystemManagement; [Order(7)] [SystemManagement] [Display(Name = "物料主数据")] -public class Class1 : BaseEntity +public class Material : BaseEntity { } @@ -87,28 +87,28 @@ public class Class1 : BaseEntity //} //[Order(1)] -//[JISDataInput] +// //[Display(Name = "HBPO结算导入")] //public class Class9 : BaseEntity //{ //} //[Order(2)] -//[JISDataInput] +// //[Display(Name = "BBAC结算导入")] //public class Class10 : BaseEntity //{ //} //[Order(3)] -//[JISDataInput] +// //[Display(Name = "HBPO发运数据")] //public class Class11 : BaseEntity //{ //} //[Order(4)] -//[JISDataInput] +// //[Display(Name = "BBAC发运数据")] //public class Class12 : BaseEntity //{ @@ -300,14 +300,14 @@ public class Class1 : BaseEntity //} //[Order(1)] -//[MaiDanJianDataInput] +// //[Display(Name = "印度件结算导入")] //public class Class30 : BaseEntity //{ //} //[Order(2)] -//[MaiDanJianDataInput] +// //[Display(Name = "印度件发运数据查询")] //public class Class31 : BaseEntity //{ diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class2.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaterialRelationship.cs similarity index 83% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class2.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaterialRelationship.cs index fd37a61d..59f299e5 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class2.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/MaterialRelationship.cs @@ -7,6 +7,6 @@ namespace WTA.Application.Identity.Entities.SystemManagement; [Order(8)] [SystemManagement] [Display(Name = "客户零件关系")] -public class Class2 : BaseEntity +public class MaterialRelationship : BaseEntity { } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/BJModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/BJModule.cs new file mode 100644 index 00000000..648e367b --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/BJModule.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Module; + +namespace WTA.Application.Identity.Entities.SystemManagement.Module; + +[Order(5)] +[Display(Name = "备件")] +public class BJModule : BaseModule +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/INModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/INModule.cs new file mode 100644 index 00000000..883a64fc --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/INModule.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Module; + +namespace WTA.Application.Identity.Entities.SystemManagement.Module; + +[Display(Name = "印度件")] +[Order(6)] +public class INModule : BaseModule +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISBBACModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISBBACModule.cs new file mode 100644 index 00000000..75103638 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISBBACModule.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Module; + +namespace WTA.Application.Identity.Entities.SystemManagement.Module; + +[Order(2)] +[Display(Name = "JIS-BBAC")] +public class JISBBACModule : BaseModule +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISHBPOModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISHBPOModule.cs new file mode 100644 index 00000000..c209e57a --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JISHBPOModule.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Module; + +namespace WTA.Application.Identity.Entities.SystemManagement.Module; + +[Order(3)] +[Display(Name = "JIS-HBPO")] +public class JISHBPOModule : BaseModule +{ +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITModule.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JITModule.cs similarity index 56% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITModule.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JITModule.cs index ccac5a19..51dc2a65 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JITModule.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Module/JITModule.cs @@ -2,10 +2,10 @@ using System.ComponentModel.DataAnnotations; using WTA.Shared.Attributes; using WTA.Shared.Module; -namespace WTA.Application.Identity.Entities.SystemManagement; +namespace WTA.Application.Identity.Entities.SystemManagement.Module; -[Order(3)] -[Display(Name = "JIT业务")] +[Order(4)] +[Display(Name = "直供件")] public class JITModule : BaseModule { } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs similarity index 56% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SA.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs index 0a281f9e..a920b53a 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs @@ -3,38 +3,39 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[MaiDanJianDataInput] -[Display(Name = "印度件结算导入")] -public class IN_SA : BaseEntity +[Hidden] +[Display(Name = "PUB可结算导入")] +public class PUB_CAN_SA : BaseEntity { [Display(Name = "期间")] public string Version { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + [Display(Name = "结算单据")] - [OneToMany] + [OneToMany] public string BillNum { get; set; } = null!; - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; - /// - /// 1、新建 2、已有出库单3、已有扣减寄售库 + /// 1、新建 2、已有出库3、已有扣减寄售库 /// [Display(Name = "状态")] public string State { get; set; } = null!; -} + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务分类")] + public string BusinessType { get; set; } = null!; -[Display(Name = "印度件结算明细")] -[MaiDanJianDataInput] + [Display(Name = "明细记录行数")] + public string InvGroupNum { get; set; } = null!; +} +[Display(Name = "PUB可结算导入明细")] [Hidden] -public class IN_SA_DETAIL : BaseEntity +public class PUB_CAN_SA_DETAIL : BaseEntity { - /// - /// 对应字段（LU+External Delivery ID） - /// [Display(Name = "LU+ASN单号")] public string KeyCode { get; set; } = null!; @@ -50,26 +51,29 @@ public class IN_SA_DETAIL : BaseEntity [Display(Name = "结算单号")] public string BillNum { get; set; } = null!; + [Display(Name = "关联结算单号")] + public string SettleBillNum { get; set; } = null!; + /// - /// 对应字段Material + /// 对应字段PartNumber /// [Display(Name = "零件号")] public string LU { get; set; } = null!; /// - /// 对应字段External Delivery ID + /// 对应字段productionlumber /// - [Display(Name = "发货单号")] - public string PU { get; set; } = null!; + [Display(Name = "生产码")] + public string PN { get; set; } = null!; /// - /// 无 + /// 对应字段filename 区分 cn1、cn5 /// [Display(Name = "工厂地点")] public string Site { get; set; } = null!; /// - /// 对应字段Original Delivery Quantity + /// 对应字段Qty /// [Display(Name = "结算数量")] public decimal Qty { get; set; } @@ -80,14 +84,23 @@ public class IN_SA_DETAIL : BaseEntity [Display(Name = "单价")] public decimal Price { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + /// - /// 对应字段Delivery Date + /// 对应字段ReceiveDate /// [Display(Name = "结算日期（收货日期)")] public DateTime SettleDate { get; set; } /// - /// 对应字段【凭证号】 + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } = null!; + + /// + /// 对应字段DeliveryNode /// [Display(Name = "结算分组")] public string GroupNum { get; set; } = null!; diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_NOT_SA_DETAIL.cs similarity index 57% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_NOT_SA_DETAIL.cs index 7bd3a3eb..a35d5f26 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_NOT_SA_DETAIL.cs @@ -3,35 +3,10 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[ChuKuDanGroup] -[Display(Name = "BBAC-JIS出库单")] -public class BBAC_DN : BaseEntity -{ - [Display(Name = "期间")] - public string Version { get; set; } = null!; - /// - /// 如 BA2023060212 - /// - [Display(Name = "出库单号")] - [OneToMany] - public string DNBillNum { get; set; } = null!; - /// - /// 定时统计记录数量 - /// - [Display(Name = "不能出库记录、已扣减统计")] - public string StockCount { get; set; } = null!; -} -[Display(Name = "BBAC出库单明细")] -[ChuKuDanGroup] [Hidden] -public class BBAC_DN_DETAIL : BaseEntity +[Display(Name = "PUB不可结算导入明细")] +public class PUB_NOT_SA_DETAIL : BaseEntity { - - /// - /// 对应字段（Material+ExternalCalNumber） - /// [Display(Name = "LU+生产码")] public string KeyCode { get; set; } = null!; @@ -45,11 +20,8 @@ public class BBAC_DN_DETAIL : BaseEntity /// 结算单号 /// [Display(Name = "结算单号")] - public string BillNum { get; set; } = null!; - [Display(Name = "发票分组号")] - public string INVGroupNum { get; set; } = null!; - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; + public string SettleBillNum { get; set; } = null!; + /// /// 对应字段Material /// @@ -62,23 +34,38 @@ public class BBAC_DN_DETAIL : BaseEntity [Display(Name = "生产码")] public string PN { get; set; } = null!; + /// + /// 选择工厂导入 + /// [Display(Name = "工厂地点")] public string Site { get; set; } = null!; + /// - /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票信息分组 + /// 对应字段Quantity /// - [Display(Name = "状态")] - public string State { get; set; } = null!; - [Display(Name = "结算数量")] public decimal Qty { get; set; } + [Display(Name = "扩展1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展3")] + public string Extend3 { get; set; } = null!; + [Display(Name = "单价")] public decimal Price { get; set; } - + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + /// + /// 对应字段PostingDate + /// [Display(Name = "结算日期（收货日期)")] public DateTime SettleDate { get; set; } - + [Display(Name = "业务分类")] + public string BusinessType { get; set; } = null!; [Display(Name = "结算分组")] public string GroupNum { get; set; } = null!; } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_PD_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_PD_DETAIL.cs new file mode 100644 index 00000000..ef211ec5 --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_PD_DETAIL.cs @@ -0,0 +1,54 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Hidden] +[Display(Name = "PUB待扣减实体")] +public class PUB_PD_DETAIL : BaseEntity +{ + [Display(Name = "LU+ASN单号")] + public string KeyCode { get; set; } = null!; + + [Display(Name = "期间")] + public string Version { get; set; } = null!; + + [Display(Name = "结算单号")] + public string BillNum { get; set; } = null!; + + [Display(Name = "零件号")] + public string LU { get; set; } = null!; + + [Display(Name = "替换零件号")] + public string RELU { get; set; } = null!; + + [Display(Name = "生产码")] + public string PN { get; set; } = null!; + + [Display(Name = "替换生产号")] + public string REPN { get; set; } = null!; + + [Display(Name = "工厂地点")] + public string Site { get; set; } = null!; + + [Display(Name = "结算数量")] + public decimal Qty { get; set; } + + [Display(Name = "单价")] + public decimal Price { get; set; } + + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务类别")] + public string BusinessType { get; set; } = null!; + + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + + [Display(Name = "结算日期（收货日期)")] + public DateTime SettleDate { get; set; } + + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; +} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs similarity index 69% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SA.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs index 381e204c..aeb07fa0 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs @@ -3,45 +3,31 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(1)] -[JITDataInput] -[Display(Name = "JIT件结算导入")] -public class JIT_SA : BaseEntity +[Hidden] +[Display(Name = "公用结算导入主表")] +public class PUB_SA : BaseEntity { [Display(Name = "期间")] public string Version { get; set; } = null!; [Display(Name = "结算单据")] - [OneToMany] + [OneToMany] public string BillNum { get; set; } = null!; - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; - /// /// 1、新建 2、已有出库3、已有扣减寄售库 /// [Display(Name = "状态")] public string State { get; set; } = null!; - - /// - /// 明细记录行数 - /// - [Display(Name = "明细记录行数")] - public string RecordCount { get; set; } = null!; - } - -[Display(Name = "JIT结算导入明细")] -[JITDataInput] +[Display(Name = "公用结算导入明细")] [Hidden] -public class JIT_SA_DETAIL : BaseEntity +public class PUB_SA_DETAIL : BaseEntity { /// /// 对应字段（Material+External Delivery ID） /// - [Display(Name = "LU+ASN单号")] + [Display(Name = "LU+生产码")] public string KeyCode { get; set; } = null!; /// @@ -57,7 +43,7 @@ public class JIT_SA_DETAIL : BaseEntity public string BillNum { get; set; } = null!; /// - /// 取值字段Material + /// 对应字段Material /// [Display(Name = "零件号")] public string LU { get; set; } = null!; @@ -65,11 +51,11 @@ public class JIT_SA_DETAIL : BaseEntity /// /// 取值字段External Delivery ID /// - [Display(Name = "发货单号")] + [Display(Name = "生产码")] public string PN { get; set; } = null!; /// - /// 无 + /// /// [Display(Name = "工厂地点")] public string Site { get; set; } = null!; @@ -81,19 +67,31 @@ public class JIT_SA_DETAIL : BaseEntity public decimal Qty { get; set; } /// - /// 匹配价格表对应区间带出 + /// 匹配价格表对应区间对应地点带出 /// [Display(Name = "单价")] public decimal Price { get; set; } + [Display(Name = "发票分组号")] + public string InvGroupNum { get; set; } = null!; + /// - /// 对应字段Pstng Date + /// 对应字段PostingDate /// [Display(Name = "结算日期（收货日期)")] public DateTime SettleDate { get; set; } + [Display(Name = "扩展字段1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展字段2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展字段3")] + public string Extend3 { get; set; } = null!; + /// - /// 对应字段Delivery + /// 对应字段Reference /// [Display(Name = "结算分组")] public string GroupNum { get; set; } = null!; diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs new file mode 100644 index 00000000..69882f0e --- /dev/null +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs @@ -0,0 +1,49 @@ +using System.ComponentModel.DataAnnotations; +using WTA.Application.Identity.Entities.SystemManagement.Group; +using WTA.Shared.Attributes; +using WTA.Shared.Domain; + +namespace WTA.Application.Identity.Entities.SystemManagement; +[Hidden] +[Display(Name = "PUB发运数据")] +public class PUB_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 = "扩展1")] + public string Extend1 { get; set; } = null!; + + [Display(Name = "扩展2")] + public string Extend2 { get; set; } = null!; + + [Display(Name = "扩展3")] + public string Extend3 { get; set; } = null!; + + /// + /// 1、JIT 2、买单件 3、备件 3、印度件 + /// + [Display(Name = "业务分类")] + public string BusinessType { get; set; } = null!; + + [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/Class8.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PURCHASE_PRICE.cs similarity index 60% rename from docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class8.cs rename to docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PURCHASE_PRICE.cs index b5d84ffb..46cde40d 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class8.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PURCHASE_PRICE.cs @@ -3,10 +3,9 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(2)] -[Edi] -[Display(Name = "EDI和BBAC核对")] -public class Class8 : BaseEntity +[SystemManagement] +[Display(Name = "采购价格单")] +[Order(14)] +public class PURCHASE_PRICE : BaseEntity { } 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 cb8c3edb..59c3d37e 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 @@ -3,6 +3,7 @@ using WTA.Shared.Attributes; using WTA.Shared.Domain; namespace WTA.Application.Identity.Entities.SystemManagement; + [Order(11)] [Display(Name = "备件价格表")] [SystemManagement] @@ -25,5 +26,4 @@ public class TB_PRICE_BJ : BaseEntity /// [Display(Name = "客户编码")] public string ClientCode { get; set; } = null!; - } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_LIST.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_LIST.cs index 5b6686fc..2937a76b 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_LIST.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_PRICE_LIST.cs @@ -38,5 +38,6 @@ public class TB_PRICE_LIST : BaseEntity /// [Display(Name = "客户编码")] public string ClientCode { get; set; } = null!; - + [Display(Name = "业务列别")] + public string BusinessType { get; set; } = null!; } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_ReAssemblyRelationship.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_ReAssemblyRelationship.cs deleted file mode 100644 index e20b307b..00000000 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_ReAssemblyRelationship.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using WTA.Shared.Attributes; -using WTA.Shared.Domain; - -namespace WTA.Application.Identity.Entities.SystemManagement; - -[Order(10)] -[SystemManagement] -[Display(Name = "库存扣减总成替换表")] -public class TB_ReAssemblyRelationship : BaseEntity -{ - /// - /// 取值字段【厂内总成号】 - /// - [Display(Name = "原总成号")] - public string SourceAssemblyCode { get; set; } = null!; - - /// - /// 取值字段【替换厂内总成号】 - /// - [Display(Name = "替换总成号")] - public string DestinationAssemblyCode { get; set; } = null!; - - /// - /// 取值字段【客户编码】 - /// - [Display(Name = "客户编码")] - public string ClientCode { get; set; } = null!; - -} diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs index 0caa9f63..a8376669 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs @@ -6,7 +6,7 @@ namespace WTA.Application.Identity.Entities.SystemManagement; [Order(9)] [SystemManagement] -[Display(Name = "客户端替换件关系")] +[Display(Name = "客户替换件关系")] public class TB_RePartsRelationship : BaseEntity { /// @@ -23,5 +23,6 @@ public class TB_RePartsRelationship : BaseEntity [Display(Name = "客户编码")] public string ClientCode { set; get; } = null!; - + [Display(Name = "业务类型")] + public string BusinessType { set; get; } = null!; } diff --git a/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs b/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs index 984c53ea..d38b45db 100644 --- a/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs +++ b/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs @@ -1,6 +1,6 @@ namespace WTA.Shared.Attributes; -[AttributeUsage(AttributeTargets.Property)] +[AttributeUsage(AttributeTargets.Property,AllowMultiple =true)] public class OneToManyAttribute : Attribute, ITypeAttribute { public Type Type { get; set; } = null!; From a5bb6d650fb1c0846db7fa164edf70d496fdfe2c Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Sat, 8 Jul 2023 13:06:42 +0800 Subject: [PATCH 3/4] update --- .../Entities/SystemManagement/User.cs | 3 ++- .../WTA.Shared/Attributes/SelectAttribute.cs | 22 ++++++++++++++++ .../Extensions/JsonSchemaExtensions.cs | 26 ++++++++++++++----- docs/demo/src/WTA.Shared/SignalR/PageHub.cs | 4 +-- .../WTA/wwwroot/components/form/form-input.js | 9 ++++--- .../src/WTA/wwwroot/components/list/index.js | 7 +++-- 6 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 docs/demo/src/WTA.Shared/Attributes/SelectAttribute.cs diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs index f06a9930..1aab848f 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/User.cs @@ -27,7 +27,8 @@ public class User : BaseEntity [Navigation] public Guid? DepartmentId { get; set; } - [Navigation] + [Select] + [ManyToOne("Id")] public Guid? PostId { get; set; } public Department? Department { get; set; } diff --git a/docs/demo/src/WTA.Shared/Attributes/SelectAttribute.cs b/docs/demo/src/WTA.Shared/Attributes/SelectAttribute.cs new file mode 100644 index 00000000..7890e563 --- /dev/null +++ b/docs/demo/src/WTA.Shared/Attributes/SelectAttribute.cs @@ -0,0 +1,22 @@ +namespace WTA.Shared.Attributes; + +[AttributeUsage(AttributeTargets.Property)] +public class SelectAttribute : Attribute +{ + public SelectAttribute(bool mutiple = false, string? label = null, string? value = null, string? controller = null, string? action = null, string? parentId = null) + { + this.Mutiple = mutiple; + this.Label = label; + this.Value = value; + this.Controller = controller; + this.Action = action; + this.ParentId = parentId; + } + + public bool Mutiple { get; } + public string? Label { get; } + public string? Value { get; } + public string? Controller { get; } + public string? Action { get; } + public string? ParentId { get; } +} diff --git a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs index 2e26f7e0..242e06de 100644 --- a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs +++ b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs @@ -145,17 +145,31 @@ public static class JsonSchemaExtensions var propertyName = defaultModelMetadata.Name; if (propertyName != null) { + if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(SelectAttribute)) is SelectAttribute selectAttribute) + { + schema.Add("input", "select"); + schema.Add("mutiple", selectAttribute.Mutiple); + schema.Add("url", $"{selectAttribute.Controller ?? propertyName.TrimEnd("Id").ToSlugify()}/{selectAttribute.Action ?? "index"}"); + schema.Add("parentId", selectAttribute.ParentId ?? "parentId"); + schema.AddNotNull("value", selectAttribute.Value ?? "id"); + schema.AddNotNull("label", selectAttribute.Label ?? "name"); + } if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(DefaultValueAttribute)) is DefaultValueAttribute defaultValue) { schema.AddNotNull("default", defaultValue.Value); } - if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(NavigationAttribute)) is NavigationAttribute navigationAttribute) + //if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(NavigationAttribute)) is NavigationAttribute navigationAttribute) + //{ + // var path = navigationAttribute.Property ?? $"{propertyName[..^2]}.Name"; + // path = string.Join('.', path.Split('.').Select(o => o.ToCamelCase())); + // schema.Add("navigation", path); + // schema.Add("input", "select"); + // schema.Add("url", defaultModelMetadata.ContainerType?.GetProperty(propertyName[..^2])?.PropertyType.Name.ToSlugify()!); + //} + if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType().IsGenericType && o.GetType().GetGenericTypeDefinition() == typeof(ManyToOneAttribute<>)) is ITypeAttribute manyToOneAttribute) { - var path = navigationAttribute.Property ?? $"{propertyName[..^2]}.Name"; - path = string.Join('.', path.Split('.').Select(o => o.ToCamelCase())); - schema.Add("navigation", path); - schema.Add("input", "select"); - schema.Add("url", defaultModelMetadata.ContainerType?.GetProperty(propertyName[..^2])?.PropertyType.Name.ToSlugify()!); + schema.Add("manyToOne", $"{manyToOneAttribute.Type.Name}.{manyToOneAttribute.GetType().GetProperty("Property")?.GetValue(manyToOneAttribute) ?? defaultModelMetadata.PropertyName}"); + //schema.Add("url", manyToOneAttribute.Type.Name.ToSlugify()); } if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType().IsGenericType && o.GetType().GetGenericTypeDefinition() == typeof(OneToManyAttribute<>)) is ITypeAttribute oneToManyAttribute) { diff --git a/docs/demo/src/WTA.Shared/SignalR/PageHub.cs b/docs/demo/src/WTA.Shared/SignalR/PageHub.cs index e509ab90..9e322d97 100644 --- a/docs/demo/src/WTA.Shared/SignalR/PageHub.cs +++ b/docs/demo/src/WTA.Shared/SignalR/PageHub.cs @@ -1,6 +1,4 @@ -using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.SignalR; -using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using WTA.Shared.EventBus; @@ -25,7 +23,7 @@ public class PageHub : Hub var userName = httpContext?.User.Identity?.Name; if (!string.IsNullOrEmpty(userName)) { - this._logger.LogInformation($"{this.Context.ConnectionId} 已连接 {userName}"); + this._logger.LogInformation(message: $"{this.Context.ConnectionId} 已连接 {userName}"); this.Groups.AddToGroupAsync(this.Context.ConnectionId, this.Context.ConnectionId); if (!string.IsNullOrEmpty(userName)) { diff --git a/docs/demo/src/WTA/wwwroot/components/form/form-input.js b/docs/demo/src/WTA/wwwroot/components/form/form-input.js index 88b9af6c..a99cc6c0 100644 --- a/docs/demo/src/WTA/wwwroot/components/form/form-input.js +++ b/docs/demo/src/WTA/wwwroot/components/form/form-input.js @@ -93,9 +93,12 @@ export default { options.value = props.schema.options; } else if (props.schema.url) { try { - const url = `${props.schema.url}/index`; - const result = await post(url, { queryAll: true, query: { isReadonly: null } }); - options.value = result.data?.items; + const url = `${props.schema.url}`; + const result = await post(url, { queryAll: true, query: { isReadonly: null, isDisabled: null, order: null } }); + options.value = result.data?.items.map((o) => ({ + value: o[props.schema.value], + label: o[props.schema.label], + })); } catch (error) { console.log(error); } diff --git a/docs/demo/src/WTA/wwwroot/components/list/index.js b/docs/demo/src/WTA/wwwroot/components/list/index.js index 9da96e1a..36ff23cd 100644 --- a/docs/demo/src/WTA/wwwroot/components/list/index.js +++ b/docs/demo/src/WTA/wwwroot/components/list/index.js @@ -56,6 +56,7 @@ export default { -
{{$t('拖放文件或')}} {{$t('点击上传')}}
@@ -327,6 +327,7 @@ export default { const treeProps = reactive({ children: "children", }); + const tableKey = ref(false); const tableRef = ref(null); const uploadRef = ref(null); const columns = ref([]); @@ -422,6 +423,7 @@ export default { } tableData.value = listData.items; data.value = listData; + tableKey.value = !tableKey.value; } catch (error) { console.log(error); } finally { @@ -489,7 +491,7 @@ export default { if (valid) { editFormloading.value = true; const url = `${baseUrl}/${editFormMode.value}`; - const result = await post(url, editFormModel); + const result = await post(url, editFormModel.value); if (result.errors) { model.errors = result.errors; //?? } else { @@ -595,6 +597,7 @@ export default { }); return { treeProps, + tableKey, tableRef, uploadRef, tableLoading, From fdfd725254bcc31ef7fd46d74155f15063d188c6 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Sat, 8 Jul 2023 15:33:46 +0800 Subject: [PATCH 4/4] update --- .../WTA.Shared/Controllers/GenericController.cs | 2 +- docs/demo/src/WTA.Shared/Data/BaseDbContext.cs | 13 ++++++++----- docs/demo/src/WTA.Shared/Data/EfRepository.cs | 10 ++++++++++ docs/demo/src/WTA.Shared/Data/IRepository.cs | 5 +++++ .../src/WTA/wwwroot/components/form/form-item.js | 2 +- docs/demo/src/WTA/wwwroot/layouts/tabs.js | 14 ++++++++++---- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs index cea4d81c..cb7e0295 100644 --- a/docs/demo/src/WTA.Shared/Controllers/GenericController.cs +++ b/docs/demo/src/WTA.Shared/Controllers/GenericController.cs @@ -171,7 +171,7 @@ public class GenericController guids.Contains(o.Id)); + this.Repository.Delete(guids); this.Repository.SaveChanges(); return NoContent(); } diff --git a/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs b/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs index 581b6d13..b7a13764 100644 --- a/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs +++ b/docs/demo/src/WTA.Shared/Data/BaseDbContext.cs @@ -80,11 +80,14 @@ public abstract class BaseDbContext : DbContext where T : DbContext } else if (item.State == EntityState.Deleted) { - //if (entity is ISoftDeleteEntity) - //{ - // throw new Exception("内置数据无法删除"); - //} - if (entity.IsReadonly.HasValue && entity.IsReadonly.Value) + if (entity is ISoftDeleteEntity) + { + item.State = EntityState.Modified; + entity.IsDeleted = true; + entity.DeletedOn = now; + entity.DeletedBy = userName; + } + else if (entity.IsReadonly.HasValue && entity.IsReadonly.Value) { throw new Exception("内置数据无法删除"); } diff --git a/docs/demo/src/WTA.Shared/Data/EfRepository.cs b/docs/demo/src/WTA.Shared/Data/EfRepository.cs index 5e764903..4959af13 100644 --- a/docs/demo/src/WTA.Shared/Data/EfRepository.cs +++ b/docs/demo/src/WTA.Shared/Data/EfRepository.cs @@ -42,6 +42,11 @@ public class EfRepository : IRepository where TEntity : BaseEn this._dbContext.Set().Where(predicate).ExecuteDelete(); } + public void Delete(Guid[] guids) + { + this._dbContext.Set().RemoveRange(this._dbContext.Set().Where(o => guids.Contains(o.Id))); + } + public void Insert(TEntity entity) { this._dbContext.Set().Add(entity); @@ -52,6 +57,11 @@ public class EfRepository : IRepository where TEntity : BaseEn this._dbContext.SaveChanges(); } + public DbContext DbContext() + { + return this._dbContext; + } + public void DisableSoftDeleteFilter() { this._dbContext.GetType().GetProperty("DisableSoftDeleteFilter")?.SetValue(this._dbContext, true); diff --git a/docs/demo/src/WTA.Shared/Data/IRepository.cs b/docs/demo/src/WTA.Shared/Data/IRepository.cs index 00329b71..4dcddc49 100644 --- a/docs/demo/src/WTA.Shared/Data/IRepository.cs +++ b/docs/demo/src/WTA.Shared/Data/IRepository.cs @@ -1,4 +1,5 @@ using System.Linq.Expressions; +using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Query; using WTA.Shared.Domain; @@ -14,12 +15,16 @@ public interface IRepository where TEntity : BaseEntity void Update(Expression, SetPropertyCalls>> setPropertyCalls, Expression> predicate); + void Delete(Guid[] guids); + void Delete(Expression> predicate); void Insert(TEntity entity); void SaveChanges(); + DbContext DbContext(); + void DisableSoftDeleteFilter(); void DisableTenantFilter(); diff --git a/docs/demo/src/WTA/wwwroot/components/form/form-item.js b/docs/demo/src/WTA/wwwroot/components/form/form-item.js index aeebaffe..ae49e013 100644 --- a/docs/demo/src/WTA/wwwroot/components/form/form-item.js +++ b/docs/demo/src/WTA/wwwroot/components/form/form-item.js @@ -32,7 +32,7 @@ export default { if (props.schema.hidden) { return false; } - if (props.schema.readOnly && (props.mode === "query" || props.mode === "create" || props.mode === "update")) { + if (props.schema.readOnly && (props.mode === "create" || props.mode === "update")) { return false; } return true; diff --git a/docs/demo/src/WTA/wwwroot/layouts/tabs.js b/docs/demo/src/WTA/wwwroot/layouts/tabs.js index b00302d1..f3882578 100644 --- a/docs/demo/src/WTA/wwwroot/layouts/tabs.js +++ b/docs/demo/src/WTA/wwwroot/layouts/tabs.js @@ -1,5 +1,5 @@ import html from "html"; -import { defineAsyncComponent, ref, nextTick } from "vue"; +import { defineAsyncComponent, ref, nextTick, getCurrentInstance } from "vue"; import { useRoute, onBeforeRouteUpdate, useRouter } from "vue-router"; import { useAppStore } from "../store/index.js"; @@ -111,11 +111,17 @@ export default { }); }; + const deleteItem = (start, end) => { + appStore.routes.splice(start, end); + const vue = getCurrentInstance(); + console.log(vue); + }; + const remove = (name) => { if (appStore.routes.length > 1) { const index = appStore.routes.findIndex((o) => o.fullPath === name); const currentIndex = appStore.routes.findIndex((o) => o.fullPath === currentRoute.fullPath); - appStore.routes.splice(index, 1); + deleteItem(index, 1); if (index === currentIndex) { if (appStore.routes[index]) { router.push(appStore.routes[index]); @@ -129,7 +135,7 @@ export default { const removeLeft = (index) => { const currentIndex = appStore.routes.findIndex((o) => o.fullPath === currentRoute.fullPath); const route = appStore.routes[index]; - appStore.routes.splice(0, index); + deleteItem(0, index); if (currentIndex < index) { router.push(route); } @@ -137,7 +143,7 @@ export default { const removeRight = (index) => { const currentIndex = appStore.routes.findIndex((o) => o.fullPath === currentRoute.fullPath); - appStore.routes.splice(index + 1, appStore.routes.length - index); + deleteItem(index + 1, appStore.routes.length - index); if (currentIndex > index) { router.push(appStore.routes[index]); }