UPDATE

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

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
-using WTA.Shared.Application;
 using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
@@ -28,11 +27,11 @@ public class BBAC_CAN_SAController : GenericController<BBAC_CAN_SA, BBAC_CAN_SA,
         return base.Delete(guids);
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Export([FromBody] PaginationModel<BBAC_CAN_SA, BBAC_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    //public override IActionResult Export([FromBody] PaginationModel<BBAC_CAN_SA, BBAC_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
-    {
+    //{
-        return base.Export(model, includeAll, includeDeleted);
+    //    return base.Export(model, includeAll, includeDeleted);
-    }
+    //}
 
     [NonAction]
     public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
@@ -40,7 +39,7 @@ public class BBAC_CAN_SAController : GenericController<BBAC_CAN_SA, BBAC_CAN_SA,
         return base.Import(file, partial, replace);
     }
 
-    [Multiple, Display(Name = "生成发票数据")]
+    [HttpPost, Multiple, Display(Name = "生成发票数据")]
     public IActionResult? GenerateInvoice()
     {
         return null;

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

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
-using WTA.Shared.Application;
 using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
@@ -28,11 +27,11 @@ public class BBAC_NOT_SA_DETAILController : GenericController<BBAC_NOT_SA_DETAIL
         return base.Delete(guids);
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Export([FromBody] PaginationModel<BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    //public override IActionResult Export([FromBody] PaginationModel<BBAC_NOT_SA_DETAIL, BBAC_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
-    {
+    //{
-        return base.Export(model, includeAll, includeDeleted);
+    //    return base.Export(model, includeAll, includeDeleted);
-    }
+    //}
 
     [NonAction]
     public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)

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

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
 using WTA.Shared.Application;
-using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
 
@@ -16,11 +15,11 @@ public class BBAC_SAController : GenericController<BBAC_SA, BBAC_SA, BBAC_SA, BB
     {
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Delete([FromBody] Guid[] guids)
+    //public override IActionResult Delete([FromBody] Guid[] guids)
-    {
+    //{
-        return base.Delete(guids);
+    //    return base.Delete(guids);
-    }
+    //}
 
     [NonAction]
     public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
@@ -40,15 +39,15 @@ public class BBAC_SAController : GenericController<BBAC_SA, BBAC_SA, BBAC_SA, BB
         return base.Create(model);
     }
 
-    [HttpPost, Display(Name = "下载")]
+    //[HttpPost, Display(Name = "下载")]
-    public IActionResult? Download()//download
+    //public IActionResult? Download()//download
-    {
+    //{
-        return null;
+    //    return null;
-    }
+    //}
-
+
-    [HttpPost, Display(Name = "生成出库单"), Multiple]
+    //[HttpPost, Display(Name = "生成出库单"), Multiple]
-    public IActionResult? CreateOutOrdersAsync()
+    //public IActionResult? CreateOutOrdersAsync()
-    {
+    //{
-        return null;
+    //    return null;
-    }
+    //}
 }

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

@@ -22,11 +22,11 @@ public class BBAC_SE_REPORTController : GenericController<BBAC_SE_REPORT, BBAC_S
         return base.Create(model);
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Delete([FromBody] Guid[] guids)
+    //public override IActionResult Delete([FromBody] Guid[] guids)
-    {
+    //{
-        return base.Delete(guids);
+    //    return base.Delete(guids);
-    }
+    //}
 
     [NonAction]
     public override IActionResult Export([FromBody] PaginationModel<BBAC_SE_REPORT, BBAC_SE_REPORT> model, bool includeAll = false, bool includeDeleted = false)

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

@@ -30,6 +30,12 @@ public class BJ_PUB_CAN_SAController : BaseController, IResourceService<BJ_PUB_C
         return this._genericController.Index(model);
     }
 
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_CAN_SA, PUB_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
     [HttpPost, Multiple, Display(Name = "生成发票数据")]
     public virtual IActionResult? GenerateInvoice()
     {

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

@@ -30,6 +30,12 @@ public class BJ_PUB_NOT_SA_DETAILController : BaseController, IResourceService<B
         return this._genericController.Index(model);
     }
 
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
     [HttpPost, Multiple, Display(Name = "生成可结算单")]
     public virtual IActionResult? GenerateSettlementOrder()
     {

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

@@ -41,6 +41,12 @@ public class BJ_PUB_PD_DETAILController : BaseController, IResourceService<BJ_PU
     {
         return null;
     }
+
+    [HttpPost, Multiple, Display(Name = "退回")]
+    public virtual IActionResult? Reject()
+    {
+        return null;
+    }
 }
 
 [Order(4)]

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

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
-using WTA.Shared.Application;
 using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
@@ -28,11 +27,11 @@ public class HBPO_CAN_SAController : GenericController<HBPO_CAN_SA, HBPO_CAN_SA,
         return base.Delete(guids);
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Export([FromBody] PaginationModel<HBPO_CAN_SA, HBPO_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    //public override IActionResult Export([FromBody] PaginationModel<HBPO_CAN_SA, HBPO_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
-    {
+    //{
-        return base.Export(model, includeAll, includeDeleted);
+    //    return base.Export(model, includeAll, includeDeleted);
-    }
+    //}
 
     [NonAction]
     public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)

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

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
-using WTA.Shared.Application;
 using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
@@ -28,11 +27,11 @@ public class HBPO_NOT_SA_DETAILController : GenericController<HBPO_NOT_SA_DETAIL
         return base.Delete(guids);
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Export([FromBody] PaginationModel<HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    //public override IActionResult Export([FromBody] PaginationModel<HBPO_NOT_SA_DETAIL, HBPO_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
-    {
+    //{
-        return base.Export(model, includeAll, includeDeleted);
+    //    return base.Export(model, includeAll, includeDeleted);
-    }
+    //}
 
     [NonAction]
     public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)

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

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
 using WTA.Shared.Application;
-using WTA.Shared.Attributes;
 using WTA.Shared.Controllers;
 using WTA.Shared.Data;
 
@@ -34,21 +33,21 @@ public class HBPO_SAController : GenericController<HBPO_SA, HBPO_SA, HBPO_SA, HB
         return base.Import(file);
     }
 
-    [NonAction]
+    //[NonAction]
-    public override IActionResult Delete([FromBody] Guid[] guids)
+    //public override IActionResult Delete([FromBody] Guid[] guids)
-    {
+    //{
-        return base.Delete(guids);
+    //    return base.Delete(guids);
-    }
+    //}
-
+
-    [HttpPost, Display(Name = "下载")]
+    //[HttpPost, Display(Name = "下载")]
-    public IActionResult? Download()//download
+    //public IActionResult? Download()//download
-    {
+    //{
-        return null;
+    //    return null;
-    }
+    //}
-
+
-    [HttpPost, Display(Name = "生成出库单"), Multiple]
+    //[HttpPost, Display(Name = "生成出库单"), Multiple]
-    public IActionResult? CreateOutOrdersAsync()
+    //public IActionResult? CreateOutOrdersAsync()
-    {
+    //{
-        return null;
+    //    return null;
-    }
+    //}
 }

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

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class INVOICE_MAP_GROUPController : GenericController<INVOICE_MAP_GROUP, INVOICE_MAP_GROUP, INVOICE_MAP_GROUP, INVOICE_MAP_GROUP, INVOICE_MAP_GROUP, INVOICE_MAP_GROUP>
+{
+    public INVOICE_MAP_GROUPController(ILogger<INVOICE_MAP_GROUP> logger, IRepository<INVOICE_MAP_GROUP> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] INVOICE_MAP_GROUP model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<INVOICE_MAP_GROUP, INVOICE_MAP_GROUP> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+}

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

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class INVOICE_NOT_SETTLEController : GenericController<INVOICE_NOT_SETTLE, INVOICE_NOT_SETTLE, INVOICE_NOT_SETTLE, INVOICE_NOT_SETTLE, INVOICE_NOT_SETTLE, INVOICE_NOT_SETTLE>
+{
+    public INVOICE_NOT_SETTLEController(ILogger<INVOICE_NOT_SETTLE> logger, IRepository<INVOICE_NOT_SETTLE> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<INVOICE_NOT_SETTLE, INVOICE_NOT_SETTLE> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] INVOICE_NOT_SETTLE model)
+    {
+        return base.Create(model);
+    }
+}

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

@@ -0,0 +1,41 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using WTA.Application.Identity.Entities.SystemManagement;
+using WTA.Shared.Application;
+using WTA.Shared.Controllers;
+using WTA.Shared.Data;
+
+namespace WTA.Application.Identity.Controllers;
+
+public class INVOICE_WAIT_DETAILController : GenericController<INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL>
+{
+    public INVOICE_WAIT_DETAILController(ILogger<INVOICE_WAIT_DETAIL> logger, IRepository<INVOICE_WAIT_DETAIL> repository) : base(logger, repository)
+    {
+    }
+
+    [NonAction]
+    public override IActionResult Create([FromBody] INVOICE_WAIT_DETAIL model)
+    {
+        return base.Create(model);
+    }
+
+    [NonAction]
+    public override IActionResult Delete([FromBody] Guid[] guids)
+    {
+        return base.Delete(guids);
+    }
+
+    [NonAction]
+    public override IActionResult Export([FromBody] PaginationModel<INVOICE_WAIT_DETAIL, INVOICE_WAIT_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return base.Export(model, includeAll, includeDeleted);
+    }
+
+    [NonAction]
+    public override IActionResult Import([Required] IFormFile file, bool partial = false, bool replace = false)
+    {
+        return base.Import(file, partial, replace);
+    }
+}

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

@@ -30,6 +30,12 @@ public class IN_PUB_CAN_SAController : BaseController, IResourceService<IN_PUB_C
         return this._genericController.Index(model);
     }
 
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_CAN_SA, PUB_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
     [HttpPost, Multiple, Display(Name = "生成发票数据")]
     public virtual IActionResult? GenerateInvoice()
     {

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

@@ -30,6 +30,12 @@ public class IN_PUB_NOT_SA_DETAILController : BaseController, IResourceService<I
         return this._genericController.Index(model);
     }
 
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
     [HttpPost, Multiple, Display(Name = "生成可结算单")]
     public virtual IActionResult? GenerateSettlementOrder()
     {

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

@@ -41,10 +41,16 @@ public class IN_PUB_PD_DETAILController : BaseController, IResourceService<IN_PU
     {
         return null;
     }
+
+    [HttpPost, Multiple, Display(Name = "退回")]
+    public virtual IActionResult? Reject()
+    {
+        return null;
+    }
 }
 
 [Order(4)]
-[Display(Name = "寄售库库存扣减审批")]
+[Display(Name = "待扣减库存明细")]
 [INSettlementInvoicingGroup]
 public class IN_PUB_PD_DETAIL : IResource
 { }

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

@@ -47,6 +47,12 @@ public class JIT_PUB_CAN_SAController : BaseController, IResourceService<JIT_PUB
     {
         return null;
     }
+
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_CAN_SA, PUB_CAN_SA> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
 }
 
 [Display(Name = "可结算单")]

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

@@ -30,6 +30,12 @@ public class JIT_PUB_NOT_SA_DETAILController : BaseController, IResourceService<
         return this._genericController.Index(model);
     }
 
+    [HttpPost, Multiple, Order(-1), HtmlClass("el-button--warning")]
+    public virtual IActionResult Export([FromBody] PaginationModel<PUB_NOT_SA_DETAIL, PUB_NOT_SA_DETAIL> model, bool includeAll = false, bool includeDeleted = false)
+    {
+        return this._genericController.Export(model, includeAll, includeDeleted);
+    }
+
     [HttpPost, Multiple, Display(Name = "生成可结算单")]
     public virtual IActionResult? GenerateSettlementOrder()
     {

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

@@ -41,6 +41,12 @@ public class JIT_PUB_PD_DETAILController : BaseController, IResourceService<JIT_
     {
         return null;
     }
+
+    [HttpPost, Multiple, Display(Name = "退回")]
+    public virtual IActionResult? Reject()
+    {
+        return null;
+    }
 }
 
 [Order(4)]

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

@@ -27,8 +27,8 @@ public class MaterialController : GenericController<Material, Material, Material
     }
 
     [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, partial, replace);
+        return base.Import(file, partial, replace);
     }
 }

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

@@ -1,5 +1,3 @@
-using System.ComponentModel.DataAnnotations;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using WTA.Application.Identity.Entities.SystemManagement;
@@ -25,10 +23,4 @@ public class MaterialRelationshipController : GenericController<MaterialRelation
     {
         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/Data/IdentityDbSeed.cs

@@ -14,7 +14,6 @@ using WTA.Shared.Attributes;
 using WTA.Shared.Data;
 using WTA.Shared.Extensions;
 using WTA.Shared.Identity;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
 
 namespace WTA.Application.Identity.Data;
 
@@ -164,23 +163,14 @@ public class IdentityDbSeed : IDbSeed<IdentityDbContext>
         context.Set<BBAC_CAN_SA>().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" });
         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<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<INVOICE_GRP>().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" });
+        context.Set<INVOICE_GRP>().Add(new INVOICE_GRP { Version = "测试数据", RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" });
-        context.Set<INVOICE_GRP>().Add(new INVOICE_GRP { RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" });
+        context.Set<INVOICE_GRP>().Add(new INVOICE_GRP { Version = "测试数据", RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" });
         context.Set<INVOICE_WAIT_DETAIL>().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细123", InvGroupNum = "待开票明细分组号测试数据一", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" });
         context.Set<INVOICE_WAIT_DETAIL>().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细456", InvGroupNum = "待开票明细分组号测试数据二", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" });
         context.Set<INVOICE_MAP_GROUP>().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系123", InvGroupNum = "发票和结算分组对应关系分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
         context.Set<INVOICE_MAP_GROUP>().Add(new INVOICE_MAP_GROUP { InvbillNum = "发票和结算分组对应关系456", InvGroupNum = "发票和结算分组对应关系分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
         context.Set<INVOICE_NOT_SETTLE>().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据一", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
         context.Set<INVOICE_NOT_SETTLE>().Add(new INVOICE_NOT_SETTLE { InvGroupNum = "分组号测试数据二", Version = "测试数据", SettleGroupNum = "测试数据", LU = "测试数据", LU1 = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据" });
-        context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", BillNum = "一号", State = "测试数据" });
-        context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", BillNum = "二号", State = "测试数据" });
-        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<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "二号", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
-        context.Set<PUB_CAN_SA>().Add(new PUB_CAN_SA { Version = "测试数据", BillNum = "一号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", State = "测试数据" });
-        context.Set<PUB_CAN_SA>().Add(new PUB_CAN_SA { Version = "测试数据", BillNum = "二号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", State = "测试数据" });
-        context.Set<PUB_CAN_SA_DETAIL>().Add(new PUB_CAN_SA_DETAIL { Version = "测试数据", BillNum = "一号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate=new DateTime(), GroupNum= "测试数据",KeyCode= "测试数据" });
-        context.Set<PUB_CAN_SA_DETAIL>().Add(new PUB_CAN_SA_DETAIL { Version = "测试数据", BillNum = "二号", InvGroupNum = "测试数据", SettleBillNum = "测试数据", BusinessType = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate=new DateTime(), GroupNum= "测试数据",KeyCode="测试数据" });
-
     }
 
     private static void InitDictionaries(DbContext context)

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

@@ -5,7 +5,7 @@ using WTA.Shared.Domain;
 
 namespace WTA.Application.Identity.Entities.SystemManagement;
 [JISBBACSettlementInvoicingGroup]
-[Display(Name = "可结算单")]
+[Display(Name = "发票分组号")]
 [Order(1)]
 //BBAC可结算导入
 public class BBAC_CAN_SA : BaseEntity

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

@@ -9,6 +9,8 @@ namespace WTA.Application.Identity.Entities.SystemManagement;
 //发票分组
 public class INVOICE_GRP : BaseEntity
 {
+    [Display(Name = "期间")]
+    public string Version { get; set; } = null!;
     [Display(Name = "实际纸质发票号")]
     public string RealnvBillNum { get; set; } = null!;
     [OneToMany<INVOICE_WAIT_DETAIL>]