Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DNController.cs

@@ -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<BBAC_DN, BBAC_DN, BBAC_DN, BBAC_DN, BBAC_DN, BBAC_DN>
-{
-    public BBAC_DNController(ILogger<BBAC_DN> logger, IRepository<BBAC_DN> 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<BBAC_DN, BBAC_DN> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/BBAC_DN_DETAILController.cs

@@ -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<BBAC_DN_DETAIL, BBAC_DN_DETAIL, BBAC_DN_DETAIL, BBAC_DN_DETAIL, BBAC_DN_DETAIL, BBAC_DN_DETAIL>
-{
-    public BBAC_DN_DETAILController(ILogger<BBAC_DN_DETAIL> logger, IRepository<BBAC_DN_DETAIL> 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;
-    }
-}

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;

docs/demo/src/WTA.Application/Identity/Controllers/BJ_DNController.cs

@@ -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<BJ_DN, BJ_DN, BJ_DN, BJ_DN, BJ_DN, BJ_DN>
-{
-    public BJ_DNController(ILogger<BJ_DN> logger, IRepository<BJ_DN> 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<BJ_DN, BJ_DN> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_DN_DETAILController.cs

@@ -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<BJ_DN_DETAIL, BJ_DN_DETAIL, BJ_DN_DETAIL, BJ_DN_DETAIL, BJ_DN_DETAIL, BJ_DN_DETAIL>
-{
-    public BJ_DN_DETAILController(ILogger<BJ_DN_DETAIL> logger, IRepository<BJ_DN_DETAIL> 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);
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_SAController.cs

@@ -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<BJ_SA, BJ_SA, BJ_SA, BJ_SA, BJ_SA, BJ_SA>
-{
-    public BJ_SAController(ILogger<BJ_SA> logger, IRepository<BJ_SA> 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<BJ_SA, BJ_SA> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_SA_DETAILController.cs

@@ -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<BJ_SA_DETAIL, BJ_SA_DETAIL, BJ_SA_DETAIL, BJ_SA_DETAIL, BJ_SA_DETAIL, BJ_SA_DETAIL>
-{
-    public BJ_SA_DETAILController(ILogger<BJ_SA_DETAIL> logger, IRepository<BJ_SA_DETAIL> repository) : base(logger, repository)
-    {
-    }
-
-    [NonAction]
-    public override IActionResult Create([FromBody] BJ_SA_DETAIL model)
-    {
-        return base.Create(model);
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/BJ_SE_DETAILController.cs

@@ -15,9 +15,9 @@ public class BJ_SE_DETAILController : GenericController<BJ_SE_DETAIL, BJ_SE_DETA
     }
 
     [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]

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DNController.cs

@@ -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 HBPO_DNController : GenericController<HBPO_DN, HBPO_DN, HBPO_DN, HBPO_DN, HBPO_DN, HBPO_DN>
-{
-    public HBPO_DNController(ILogger<HBPO_DN> logger, IRepository<HBPO_DN> 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<HBPO_DN, HBPO_DN> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/HBPO_DN_DETAILController.cs

@@ -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<HBPO_DN_DETAIL, HBPO_DN_DETAIL, HBPO_DN_DETAIL, HBPO_DN_DETAIL, HBPO_DN_DETAIL, HBPO_DN_DETAIL>
-{
-    public HBPO_DN_DETAILController(ILogger<HBPO_DN_DETAIL> logger, IRepository<HBPO_DN_DETAIL> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_DETAILController.cs

@@ -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<INVOICE_DETAIL, INVOICE_DETAIL, INVOICE_DETAIL, INVOICE_DETAIL, INVOICE_DETAIL, INVOICE_DETAIL>
-{
-    public INVOICE_DETAILController(ILogger<INVOICE_DETAIL> logger, IRepository<INVOICE_DETAIL> 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<INVOICE_DETAIL, INVOICE_DETAIL> 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);
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/INVOICEController.cs → 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<INVOICE, INVOICE, INVOICE, INVOICE, INVOICE, INVOICE>
+public class INVOICE_GRPController : GenericController<INVOICE_GRP, INVOICE_GRP, INVOICE_GRP, INVOICE_GRP, INVOICE_GRP, INVOICE_GRP>
 {
-    public INVOICEController(ILogger<INVOICE> logger, IRepository<INVOICE> repository) : base(logger, repository)
+    public INVOICE_GRPController(ILogger<INVOICE_GRP> logger, IRepository<INVOICE_GRP> 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<INVOICE, INVOICE, INVOICE, IN
     }
 
     [NonAction]
-    public override IActionResult Export([FromBody] PaginationModel<INVOICE, INVOICE> model, bool includeAll = false, bool includeDeleted = false)
+    public override IActionResult Export([FromBody] PaginationModel<INVOICE_GRP, INVOICE_GRP> 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);
     }

docs/demo/src/WTA.Application/Identity/Controllers/IN_DNController.cs

@@ -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<IN_DN, IN_DN, IN_DN, IN_DN, IN_DN, IN_DN>
-{
-    public IN_DNController(ILogger<IN_DN> logger, IRepository<IN_DN> 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<IN_DN, IN_DN> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/IN_DN_DETAILController.cs

@@ -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<IN_DN_DETAIL, IN_DN_DETAIL, IN_DN_DETAIL, IN_DN_DETAIL, IN_DN_DETAIL, IN_DN_DETAIL>
-{
-    public IN_DN_DETAILController(ILogger<IN_DN_DETAIL> logger, IRepository<IN_DN_DETAIL> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/IN_SAController.cs

@@ -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<IN_SA, IN_SA, IN_SA, IN_SA, IN_SA, IN_SA>
-{
-    public IN_SAController(ILogger<IN_SA> logger, IRepository<IN_SA> 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<IN_SA, IN_SA> 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;
-    }
-
-}

docs/demo/src/WTA.Application/Identity/Controllers/IN_SA_DETAILController.cs

@@ -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<IN_SA_DETAIL, IN_SA_DETAIL, IN_SA_DETAIL, IN_SA_DETAIL, IN_SA_DETAIL, IN_SA_DETAIL>
-{
-    public IN_SA_DETAILController(ILogger<IN_SA_DETAIL> logger, IRepository<IN_SA_DETAIL> repository) : base(logger, repository)
-    {
-    }
-
-    [NonAction]
-    public override IActionResult Create([FromBody] IN_SA_DETAIL model)
-    {
-        return base.Create(model);
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/JIT_DNController.cs

@@ -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<JIT_DN, JIT_DN, JIT_DN, JIT_DN, JIT_DN, JIT_DN>
-{
-    public JIT_DNController(ILogger<JIT_DN> logger, IRepository<JIT_DN> 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<JIT_DN, JIT_DN> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/JIT_DN_DETAILController.cs

@@ -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<JIT_DN_DETAIL, JIT_DN_DETAIL, JIT_DN_DETAIL, JIT_DN_DETAIL, JIT_DN_DETAIL, JIT_DN_DETAIL>
-{
-    public JIT_DN_DETAILController(ILogger<JIT_DN_DETAIL> logger, IRepository<JIT_DN_DETAIL> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/JIT_SAController.cs

@@ -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<JIT_SA, JIT_SA, JIT_SA, JIT_SA, JIT_SA, JIT_SA>
-{
-    public JIT_SAController(ILogger<JIT_SA> logger, IRepository<JIT_SA> 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<JIT_SA, JIT_SA> 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;
-    }
-}

docs/demo/src/WTA.Application/Identity/Controllers/JIT_SA_DETAILController.cs

@@ -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<JIT_SA_DETAIL, JIT_SA_DETAIL, JIT_SA_DETAIL, JIT_SA_DETAIL, JIT_SA_DETAIL, JIT_SA_DETAIL>
-{
-    public JIT_SA_DETAILController(ILogger<JIT_SA_DETAIL> logger, IRepository<JIT_SA_DETAIL> repository) : base(logger, repository)
-    {
-    }
-
-    [NonAction]
-    public override IActionResult Create([FromBody] JIT_SA_DETAIL model)
-    {
-        return base.Create(model);
-    }
-}

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<Material, Material, Material, Material, Material, Material>
+{
+    public MaterialController(ILogger<Material> logger, IRepository<Material> 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);
+    }
+
+}

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<MaterialRelationship, MaterialRelationship, MaterialRelationship, MaterialRelationship, MaterialRelationship, MaterialRelationship>
+{
+    public MaterialRelationshipController(ILogger<MaterialRelationship> logger, IRepository<MaterialRelationship> 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);
+    }
+}

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;

docs/demo/src/WTA.Application/Identity/Controllers/TB_ReAssemblyRelationshipController.cs

@@ -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<TB_ReAssemblyRelationship, TB_ReAssemblyRelationship, TB_ReAssemblyRelationship, TB_ReAssemblyRelationship, TB_ReAssemblyRelationship, TB_ReAssemblyRelationship>
-{
-    public TB_ReAssemblyRelationshipController(ILogger<TB_ReAssemblyRelationship> logger, IRepository<TB_ReAssemblyRelationship> repository) : base(logger, repository)
-    {
-    }
-    [NonAction]
-    public override IActionResult Create([FromBody] TB_ReAssemblyRelationship model)
-    {
-        return base.Create(model);
-    }
-}

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<IdentityDbContext>,
-IEntityTypeConfiguration<Class1>,
+IEntityTypeConfiguration<Material>,
-IEntityTypeConfiguration<Class2>,
+IEntityTypeConfiguration<MaterialRelationship>,
 IEntityTypeConfiguration<TB_RePartsRelationship>,
-IEntityTypeConfiguration<TB_ReAssemblyRelationship>,
+IEntityTypeConfiguration<CentralizedControl>,
-IEntityTypeConfiguration<Class5>,
 IEntityTypeConfiguration<TB_PRICE_LIST>,
-IEntityTypeConfiguration<Class7>,
+//IEntityTypeConfiguration<Class7>,
-IEntityTypeConfiguration<Class8>,
+//IEntityTypeConfiguration<Class8>,
 IEntityTypeConfiguration<HBPO_SA>,
 IEntityTypeConfiguration<BBAC_SA>,
 IEntityTypeConfiguration<HBPO_SE_DETAIL>,
 IEntityTypeConfiguration<BBAC_SE_DETAIL>,
-IEntityTypeConfiguration<Class13>,
+//IEntityTypeConfiguration<Class13>,
-IEntityTypeConfiguration<Class14>,
+//IEntityTypeConfiguration<Class14>,
-IEntityTypeConfiguration<Class15>,
+//IEntityTypeConfiguration<Class15>,
-IEntityTypeConfiguration<Class16>,
+//IEntityTypeConfiguration<Class16>,
-IEntityTypeConfiguration<Class17>,
+//IEntityTypeConfiguration<Class17>,
-IEntityTypeConfiguration<Class18>,
+//IEntityTypeConfiguration<Class18>,
-IEntityTypeConfiguration<JIT_SA>,
+//IEntityTypeConfiguration<JIT_SA>,
 IEntityTypeConfiguration<JIT_SE_DETAIL>,
-IEntityTypeConfiguration<Class21>,
+//IEntityTypeConfiguration<Class21>,
-IEntityTypeConfiguration<Class22>,
+//IEntityTypeConfiguration<Class22>,
-IEntityTypeConfiguration<Class23>,
+//IEntityTypeConfiguration<Class23>,
-IEntityTypeConfiguration<BJ_SA>,
 IEntityTypeConfiguration<BJ_SE_DETAIL>,
-IEntityTypeConfiguration<Class26>,
+//IEntityTypeConfiguration<Class26>,
-IEntityTypeConfiguration<Class27>,
+//IEntityTypeConfiguration<Class27>,
-IEntityTypeConfiguration<Class28>,
+//IEntityTypeConfiguration<Class28>,
-IEntityTypeConfiguration<Class29>,
+//IEntityTypeConfiguration<Class29>,
-IEntityTypeConfiguration<IN_SA>,
 IEntityTypeConfiguration<IN_SE_DETAIL>,
-IEntityTypeConfiguration<Class32>,
+//IEntityTypeConfiguration<Class32>,
-IEntityTypeConfiguration<Class33>,
+//IEntityTypeConfiguration<Class33>,
-IEntityTypeConfiguration<Class34>,
+//IEntityTypeConfiguration<Class34>,
-IEntityTypeConfiguration<Class35>,
+//IEntityTypeConfiguration<Class35>,
-IEntityTypeConfiguration<HBPO_DN>,
+//IEntityTypeConfiguration<HBPO_DN>,
-IEntityTypeConfiguration<BBAC_DN>,
+//IEntityTypeConfiguration<BBAC_DN>,
-IEntityTypeConfiguration<JIT_DN>,
+//IEntityTypeConfiguration<JIT_DN>,
-IEntityTypeConfiguration<BJ_DN>,
+//IEntityTypeConfiguration<BJ_DN>,
-IEntityTypeConfiguration<IN_DN>,
+//IEntityTypeConfiguration<IN_DN>,
-IEntityTypeConfiguration<Class41>,
+//IEntityTypeConfiguration<Class41>,
-IEntityTypeConfiguration<INVOICE>,
+IEntityTypeConfiguration<INVOICE_GRP>,
-IEntityTypeConfiguration<Class43>,
+//IEntityTypeConfiguration<Class43>,
-IEntityTypeConfiguration<Class44>,
+//IEntityTypeConfiguration<Class44>,
-IEntityTypeConfiguration<Class45>,
+//IEntityTypeConfiguration<Class45>,
-IEntityTypeConfiguration<Class46>,
+//IEntityTypeConfiguration<Class46>,
-IEntityTypeConfiguration<Class47>,
+//IEntityTypeConfiguration<Class47>,
-IEntityTypeConfiguration<BBAC_DN_DETAIL>,
+//IEntityTypeConfiguration<BBAC_DN_DETAIL>,
 IEntityTypeConfiguration<BBAC_SA_DETAIL>,
-IEntityTypeConfiguration<BJ_DN_DETAIL>,
+//IEntityTypeConfiguration<BJ_DN_DETAIL>,
-IEntityTypeConfiguration<HBPO_DN_DETAIL>,
+//IEntityTypeConfiguration<HBPO_DN_DETAIL>,
 IEntityTypeConfiguration<HBPO_SA_DETAIL>,
-IEntityTypeConfiguration<IN_DN_DETAIL>,
+//IEntityTypeConfiguration<IN_DN_DETAIL>,
-IEntityTypeConfiguration<IN_SA_DETAIL>,
+//IEntityTypeConfiguration<JIT_DN_DETAIL>,
-IEntityTypeConfiguration<INVOICE_DETAIL>,
+//IEntityTypeConfiguration<JIT_SA_DETAIL>,
-IEntityTypeConfiguration<JIT_DN_DETAIL>,
+IEntityTypeConfiguration<TB_PRICE_BJ>,
-IEntityTypeConfiguration<JIT_SA_DETAIL>,
+IEntityTypeConfiguration<INVOICE_WAIT_DETAIL>,
-IEntityTypeConfiguration<BJ_SA_DETAIL>,
+//IEntityTypeConfiguration<HBPO_NOT_SA>,
-IEntityTypeConfiguration<TB_PRICE_BJ>
+IEntityTypeConfiguration<HBPO_NOT_SA_DETAIL>,
+//IEntityTypeConfiguration<BBAC_NOT_SA>,
+IEntityTypeConfiguration<BBAC_NOT_SA_DETAIL>,
+//IEntityTypeConfiguration<JIT_NOT_SA>,
+//IEntityTypeConfiguration<JIT_NOT_SA_DETAIL>,
+//IEntityTypeConfiguration<BJ_NOT_SA>,
+//IEntityTypeConfiguration<BJ_NOT_SA_DETAIL>,
+//IEntityTypeConfiguration<IN_NOT_SA>,
+//IEntityTypeConfiguration<IN_NOT_SA_DETAIL>,
+IEntityTypeConfiguration<HBPO_CAN_SA>,
+IEntityTypeConfiguration<HBPO_CAN_SA_DETAIL>,
+IEntityTypeConfiguration<BBAC_CAN_SA>,
+IEntityTypeConfiguration<BBAC_CAN_SA_DETAIL>,
+//IEntityTypeConfiguration<JIT_CAN_SA>,
+//IEntityTypeConfiguration<JIT_CAN_SA_DETAIL>,
+//IEntityTypeConfiguration<BJ_CAN_SA>,
+//IEntityTypeConfiguration<BJ_CAN_SA_DETAIL>,
+//IEntityTypeConfiguration<IN_CAN_SA>,
+//IEntityTypeConfiguration<IN_CAN_SA_DETAIL>,
+IEntityTypeConfiguration<INVOICE_MAP_GROUP>,
+IEntityTypeConfiguration<INVOICE_NOT_SETTLE>,
+//IEntityTypeConfiguration<JIS_PD_DETAIL>,
+IEntityTypeConfiguration<PUB_SA_DETAIL>,
+IEntityTypeConfiguration<PUB_SA>,
+IEntityTypeConfiguration<HBPO_SE_REPORT>,
+IEntityTypeConfiguration<BBAC_SE_REPORT>,
+IEntityTypeConfiguration<PUB_SE_DETAIL>,
+IEntityTypeConfiguration<PUB_NOT_SA_DETAIL>,
+IEntityTypeConfiguration<PUB_CAN_SA>,
+IEntityTypeConfiguration<PUB_CAN_SA_DETAIL>,
+IEntityTypeConfiguration<HBPO_PD_DETAIL>,
+IEntityTypeConfiguration<BBAC_PD_DETAIL>,
+IEntityTypeConfiguration<PUB_PD_DETAIL>,
+IEntityTypeConfiguration<M_PD_DETAIL>,
+IEntityTypeConfiguration<BOM>,
+IEntityTypeConfiguration<PURCHASE_PRICE>,
+IEntityTypeConfiguration<BBAC_SE_EDI>,
+IEntityTypeConfiguration<HBPO_SE_EDI>,
+IEntityTypeConfiguration<BBAC_SE_SA_REPORT>,
+IEntityTypeConfiguration<HBPO_SE_SA_REPORT>,
+IEntityTypeConfiguration<JIT_SE_SA_REPORT>
 {
-    public void Configure(EntityTypeBuilder<Class1> builder)
+    public void Configure(EntityTypeBuilder<Material> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class2> builder)
+    public void Configure(EntityTypeBuilder<MaterialRelationship> builder)
     { }
 
     public void Configure(EntityTypeBuilder<TB_RePartsRelationship> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<TB_ReAssemblyRelationship> builder)
+    //public void Configure(EntityTypeBuilder<TB_ReAssemblyRelationship> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class5> builder)
+    public void Configure(EntityTypeBuilder<CentralizedControl> builder)
     { }
 
     public void Configure(EntityTypeBuilder<TB_PRICE_LIST> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class7> builder)
+    //public void Configure(EntityTypeBuilder<Class7> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class8> builder)
+    //public void Configure(EntityTypeBuilder<Class8> builder)
-    { }
+    //{ }
 
     public void Configure(EntityTypeBuilder<HBPO_SA> builder)
     { }
@@ -102,145 +139,244 @@ IEntityTypeConfiguration<TB_PRICE_BJ>
     public void Configure(EntityTypeBuilder<BBAC_SE_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class13> builder)
+    //public void Configure(EntityTypeBuilder<Class13> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class14> builder)
+    //public void Configure(EntityTypeBuilder<Class14> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class15> builder)
+    //public void Configure(EntityTypeBuilder<Class15> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class16> builder)
+    //public void Configure(EntityTypeBuilder<Class16> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class17> builder)
+    //public void Configure(EntityTypeBuilder<Class17> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class18> builder)
+    //public void Configure(EntityTypeBuilder<Class18> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<JIT_SA> builder)
+    //public void Configure(EntityTypeBuilder<JIT_SA> builder)
-    { }
+    //{ }
 
     public void Configure(EntityTypeBuilder<JIT_SE_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class21> builder)
+    //public void Configure(EntityTypeBuilder<Class21> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class22> builder)
+    //public void Configure(EntityTypeBuilder<Class22> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class23> builder)
+    //public void Configure(EntityTypeBuilder<Class23> builder)
-    { }
+    //{ }
-
-    public void Configure(EntityTypeBuilder<BJ_SA> builder)
-    { }
 
     public void Configure(EntityTypeBuilder<BJ_SE_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class26> builder)
+    //public void Configure(EntityTypeBuilder<Class26> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class27> builder)
+    //public void Configure(EntityTypeBuilder<Class27> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class28> builder)
+    //public void Configure(EntityTypeBuilder<Class28> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class29> builder)
+    //public void Configure(EntityTypeBuilder<Class29> builder)
-    { }
+    //{ }
-
-    public void Configure(EntityTypeBuilder<IN_SA> builder)
-    { }
 
     public void Configure(EntityTypeBuilder<IN_SE_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class32> builder)
+    //public void Configure(EntityTypeBuilder<Class32> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class33> builder)
+    //public void Configure(EntityTypeBuilder<Class33> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class34> builder)
+    //public void Configure(EntityTypeBuilder<Class34> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class35> builder)
+    //public void Configure(EntityTypeBuilder<Class35> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<HBPO_DN> builder)
+    //public void Configure(EntityTypeBuilder<HBPO_DN> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<BBAC_DN> builder)
+    //public void Configure(EntityTypeBuilder<BBAC_DN> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<JIT_DN> builder)
+    //public void Configure(EntityTypeBuilder<JIT_DN> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<BJ_DN> builder)
+    //public void Configure(EntityTypeBuilder<BJ_DN> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<IN_DN> builder)
+    //public void Configure(EntityTypeBuilder<IN_DN> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class41> builder)
+    //public void Configure(EntityTypeBuilder<Class41> builder)
-    { }
+    //{ }
 
-    public void Configure(EntityTypeBuilder<INVOICE> builder)
+    public void Configure(EntityTypeBuilder<INVOICE_GRP> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class43> builder)
+    //public void Configure(EntityTypeBuilder<Class43> builder)
-    { }
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<Class44> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<Class45> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<Class46> builder)
+    //{ }
 
-    public void Configure(EntityTypeBuilder<Class44> builder)
+    //public void Configure(EntityTypeBuilder<Class47> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<BBAC_DN_DETAIL> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<BBAC_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class45> builder)
+    //public void Configure(EntityTypeBuilder<BJ_DN_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<HBPO_DN_DETAIL> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<HBPO_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class46> builder)
+    //public void Configure(EntityTypeBuilder<IN_DN_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<JIT_DN_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<JIT_SA_DETAIL> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<TB_PRICE_BJ> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<Class47> builder)
+    public void Configure(EntityTypeBuilder<INVOICE_WAIT_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<BBAC_DN_DETAIL> builder)
+    //public void Configure(EntityTypeBuilder<HBPO_NOT_SA> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<HBPO_NOT_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<BBAC_SA_DETAIL> builder)
+    //public void Configure(EntityTypeBuilder<BBAC_NOT_SA> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<BBAC_NOT_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<BJ_DN_DETAIL> builder)
+    //public void Configure(EntityTypeBuilder<JIT_NOT_SA> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<JIT_NOT_SA_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<BJ_NOT_SA> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<BJ_NOT_SA_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<IN_NOT_SA> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<IN_NOT_SA_DETAIL> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<HBPO_CAN_SA> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<HBPO_DN_DETAIL> builder)
+    public void Configure(EntityTypeBuilder<HBPO_CAN_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<HBPO_SA_DETAIL> builder)
+    public void Configure(EntityTypeBuilder<BBAC_CAN_SA> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<IN_DN_DETAIL> builder)
+    public void Configure(EntityTypeBuilder<BBAC_CAN_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<IN_SA_DETAIL> builder)
+    //public void Configure(EntityTypeBuilder<JIT_CAN_SA> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<JIT_CAN_SA_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<BJ_CAN_SA> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<BJ_CAN_SA_DETAIL> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<IN_CAN_SA> builder)
+    //{ }
+
+    //public void Configure(EntityTypeBuilder<IN_CAN_SA_DETAIL> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<INVOICE_MAP_GROUP> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<INVOICE_DETAIL> builder)
+    public void Configure(EntityTypeBuilder<INVOICE_NOT_SETTLE> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<JIT_DN_DETAIL> builder)
+    //public void Configure(EntityTypeBuilder<JIS_PD_DETAIL> builder)
+    //{ }
+
+    public void Configure(EntityTypeBuilder<PUB_SA_DETAIL> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<JIT_SA_DETAIL> builder)
+    public void Configure(EntityTypeBuilder<PUB_SA> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<BJ_SA_DETAIL> builder)
+    public void Configure(EntityTypeBuilder<HBPO_SE_REPORT> builder)
     { }
 
-    public void Configure(EntityTypeBuilder<TB_PRICE_BJ> builder)
+    public void Configure(EntityTypeBuilder<BBAC_SE_REPORT> builder)
     { }
 
+    public void Configure(EntityTypeBuilder<PUB_SE_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<PUB_NOT_SA_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<PUB_CAN_SA> builder)
+    { }
+    public void Configure(EntityTypeBuilder<PUB_CAN_SA_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<HBPO_PD_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<BBAC_PD_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<PUB_PD_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<M_PD_DETAIL> builder)
+    { }
+    public void Configure(EntityTypeBuilder<BOM> builder)
+    { }
+    public void Configure(EntityTypeBuilder<PURCHASE_PRICE> builder)
+    { }
+    public void Configure(EntityTypeBuilder<BBAC_SE_EDI> builder)
+    { }
+    public void Configure(EntityTypeBuilder<HBPO_SE_EDI> builder)
+    { }
+    public void Configure(EntityTypeBuilder<BBAC_SE_SA_REPORT> builder)
+    { }
+    public void Configure(EntityTypeBuilder<HBPO_SE_SA_REPORT> builder)
+    { }
+    public void Configure(EntityTypeBuilder<JIT_SE_SA_REPORT> builder)
+    { }
 }

docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs

@@ -59,6 +59,32 @@ public class IdentityDbSeed : IDbSeed<IdentityDbContext>
         // 权限初始化
         InitPermissions(context);
 
+        //岗位初始化
+        context.Set<Post>().Add(new Post
+        {
+            Name = "董事长",
+            Number = "001",
+            Order = 1,
+        }.SetIdBy(o => o.Number));
+        context.Set<Post>().Add(new Post
+        {
+            Name = "项目经理",
+            Number = "002",
+            Order = 2
+        }.SetIdBy(o => o.Number));
+        context.Set<Post>().Add(new Post
+        {
+            Name = "人力资源",
+            Number = "003",
+            Order = 3
+        }.SetIdBy(o => o.Number));
+        context.Set<Post>().Add(new Post
+        {
+            Name = "普通员工",
+            Number = "004",
+            Order = 4
+        }.SetIdBy(o => o.Number));
+
         //部门初始化
         context.Set<Department>().Add(
             new Department
@@ -123,48 +149,32 @@ public class IdentityDbSeed : IDbSeed<IdentityDbContext>
     {
         context.Set<HBPO_SA>().Add(new HBPO_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
         context.Set<HBPO_SA>().Add(new HBPO_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
-        context.Set<HBPO_SA_DETAIL>().Add(new HBPO_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<HBPO_SA_DETAIL>().Add(new HBPO_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
-        context.Set<HBPO_SA_DETAIL>().Add(new HBPO_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<HBPO_SA_DETAIL>().Add(new HBPO_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
         context.Set<BBAC_SA>().Add(new BBAC_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
         context.Set<BBAC_SA>().Add(new BBAC_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
-        context.Set<BBAC_SA_DETAIL>().Add(new BBAC_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" });
+        context.Set<BBAC_SA_DETAIL>().Add(new BBAC_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" });
-        context.Set<BBAC_SA_DETAIL>().Add(new BBAC_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" });
+        context.Set<BBAC_SA_DETAIL>().Add(new BBAC_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" });
-        context.Set<JIT_SA>().Add(new JIT_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
+        context.Set<HBPO_CAN_SA>().Add(new HBPO_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "123", State = "测试数据", InvGroupNum = "测试数据" });
-        context.Set<JIT_SA>().Add(new JIT_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
+        context.Set<HBPO_CAN_SA>().Add(new HBPO_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" });
-        context.Set<JIT_SA_DETAIL>().Add(new JIT_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<HBPO_CAN_SA_DETAIL>().Add(new HBPO_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
-        context.Set<JIT_SA_DETAIL>().Add(new JIT_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<HBPO_CAN_SA_DETAIL>().Add(new HBPO_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
-        context.Set<BJ_SA>().Add(new BJ_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
+        context.Set<BBAC_CAN_SA>().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "123", State = "测试数据", InvGroupNum = "测试数据" });
-        context.Set<BJ_SA>().Add(new BJ_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
+        context.Set<BBAC_CAN_SA>().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" });
-        context.Set<BJ_SA_DETAIL>().Add(new BJ_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<BBAC_CAN_SA_DETAIL>().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" });
-        context.Set<BJ_SA_DETAIL>().Add(new BJ_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<BBAC_CAN_SA_DETAIL>().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" });
-        context.Set<IN_SA>().Add(new IN_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据" });
+        context.Set<INVOICE_GRP>().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" });
-        context.Set<IN_SA>().Add(new IN_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据" });
+        context.Set<INVOICE_GRP>().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" });
-        context.Set<IN_SA_DETAIL>().Add(new IN_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<INVOICE_WAIT_DETAIL>().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细123", InvGroupNum = "待开票明细分组号测试数据一", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" });
-        context.Set<IN_SA_DETAIL>().Add(new IN_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<INVOICE_WAIT_DETAIL>().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细456", InvGroupNum = "待开票明细分组号测试数据二", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" });
-        context.Set<HBPO_DN>().Add(new HBPO_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<INVOICE_MAP_GROUP>().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系123", InvGroupNum = "发票和结算分组对应关系分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
-        context.Set<HBPO_DN>().Add(new HBPO_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" });
+        context.Set<INVOICE_MAP_GROUP>().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系456", InvGroupNum = "发票和结算分组对应关系分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
-        context.Set<HBPO_DN_DETAIL>().Add(new HBPO_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" });
+        context.Set<INVOICE_NOT_SETTLE>().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
-        context.Set<HBPO_DN_DETAIL>().Add(new HBPO_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" });
+        context.Set<INVOICE_NOT_SETTLE>().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
-        context.Set<BBAC_DN>().Add(new BBAC_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", BillNum = "一号", State = "测试数据" });
-        context.Set<BBAC_DN>().Add(new BBAC_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" });
+        context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", BillNum = "二号", State = "测试数据" });
-        context.Set<BBAC_DN_DETAIL>().Add(new BBAC_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" });
+        context.Set<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "一号", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
-        context.Set<BBAC_DN_DETAIL>().Add(new BBAC_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" });
+        context.Set<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "二号", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
-        context.Set<JIT_DN>().Add(new JIT_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
-        context.Set<JIT_DN>().Add(new JIT_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" });
-        context.Set<JIT_DN_DETAIL>().Add(new JIT_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" });
-        context.Set<JIT_DN_DETAIL>().Add(new JIT_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" });
-        context.Set<BJ_DN>().Add(new BJ_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
-        context.Set<BJ_DN>().Add(new BJ_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" });
-        context.Set<BJ_DN_DETAIL>().Add(new BJ_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" });
-        context.Set<BJ_DN_DETAIL>().Add(new BJ_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" });
-        context.Set<IN_DN>().Add(new IN_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
-        context.Set<IN_DN>().Add(new IN_DN { Version = "测试数据", DNBillNum = "456", StockCount = "测试数据" });
-        context.Set<IN_DN_DETAIL>().Add(new IN_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "123" });
-        context.Set<IN_DN_DETAIL>().Add(new IN_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "456" });
-        context.Set<INVOICE>().Add(new INVOICE { RealnvBillNum = "测试数据", InvbillNum = "123", INVGroupNum = "测试数据", FileName = "测试数据", BusinessType = "测试数据" });
-        context.Set<INVOICE>().Add(new INVOICE { RealnvBillNum = "测试数据", InvbillNum = "456", INVGroupNum = "测试数据", FileName = "测试数据", BusinessType = "测试数据" });
-        context.Set<INVOICE_DETAIL>().Add(new INVOICE_DETAIL { LU = "测试数据", InvbillNum = "123" });
-        context.Set<INVOICE_DETAIL>().Add(new INVOICE_DETAIL { LU = "测试数据", InvbillNum = "456" });
     }
 
     private static void InitDictionaries(DbContext context)

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<BBAC_CAN_SA_DETAIL>]
+    public string BillNum { get; set; } = null!;
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 1、新建 2、已有出库3、已有扣减寄售库
+    /// </summary>
+    [Display(Name = "状态")]
+    public string State { get; set; } = null!;
+
+    /// <summary>
+    /// 明细记录行数
+    /// </summary>
+    [Display(Name = "明细记录行数")]
+    public string InvGroupNum { get; set; } = null!;
+}
+
+[Hidden]
+[Display(Name = "BBAC可结算导入明细")]
+public class BBAC_CAN_SA_DETAIL : BaseEntity
+{
+    /// <summary>
+    /// 对应字段（Material+ExternalCalNumber）
+    /// </summary>
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    /// <summary>
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    public string Version { get; set; } = null!;
+
+    /// <summary>
+    /// 结算单号
+    /// </summary>
+    [Display(Name = "结算单号")]
+    public string BillNum { get; set; } = null!;
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+    /// <summary>
+    /// 对应字段Material
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 选择工厂导入
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    [Display(Name = "结算数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 匹配价格表对应区间对应地点带出
+    /// </summary>
+    [Display(Name = "单价")]
+    public decimal Price { get; set; }
+
+    /// <summary>
+    /// ExternalCallNumber包含（R0）为买单件   1为JIS 2.为买单件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string Category { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段MovementType，996正常，997为退货
+    /// </summary>
+    [Display(Name = "是否退货")]
+    public string IsReturn { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段PostingDate
+    /// </summary>
+    [Display(Name = "结算日期（收货日期)")]
+    public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 对应字段Reference
+    /// </summary>
+    [Display(Name = "结算分组")]
+    public string GroupNum { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+}

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<BBAC_NOT_SA_DETAIL>]
+//    public string BillNum { get; set; } = null!;
+
+//    [Display(Name = "出库单号")]
+//    public string DNBillNum { get; set; } = null!;
+
+//    /// <summary>
+//    /// 1、新建 2、已有出库3、已有扣减寄售库
+//    /// </summary>
+//    [Display(Name = "状态")]
+//    public string State { get; set; } = null!;
+
+//    /// <summary>
+//    /// 明细记录行数
+//    /// </summary>
+//    [Display(Name = "明细记录行数")]
+//    public string RecordCount { get; set; } = null!;
+//}
+[JISBBACSettlementInvoicingGroup]
+[Display(Name = "BBAC不可结算导入明细")]
+public class BBAC_NOT_SA_DETAIL : BaseEntity
+{
+    /// <summary>
+    /// 对应字段（Material+ExternalCalNumber）
+    /// </summary>
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    /// <summary>
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    public string Version { get; set; } = null!;
+
+    /// <summary>
+    /// 结算单号
+    /// </summary>
+    [Display(Name = "结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Material
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 选择工厂导入
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Quantity
+    /// </summary>
+    [Display(Name = "结算数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 匹配价格表对应区间对应地点带出
+    /// </summary>
+    [Display(Name = "单价")]
+    public decimal Price { get; set; }
+
+    /// <summary>
+    /// ExternalCallNumber包含（R0）为买单件   1为JIS 2.为买单件
+    /// </summary>
+    [Display(Name = "业务类别")]
+    public string Category { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段MovementType，996正常，997为退货
+    /// </summary>
+    [Display(Name = "是否退货")]
+    public string IsReturn { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段PostingDate
+    /// </summary>
+    [Display(Name = "结算日期（收货日期)")]
+    public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 对应字段Reference
+    /// </summary>
+    [Display(Name = "结算分组")]
+    public string GroupNum { get; set; } = null!;
+}

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!;
+}

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
     /// </summary>
     [Display(Name = "结算分组")]
     public string GroupNum { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
 }

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]
+[JISBBACDataInputGroup]
-[Display(Name = "BBAC发运数据")]
+[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; }
 

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!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    [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; }
+}

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!;
+}

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!;
+    /// <summary>
+    /// 有结算无发货（无EDI数据)
+    ///有结算无发货（有EDI数据)
+    ///有结算有发货（无EDI数据)
+    ///有结算有发货（无价格信息)
+    ///有结算有发货（有EDI数据)
+    ///无结算有发货（有EDI数据)
+    ///无结算有发货（无EDI数据)
+    ///有结算有发货（有EDI数据)
+    ///有结算有发货（WMS多发）
+    /// </summary>
+    [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!;
+    /// <summary>
+    /// 结算数据中的过账日期
+    /// </summary>
+    [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!;
+}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_DN.cs

@@ -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!;
-
-    /// <summary>
-    /// 如 J2023060212
-    /// </summary>
-    [Display(Name = "出库单号")]
-    [OneToMany<BJ_DN_DETAIL>]
-    public string DNBillNum { get; set; } = null!;
-
-    /// <summary>
-    /// 定时统计记录数量
-    /// </summary>
-    [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!;
-
-    /// <summary>
-    /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票分组
-    /// </summary>
-    [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!;
-}

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;
-
+[BJDataInputGroup]
-[Order(2)]
-[BeiJianDataInput]
 [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!;
 }

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class7.cs → 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)]
+[SystemManagement]
-[Edi]
+[Display(Name = "BOM结构")]
-[Display(Name = "EDI和HBPO核对")]
+[Order(9)]
-public class Class7 : BaseEntity
+public class BOM : BaseEntity
 {
 }

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataInputAttribute.cs

@@ -1,11 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using WTA.Shared.Attributes;
-
-namespace WTA.Application.Identity.Entities.SystemManagement;
-
-[Order(1)]
-[Module<BeiJianModule>]
-[Display(Name = "数据输入")]
-public class BeiJianDataInputAttribute : GroupAttribute
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianDataOutputAttribute.cs

@@ -1,11 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using WTA.Shared.Attributes;
-
-namespace WTA.Application.Identity.Entities.SystemManagement;
-
-[Order(2)]
-[Module<BeiJianModule>]
-[Display(Name = "数据输出")]
-public class BeiJianDataOutputAttribute : GroupAttribute
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BeiJianModule.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class5.cs → 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
 {
 }

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/ChuKuDanGroup.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class13.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class14.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class15.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class16.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class17.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class18.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class21.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class22.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class23.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class26.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class27.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class28.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class29.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class32.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class33.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class34.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class35.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class41.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class43.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class44.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class45.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class46.cs

@@ -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
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Class47.cs

@@ -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
-{
-}

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<Department>

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/EdiAttribute.cs

@@ -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
-{
-}

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<BJModule>]
+public class BJDataComparisonGroup : GroupAttribute
+{
+}

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<BJModule>]
+public class BJDataInputGroup : GroupAttribute
+{
+}

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<BJModule>]
+public class BJSettlementInvoicingGroup : GroupAttribute
+{
+}

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<INModule>]
+public class INDataComparisonGroup : GroupAttribute
+{
+}

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<INModule>]
+public class INDataInputGroup : GroupAttribute
+{
+}

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<INModule>]
+public class INSettlementInvoicingGroup : GroupAttribute
+{
+}

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<JISBBACModule>]
+[Display(Name = "数据对比")]
+public class JISBBACDataComparisonGroup : GroupAttribute
+{
+}

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<JISBBACModule>]
+[Display(Name = "数据输入")]
+public class JISBBACDataInputGroup : GroupAttribute
+{
+}

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<JISBBACModule>]
+[Display(Name = "结算开票")]
+public class JISBBACSettlementInvoicingGroup : GroupAttribute
+{
+}

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<JISHBPOModule>]
+[Display(Name = "数据对比")]
+public class JISHBPODataComparisonGroup : GroupAttribute
+{
+}

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<JISHBPOModule>]
+[Display(Name = "数据输入")]
+public class JISHBPODataInputGroup : GroupAttribute
+{
+}

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<JISHBPOModule>]
+[Display(Name = "结算开票")]
+public class JISHBPOSettlementInvoicingGroup : GroupAttribute
+{
+}

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<JITModule>]
+[Display(Name = "数据对比")]
+public class JITDataComparisonGroup : GroupAttribute
+{
+}

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<JITModule>]
+[Display(Name = "数据输入")]
+public class JITDataInputGroup : GroupAttribute
+{
+}

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<JITModule>]
+[Display(Name = "结算开票")]
+public class JITSettlementInvoicingGroup : GroupAttribute
+{
+}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BJ_SA.cs → 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;
-
+[JISHBPOSettlementInvoicingGroup]
-[Order(1)]
+[Display(Name = "HBPO可结算导入")]
-[BeiJianDataInput]
+public class HBPO_CAN_SA : BaseEntity
-[Display(Name = "备件结算导入")]
-public class BJ_SA : BaseEntity
 {
     [Display(Name = "期间")]
     public string Version { get; set; } = null!;
-
+    [Display(Name = "关联结算单号")]
-    [Display(Name = "结算单据号")]
+    public string SettleBillNum { get; set; } = null!;
-    [OneToMany<BJ_SA_DETAIL>]
+    [Display(Name = "结算单据")]
+    [OneToMany<HBPO_CAN_SA_DETAIL>]
     public string BillNum { get; set; } = null!;
 
-    [Display(Name = "出库单号")]
-    public string DNBillNum { get; set; } = null!;
-
     /// <summary>
     /// 1、新建 2、已有出库3、已有扣减寄售库
     /// </summary>
@@ -29,21 +26,21 @@ public class BJ_SA : BaseEntity
     /// 明细记录行数
     /// </summary>
     [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
 {
     /// <summary>
-    /// 对应字段（零件号+交付识别号）
+    /// 对应字段（PartNumber+ProductioNumber）
     /// </summary>
-    [Display(Name = "LU+交付识别号")]
+    [Display(Name = "LU+生产码")]
     public string KeyCode { get; set; } = null!;
 
     /// <summary>
-    /// 期间号
+    /// 期间
     /// </summary>
     [Display(Name = "期间")]
     public string Version { get; set; } = null!;
@@ -53,46 +50,50 @@ public class BJ_SA_DETAIL : BaseEntity
     /// </summary>
     [Display(Name = "结算单号")]
     public string BillNum { get; set; } = null!;
-
+    [Display(Name = "关联结算单号")]
+    public string SettleBillNum { get; set; } = null!;
     /// <summary>
-    /// 对应字段【零件号】
+    /// 对应字段PartNumber
     /// </summary>
     [Display(Name = "零件号")]
     public string LU { get; set; } = null!;
 
     /// <summary>
-    /// 对应字段【交付识别号】
+    /// 对应字段productionlumber
     /// </summary>
-    [Display(Name = "交付识别号")]
+    [Display(Name = "生产码")]
     public string PN { get; set; } = null!;
 
     /// <summary>
-    /// 无
+    /// 对应字段filename 区分 cn1、cn5
     /// </summary>
     [Display(Name = "工厂地点")]
     public string Site { get; set; } = null!;
 
     /// <summary>
-    /// 对应字段【数量】
+    /// 对应字段Qty
     /// </summary>
     [Display(Name = "结算数量")]
     public decimal Qty { get; set; }
 
     /// <summary>
-    /// 从备件价格单里取
+    /// 匹配价格表对应区间带出
     /// </summary>
     [Display(Name = "单价")]
     public decimal Price { get; set; }
 
     /// <summary>
-    /// 无
+    /// 对应字段ReceiveDate
     /// </summary>
     [Display(Name = "结算日期（收货日期)")]
     public DateTime SettleDate { get; set; }
 
     /// <summary>
-    /// 对应字段【凭证号】
+    /// 对应字段DeliveryNode
     /// </summary>
     [Display(Name = "结算分组")]
     public string GroupNum { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
 }

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs

@@ -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!;
-
-    /// <summary>
-    /// 如 H2023060212
-    /// </summary>
-    [Display(Name = "出库单号")]
-    [OneToMany<HBPO_DN_DETAIL>]
-    public string DNBillNum { get; set; } = null!;
-
-    /// <summary>
-    /// 定时统计记录数量
-    /// </summary>
-    [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!;
-
-    /// <summary>
-    /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票信息
-    /// </summary>
-    [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!;
-}

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<HBPO_NOT_SA_DETAIL>]
+//    public string BillNum { get; set; } = null!;
+
+//    [Display(Name = "出库单号")]
+//    public string DNBillNum { get; set; } = null!;
+
+//    /// <summary>
+//    /// 1、新建 2、已有出库3、已有扣减寄售库
+//    /// </summary>
+//    [Display(Name = "状态")]
+//    public string State { get; set; } = null!;
+
+//    /// <summary>
+//    /// 明细记录行数
+//    /// </summary>
+//    [Display(Name = "明细记录行数")]
+//    public string RecordCount { get; set; } = null!;
+//}
+[JISHBPOSettlementInvoicingGroup]
+[Display(Name = "HBPO不可结算导入明细")]
+public class HBPO_NOT_SA_DETAIL : BaseEntity
+{
+    /// <summary>
+    /// 对应字段（PartNumber+ProductioNumber）
+    /// </summary>
+    [Display(Name = "LU+生产码")]
+    public string KeyCode { get; set; } = null!;
+
+    /// <summary>
+    /// 期间
+    /// </summary>
+    [Display(Name = "期间")]
+    public string Version { get; set; } = null!;
+
+    [Display(Name = "结算单号")]
+    public string SettleBillNum { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段PartNumber
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string LU { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段productionlumber
+    /// </summary>
+    [Display(Name = "生产码")]
+    public string PN { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段filename 区分 cn1、cn5
+    /// </summary>
+    [Display(Name = "工厂地点")]
+    public string Site { get; set; } = null!;
+
+    /// <summary>
+    /// 对应字段Qty
+    /// </summary>
+    [Display(Name = "结算数量")]
+    public decimal Qty { get; set; }
+
+    /// <summary>
+    /// 匹配价格表对应区间带出
+    /// </summary>
+    [Display(Name = "单价")]
+    public decimal Price { get; set; }
+
+    /// <summary>
+    /// 对应字段ReceiveDate
+    /// </summary>
+    [Display(Name = "结算日期（收货日期)")]
+    public DateTime SettleDate { get; set; }
+
+    /// <summary>
+    /// 对应字段DeliveryNode
+    /// </summary>
+    [Display(Name = "结算分组")]
+    public string GroupNum { get; set; } = null!;
+
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+}

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!;
+}

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;
-
+[JISHBPODataInputGroup]
-[Order(1)]
-[JISDataInput]
 [Display(Name = "HBPO结算导入")]
 public class HBPO_SA : BaseEntity
 {
@@ -30,10 +29,11 @@ public class HBPO_SA : BaseEntity
     /// </summary>
     [Display(Name = "明细记录行数")]
     public string RecordCount { get; set; } = null!;
-    //集合导航
+
 }
+
 [Display(Name = "HBPO结算导入明细")]
-[JISDataInput]
+
 [Hidden]
 
 public class HBPO_SA_DETAIL : BaseEntity
@@ -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!;
 }

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!;
-
 }

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!;
+
+    /// <summary>
+    /// 对应字段ExternalCalNumber
+    /// </summary>
+    [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; }
+}

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!;
+}

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!;
+
+    /// <summary>
+    /// 有结算无发货（无EDI数据)
+    ///有结算无发货（有EDI数据)
+    ///有结算有发货（无EDI数据)
+    ///有结算有发货（无价格信息)
+    ///有结算有发货（有EDI数据)
+    ///无结算有发货（有EDI数据)
+    ///无结算有发货（无EDI数据)
+    ///有结算有发货（有EDI数据)
+    ///有结算有发货（WMS多发）
+    /// </summary>
+    [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!;
+
+    /// <summary>
+    /// 结算数据中的过账日期
+    /// </summary>
+    [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!;
+}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/INVOICE.cs

@@ -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<INVOICE_DETAIL>]
-    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!;
-
-    /// <summary>
-    /// 1-HBPO 2-BBAC(和买单件一起开票,扣减库存时要注意分开) 3-JIT 4-备件、5-印度件
-    /// </summary>
-    [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!;
-}

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<INVOICE_WAIT_DETAIL>]
+    [OneToMany<INVOICE_MAP_GROUP>]
+    [Display(Name = "系统生成发票号")]
+    public string InvbillNum { get; set; } = null!;
+
+    [Display(Name = "未税金额")]
+    public decimal Amt { get; set; }
+
+    [Display(Name = "税后金额")]
+    public decimal TaxAmt { get; set; }
+    [OneToMany<INVOICE_WAIT_DETAIL>]
+    [OneToMany<INVOICE_MAP_GROUP>]
+    [OneToOne<INVOICE_NOT_SETTLE>]
+    [Display(Name = "发票分组号")]
+    public string InvGroupNum { get; set; } = null!;
+
+    [Display(Name = "开票Excel文件")]
+    public string FileName { get; set; } = null!;
+
+    /// <summary>
+    /// 1-HBPO 2-BBAC(和买单件一起开票,扣减库存时要注意分开) 3-JIT 4-备件、5-印度件
+    /// </summary>
+    [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!;
+//}

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!;
+}

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!;
+}

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; }
+
+    /// <summary>
+    /// 1、BBAC-JIS 2、HBPO-JIS 3、JIT 4、备件 5、印度件
+    /// </summary>
+    [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!;
+}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/IN_DN.cs

@@ -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!;
-
-    /// <summary>
-    /// 如 J2023060212
-    /// </summary>
-    [Display(Name = "出库单号")]
-    [OneToMany<IN_DN_DETAIL>]
-    public string DNBillNum { get; set; } = null!;
-
-    /// <summary>
-    /// 定时统计记录数量
-    /// </summary>
-    [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!;
-
-    /// <summary>
-    /// 1、新建 2、已扣减寄售库数3、不能出库 4、已生成开票分组
-    /// </summary>
-    [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!;
-
-}

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)]
+[INDataInputGroup]
-[MaiDanJianDataInput]
 [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!;
-
 }

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataInputAttribute.cs

@@ -1,11 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using WTA.Shared.Attributes;
-
-namespace WTA.Application.Identity.Entities.SystemManagement;
-
-[Order(1)]
-[Module<JISModule>]
-[Display(Name = "数据输入")]
-public class JISDataInputAttribute : GroupAttribute
-{
-}

docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JISDataOutputAttribute.cs

@@ -1,11 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using WTA.Shared.Attributes;
-
-namespace WTA.Application.Identity.Entities.SystemManagement;
-
-[Order(2)]
-[Module<JISModule>]
-[Display(Name = "数据输出")]
-public class JISDataOutputAttribute : GroupAttribute
-{
-}