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

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;
 

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

@@ -121,11 +121,26 @@ public class IdentityDbSeed : IDbSeed<IdentityDbContext>
 
     private void InitTestDate(IdentityDbContext context)
     {
-        context.Set<HBPO_SA>().Add(new HBPO_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
-        context.Set<BBAC_SA>().Add(new BBAC_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
-        context.Set<JIT_SA>().Add(new JIT_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
-        context.Set<BJ_SA>().Add(new BJ_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
-        context.Set<IN_SA>().Add(new IN_SA { Version = "测试数据", BillNum = "测试数据", DNBillNum = "测试数据", State = "测试数据" });
+        context.Set<HBPO_SA>().Add(new HBPO_SA { Version = "测试数据", BillNum = "123", 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<BBAC_SA>().Add(new BBAC_SA { Version = "测试数据", BillNum = "123", 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<JIT_SA>().Add(new JIT_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
+        context.Set<JIT_SA_DETAIL>().Add(new JIT_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据",  SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<BJ_SA>().Add(new BJ_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" });
+        context.Set<BJ_SA_DETAIL>().Add(new BJ_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<IN_SA>().Add(new IN_SA { Version = "测试数据", BillNum = "123", DNBillNum = "测试数据", State = "测试数据" });
+        context.Set<IN_SA_DETAIL>().Add(new IN_SA_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PU = "测试数据", Site = "测试数据",SettleDate = new DateTime(), GroupNum = "测试数据" });
+        context.Set<HBPO_DN>().Add(new HBPO_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<HBPO_DN_DETAIL>().Add(new HBPO_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" });
+        context.Set<BBAC_DN>().Add(new BBAC_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<BBAC_DN_DETAIL>().Add(new BBAC_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" });
+        context.Set<JIT_DN>().Add(new JIT_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<JIT_DN_DETAIL>().Add(new JIT_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" });
+        context.Set<BJ_DN>().Add(new BJ_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<BJ_DN_DETAIL>().Add(new BJ_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" });
+        context.Set<IN_DN>().Add(new IN_DN { Version = "测试数据", DNBillNum = "123", StockCount = "测试数据" });
+        context.Set<IN_DN_DETAIL>().Add(new IN_DN_DETAIL { KeyCode = "测试数据", Version = "测试数据", LU = "测试数据", PU = "测试数据", Site = "测试数据",  SettleDate = new DateTime(), State = "测试数据", INVGroupNum = "测试数据", GroupNum = "测试数据", DNBillNum = "测试数据" });
     }
 
     private void InitDictionaries(DbContext context)

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

@@ -45,7 +45,10 @@ public class BBAC_DN_DETAIL : BaseEntity
     /// </summary>
     [Display(Name = "结算单号")]
     public string BillNum { get; set; } = null!;
-
+    [Display(Name = "发票分组号")]
+    public string INVGroupNum { get; set; } = null!;
+    [Display(Name = "出库单号")]
+    public string DNBillNum { get; set; } = null!;
     /// <summary>
     /// 对应字段Material
     /// </summary>

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

@@ -23,9 +23,9 @@ public class HBPO_DN : BaseEntity
     /// 定时统计记录数量
     /// </summary>
     [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!;
 }