diff --git a/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_BJController.cs b/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_BJController.cs index 1873de4b..47e5385c 100644 --- a/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_BJController.cs +++ b/docs/demo/src/WTA.Application/Identity/Controllers/TB_PRICE_BJController.cs @@ -1,7 +1,6 @@ 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; diff --git a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs index 8452822c..e3e73f4f 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs @@ -121,11 +121,26 @@ public class IdentityDbSeed : IDbSeed private void InitTestDate(IdentityDbContext context) { - context.Set().Add(new HBPO_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new BBAC_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new JIT_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new BJ_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); - context.Set().Add(new IN_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据" }); + context.Set().Add(new HBPO_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); + context.Set().Add(new HBPO_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new BBAC_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); + context.Set().Add(new BBAC_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new JIT_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); + context.Set().Add(new JIT_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new BJ_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); + context.Set().Add(new BJ_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new IN_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据" }); + context.Set().Add(new IN_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PU = "测试数据", Site = "测试数据",SettleDate = new DateTime(), GroupNum = "测试数据" }); + context.Set().Add(new HBPO_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); + context.Set().Add(new HBPO_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" }); + context.Set().Add(new BBAC_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); + context.Set().Add(new BBAC_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" }); + context.Set().Add(new JIT_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); + context.Set().Add(new JIT_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" }); + context.Set().Add(new BJ_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); + context.Set().Add(new BJ_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" }); + context.Set().Add(new IN_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" }); + context.Set().Add(new IN_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PU = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" }); } private void InitDictionaries(DbContext context) diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs index 3cfee9e8..25ce5865 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_DN.cs @@ -45,7 +45,10 @@ public class BBAC_DN_DETAIL : BaseEntity /// [Display(Name = "结算单号")] public string BillNum { get; set; } = null!; - + [Display(Name = "发票分组号")] + public string INVGroupNum { get; set; } = null!; + [Display(Name = "出库单号")] + public string DNBillNum { get; set; } = null!; /// /// 对应字段Material /// diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs index e5a454f3..7cce732a 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_DN.cs @@ -23,9 +23,9 @@ public class HBPO_DN : BaseEntity /// 定时统计记录数量 /// [Display(Name = "出库记状态统计")] - public decimal StockCount { get; set; } - + public string StockCount { get; set; } = null!; } + [Display(Name = "HBPO出库单明细")] [ChuKuDanGroup] public class HBPO_DN_DETAIL : BaseEntity @@ -68,4 +68,7 @@ public class HBPO_DN_DETAIL : BaseEntity [Display(Name = "结算日期(收货日期)")] public DateTime SettleDate { get; set; } + + [Display(Name = "结算分组")] + public string GroupNum { get; set; } = null!; }