Browse Source

update

master
姜旭之 1 year ago
parent
commit
23f81799ed
  1. 1
      docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs
  2. 4
      docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs
  3. 2
      docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs
  4. 8
      docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs
  5. 4
      docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs
  6. 12
      docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs
  7. 244
      docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs
  8. 5
      docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs
  9. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs
  10. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs
  11. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs
  12. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs
  13. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs
  14. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs
  15. 2
      docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs
  16. 2
      docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs

1
docs/demo/src/WTA.Application/Identity/Controllers/BBAC_PD_DETAILController.cs

@ -44,4 +44,5 @@ public class BBAC_PD_DETAILController : GenericController<BBAC_PD_DETAIL, BBAC_P
{
return null;
}
}

4
docs/demo/src/WTA.Application/Identity/Controllers/BBAC_SE_DETAILController.cs

@ -33,10 +33,6 @@ public class BBAC_SE_DETAILController : GenericController<BBAC_SE_DETAIL, BBAC_S
return base.Create(model);
}
/// <summary>
/// 未确定
/// </summary>
/// <returns></returns>
[HttpPost, Display(Name = "同步"), Multiple]
public IActionResult? Synchronous()
{

2
docs/demo/src/WTA.Application/Identity/Controllers/CentralizedControlController.cs

@ -38,7 +38,7 @@ public class CentralizedControlController : GenericController<CentralizedControl
return null;
}
[HttpPost,Multiple,Display(Name ="开启期间")]
[HttpPost, Multiple, Display(Name = "开启期间")]
public IActionResult? OpenVersion()
{
return null;

8
docs/demo/src/WTA.Application/Identity/Controllers/HBPO_SE_DETAILController.cs

@ -16,9 +16,9 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
}
[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]
@ -33,10 +33,6 @@ public class HBPO_SE_DETAILController : GenericController<HBPO_SE_DETAIL, HBPO_S
return base.Create(model);
}
/// <summary>
/// 未确定
/// </summary>
/// <returns></returns>
[HttpPost, Display(Name = "同步"), Multiple]
public IActionResult? Synchronous()
{

4
docs/demo/src/WTA.Application/Identity/Controllers/INVOICE_GRPController.cs

@ -46,8 +46,8 @@ public class INVOICE_GRPController : GenericController<INVOICE_GRP, INVOICE_GRP,
return null;
}
[HttpPost, Display(Name = "审核发票信息"), Multiple]
public IActionResult? AddBackGroundJob()
[HttpPost, Display(Name = "审核通过"), Multiple]
public IActionResult? ApprovalPassed()
{
return null;
}

12
docs/demo/src/WTA.Application/Identity/Controllers/JIT_PUB_SAController.cs

@ -69,4 +69,16 @@ public class JIT_PUB_SAController : BaseController, IResourceService<JIT_PUB_SA>
[Order(1)]
public class JIT_PUB_SA : IResource
{
[Display(Name = "期间")]
public string Version { get; set; } = null!;
[Display(Name = "结算单据")]
[OneToMany<PUB_SA_DETAIL>]
public string BillNum { get; set; } = null!;
/// <summary>
/// 1、新建 2、已有出库3、已有扣减寄售库
/// </summary>
[Display(Name = "状态")]
public string State { get; set; } = null!;
}

244
docs/demo/src/WTA.Application/Identity/Data/Config/BaseDataDbConfig.cs

@ -11,78 +11,23 @@ IEntityTypeConfiguration<MaterialRelationship>,
IEntityTypeConfiguration<TB_RePartsRelationship>,
IEntityTypeConfiguration<CentralizedControl>,
IEntityTypeConfiguration<TB_PRICE_LIST>,
//IEntityTypeConfiguration<Class7>,
//IEntityTypeConfiguration<Class8>,
IEntityTypeConfiguration<HBPO_SA>,
IEntityTypeConfiguration<BBAC_SA>,
IEntityTypeConfiguration<HBPO_SE_DETAIL>,
IEntityTypeConfiguration<BBAC_SE_DETAIL>,
//IEntityTypeConfiguration<Class13>,
//IEntityTypeConfiguration<Class14>,
//IEntityTypeConfiguration<Class15>,
//IEntityTypeConfiguration<Class16>,
//IEntityTypeConfiguration<Class17>,
//IEntityTypeConfiguration<Class18>,
//IEntityTypeConfiguration<JIT_SA>,
//IEntityTypeConfiguration<JIT_SE_DETAIL>,
//IEntityTypeConfiguration<Class21>,
//IEntityTypeConfiguration<Class22>,
//IEntityTypeConfiguration<Class23>,
//IEntityTypeConfiguration<BJ_SE_DETAIL>,
//IEntityTypeConfiguration<Class26>,
//IEntityTypeConfiguration<Class27>,
//IEntityTypeConfiguration<Class28>,
//IEntityTypeConfiguration<Class29>,
//IEntityTypeConfiguration<IN_SE_DETAIL>,
//IEntityTypeConfiguration<Class32>,
//IEntityTypeConfiguration<Class33>,
//IEntityTypeConfiguration<Class34>,
//IEntityTypeConfiguration<Class35>,
//IEntityTypeConfiguration<HBPO_DN>,
//IEntityTypeConfiguration<BBAC_DN>,
//IEntityTypeConfiguration<JIT_DN>,
//IEntityTypeConfiguration<BJ_DN>,
//IEntityTypeConfiguration<IN_DN>,
//IEntityTypeConfiguration<Class41>,
IEntityTypeConfiguration<INVOICE_GRP>,
//IEntityTypeConfiguration<Class43>,
//IEntityTypeConfiguration<Class44>,
//IEntityTypeConfiguration<Class45>,
//IEntityTypeConfiguration<Class46>,
//IEntityTypeConfiguration<Class47>,
//IEntityTypeConfiguration<BBAC_DN_DETAIL>,
IEntityTypeConfiguration<BBAC_SA_DETAIL>,
//IEntityTypeConfiguration<BJ_DN_DETAIL>,
//IEntityTypeConfiguration<HBPO_DN_DETAIL>,
IEntityTypeConfiguration<HBPO_SA_DETAIL>,
//IEntityTypeConfiguration<IN_DN_DETAIL>,
//IEntityTypeConfiguration<JIT_DN_DETAIL>,
//IEntityTypeConfiguration<JIT_SA_DETAIL>,
IEntityTypeConfiguration<TB_PRICE_BJ>,
IEntityTypeConfiguration<INVOICE_WAIT_DETAIL>,
//IEntityTypeConfiguration<HBPO_NOT_SA>,
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>,
@ -101,7 +46,8 @@ IEntityTypeConfiguration<BBAC_SE_EDI>,
IEntityTypeConfiguration<HBPO_SE_EDI>,
IEntityTypeConfiguration<BBAC_SE_SA_REPORT>,
IEntityTypeConfiguration<HBPO_SE_SA_REPORT>,
IEntityTypeConfiguration<JIT_SE_SA_REPORT>
IEntityTypeConfiguration<JIT_SE_SA_REPORT>,
IEntityTypeConfiguration<CodeSetting>
{
public void Configure(EntityTypeBuilder<Material> builder)
{ }
@ -112,21 +58,12 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
public void Configure(EntityTypeBuilder<TB_RePartsRelationship> builder)
{ }
//public void Configure(EntityTypeBuilder<TB_ReAssemblyRelationship> 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<Class8> builder)
//{ }
public void Configure(EntityTypeBuilder<HBPO_SA> builder)
{ }
@ -139,165 +76,27 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
public void Configure(EntityTypeBuilder<BBAC_SE_DETAIL> builder)
{ }
//public void Configure(EntityTypeBuilder<Class13> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class14> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class15> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class16> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class17> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class18> 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<Class22> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class23> builder)
//{ }
//public void Configure(EntityTypeBuilder<BJ_SE_DETAIL> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class26> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class27> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class28> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class29> builder)
//{ }
//public void Configure(EntityTypeBuilder<IN_SE_DETAIL> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class32> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class33> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class34> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class35> builder)
//{ }
//public void Configure(EntityTypeBuilder<HBPO_DN> builder)
//{ }
//public void Configure(EntityTypeBuilder<BBAC_DN> builder)
//{ }
//public void Configure(EntityTypeBuilder<JIT_DN> builder)
//{ }
//public void Configure(EntityTypeBuilder<BJ_DN> builder)
//{ }
//public void Configure(EntityTypeBuilder<IN_DN> builder)
//{ }
//public void Configure(EntityTypeBuilder<Class41> builder)
//{ }
public void Configure(EntityTypeBuilder<INVOICE_GRP> 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<Class47> builder)
//{ }
//public void Configure(EntityTypeBuilder<BBAC_DN_DETAIL> builder)
//{ }
public void Configure(EntityTypeBuilder<BBAC_SA_DETAIL> 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<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<INVOICE_WAIT_DETAIL> builder)
{ }
//public void Configure(EntityTypeBuilder<HBPO_NOT_SA> builder)
//{ }
public void Configure(EntityTypeBuilder<HBPO_NOT_SA_DETAIL> builder)
{ }
//public void Configure(EntityTypeBuilder<BBAC_NOT_SA> builder)
//{ }
public void Configure(EntityTypeBuilder<BBAC_NOT_SA_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)
{ }
@ -310,33 +109,12 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
public void Configure(EntityTypeBuilder<BBAC_CAN_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_NOT_SETTLE> builder)
{ }
//public void Configure(EntityTypeBuilder<JIS_PD_DETAIL> builder)
//{ }
public void Configure(EntityTypeBuilder<PUB_SA_DETAIL> builder)
{ }
@ -351,32 +129,50 @@ IEntityTypeConfiguration<JIT_SE_SA_REPORT>
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)
{ }
public void Configure(EntityTypeBuilder<CodeSetting> builder)
{ }
}

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

@ -171,6 +171,11 @@ public class IdentityDbSeed : IDbSeed<IdentityDbContext>
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<HBPO_SE_REPORT>().Add(new HBPO_SE_REPORT { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", SeqNumber = "测试数据", AssemblyCode = "测试数据", InjectionCode = "测试数据", BeginDate = new DateTime(), ShippingDate = new DateTime(), WmsBillNum = "测试数据" });
context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "1号测试数据" });
context.Set<PUB_SA>().Add(new PUB_SA { Version = "测试数据", State = "测试数据", BillNum = "2号测试数据" });
context.Set<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "1号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
context.Set<PUB_SA_DETAIL>().Add(new PUB_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "2号测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", InvGroupNum = "测试数据", SettleDate = new DateTime(), Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", GroupNum = "测试数据" });
}
private static void InitDictionaries(DbContext context)

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Department.cs

@ -2,7 +2,7 @@ using WTA.Shared.Attributes;
using WTA.Shared.Domain;
namespace WTA.Application.Identity.Entities.SystemManagement;
[Hidden]
[Order(4)]
[SystemManagement]
public class Department : BaseTreeEntity<Department>

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/JIT_SE_SA_REPORT.cs

@ -1,9 +1,9 @@
using System.ComponentModel.DataAnnotations;
using WTA.Application.Identity.Entities.SystemManagement.Group;
using WTA.Shared.Attributes;
using WTA.Shared.Domain;
namespace WTA.Application.Identity.Entities.SystemManagement;
[Hidden]
[Display(Name = "JIT发运数据与结算数据对比实体")]
public class JIT_SE_SA_REPORT : BaseEntity

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Material.cs

@ -4,7 +4,7 @@ using WTA.Shared.Domain;
namespace WTA.Application.Identity.Entities.SystemManagement;
[Order(7)]
[Order(2)]
[SystemManagement]
[Display(Name = "物料主数据")]
public class Material : BaseEntity

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SA.cs

@ -39,7 +39,7 @@ public class PUB_SA_DETAIL : BaseEntity
/// <summary>
/// 结算单号
/// </summary>
[Display(Name = "结算单")]
[Display(Name = "结算单")]
public string BillNum { get; set; } = null!;
/// <summary>

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Permission.cs

@ -3,7 +3,7 @@ using WTA.Shared.Attributes;
using WTA.Shared.Domain;
namespace WTA.Application.Identity.Entities.SystemManagement;
[Hidden]
[Order(3)]
[SystemManagement]
public class Permission : BaseTreeEntity<Permission>

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Post.cs

@ -2,7 +2,7 @@ using WTA.Shared.Attributes;
using WTA.Shared.Domain;
namespace WTA.Application.Identity.Entities.SystemManagement;
[Hidden]
[Order(5)]
[SystemManagement]
public class Post : BaseEntity

2
docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/Role.cs

@ -2,7 +2,7 @@ using WTA.Shared.Attributes;
using WTA.Shared.Domain;
namespace WTA.Application.Identity.Entities.SystemManagement;
[Hidden]
[Order(2)]
[SystemManagement]
public class Role : BaseEntity

2
docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs

@ -1,6 +1,6 @@
namespace WTA.Shared.Attributes;
[AttributeUsage(AttributeTargets.Property,AllowMultiple =true)]
[AttributeUsage(AttributeTargets.Property, AllowMultiple = true)]
public class OneToManyAttribute<TEntity> : Attribute, ITypeAttribute
{
public Type Type { get; set; } = null!;

Loading…
Cancel
Save