diff --git a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs index 09ed0584..d6a385e9 100644 --- a/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs +++ b/docs/demo/src/WTA.Application/Identity/Data/IdentityDbSeed.cs @@ -151,8 +151,8 @@ public class IdentityDbSeed : IDbSeed context.Set().Add(new HBPO_SA { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); context.Set().Add(new HBPO_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); context.Set().Add(new HBPO_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", 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 { Version = "测试数据", BillNum = "456", DNBillNum = "测试数据", State = "测试数据", RecordCount = "测试数据" }); + context.Set().Add(new BBAC_SA { Version = "测试数据", BillNum = "123", State = "测试数据", RecordCount = "测试数据" }); + context.Set().Add(new BBAC_SA { Version = "测试数据", BillNum = "456", State = "测试数据", RecordCount = "测试数据" }); context.Set().Add(new BBAC_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); context.Set().Add(new BBAC_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); context.Set().Add(new HBPO_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "123", State = "测试数据", InvGroupNum = "测试数据" }); @@ -161,8 +161,8 @@ public class IdentityDbSeed : IDbSeed context.Set().Add(new HBPO_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据" }); context.Set().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "123", State = "测试数据", InvGroupNum = "测试数据" }); context.Set().Add(new BBAC_CAN_SA { SettleBillNum = "测试数据", Version = "测试数据", BillNum = "456", State = "测试数据", InvGroupNum = "测试数据" }); - context.Set().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); - context.Set().Add(new BBAC_CAN_SA_DETAIL { SettleBillNum = "测试数据", InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new BBAC_CAN_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "123", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); + context.Set().Add(new BBAC_CAN_SA_DETAIL { InvGroupNum = "测试数据", KeyCode = "测试数据", Version = "测试数据", BillNum = "456", LU = "测试数据", PN = "测试数据", Site = "测试数据", SettleDate = new DateTime(), GroupNum = "测试数据", Category = "测试数据", IsReturn = "测试数据" }); context.Set().Add(new INVOICE_GRP { Version = "测试数据", RealnvBillNum = "测试数据", InvbillNum = "123", InvGroupNum = "分组号测试数据一", FileName = "测试数据", BusinessType = "测试数据" }); context.Set().Add(new INVOICE_GRP { Version = "测试数据", RealnvBillNum = "测试数据", InvbillNum = "456", InvGroupNum = "分组号测试数据二", FileName = "测试数据", BusinessType = "测试数据" }); context.Set().Add(new INVOICE_WAIT_DETAIL { InvbillNum = "待开票明细123", InvGroupNum = "待开票明细分组号测试数据一", Version = "测试数据", LU = "测试数据", BussiessType = "测试数据", Extend1 = "测试数据", Extend2 = "测试数据", Extend3 = "测试数据", Extend4 = "测试数据" }); diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs index 1d26e962..4b2e4138 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_CAN_SA.cs @@ -53,8 +53,8 @@ public class BBAC_CAN_SA_DETAIL : BaseEntity /// [Display(Name = "结算单号")] public string BillNum { get; set; } = null!; - [Display(Name = "关联结算单号")] - public string SettleBillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; /// /// 对应字段Material /// diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs index 0ea044d6..7f3aba68 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SA.cs @@ -18,8 +18,8 @@ public class BBAC_SA : BaseEntity [OneToMany] public string BillNum { get; set; } = null!; - [Display(Name = "出库单号")] - public string DNBillNum { get; set; } = null!; + //[Display(Name = "出库单号")] + //public string DNBillNum { get; set; } = null!; /// /// 1、新建 2、已有出库3、已有扣减寄售库 diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs index 96746d9d..0080be5d 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/BBAC_SE_SA_REPORT.cs @@ -1,15 +1,16 @@ 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; + [Hidden] [Display(Name = "BBAC发运数据与结算数据对比实体")] public class BBAC_SE_SA_REPORT : BaseEntity { [Display(Name = "LU+ASN单号")] public string KeyCode { get; set; } = null!; + /// /// 有结算无发货(无EDI数据) ///有结算无发货(有EDI数据) @@ -26,39 +27,55 @@ public class BBAC_SE_SA_REPORT : BaseEntity [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!; + /// /// 结算数据中的过账日期 /// [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!; } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs index 2b543d5e..70ca2b0b 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_DETAIL.cs @@ -34,8 +34,8 @@ public class HBPO_SE_DETAIL : BaseEntity [Display(Name = "发货数量")] public decimal Qty { get; set; } - [Display(Name = "订单时间")] - public DateTime BeginDate { get; set; } + //[Display(Name = "订单时间")] + //public DateTime BeginDate { get; set; } [Display(Name = "发货时间")] public DateTime ShippingDate { get; set; } diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs index 5cdcd2db..35da35e9 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_EDI.cs @@ -10,7 +10,7 @@ namespace WTA.Application.Identity.Entities.SystemManagement; //HBPO的EDI数据 public class HBPO_SE_EDI : BaseEntity { - [Display(Name = "LU+生产码")] + [Display(Name = "LU+PN")] public string KeyCode { get; set; } = null!; [Display(Name = "期间")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs index 7b42a76f..d573bd71 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/HBPO_SE_SA_REPORT.cs @@ -1,12 +1,11 @@ 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 = "HBPO发运数据与结算数据对比实体")] - public class HBPO_SE_SA_REPORT : BaseEntity { [Display(Name = "LU+ASN单号")] diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs index 8910a9c5..cf63e4e8 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_CAN_SA.cs @@ -52,8 +52,8 @@ public class PUB_CAN_SA_DETAIL : BaseEntity [Display(Name = "结算单号")] public string BillNum { get; set; } = null!; - [Display(Name = "关联结算单号")] - public string SettleBillNum { get; set; } = null!; + //[Display(Name = "关联结算单号")] + //public string SettleBillNum { get; set; } = null!; /// /// 对应字段PartNumber diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs index 69882f0e..a67b4a9e 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/PUB_SE_DETAIL.cs @@ -1,14 +1,14 @@ 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 = "PUB发运数据")] public class PUB_SE_DETAIL : BaseEntity { - [Display(Name = "LU+生产码")] + [Display(Name = "LU+(交付单号、ASN单号等)")] public string KeyCode { get; set; } = null!; [Display(Name = "期间")] @@ -17,7 +17,7 @@ public class PUB_SE_DETAIL : BaseEntity [Display(Name = "零件号")] public string LU { get; set; } = null!; - [Display(Name = "ASN单号")] + [Display(Name = "交付单号、ASN单号等")] public string PN { get; set; } = null!; [Display(Name = "发货数量")] @@ -33,7 +33,7 @@ public class PUB_SE_DETAIL : BaseEntity public string Extend3 { get; set; } = null!; /// - /// 1、JIT 2、买单件 3、备件 3、印度件 + /// 1、JIT 2、买单件 3、备件 4、印度件 /// [Display(Name = "业务分类")] public string BusinessType { get; set; } = null!; diff --git a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs index a8376669..121bc543 100644 --- a/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs +++ b/docs/demo/src/WTA.Application/Identity/Entities/SystemManagement/TB_RePartsRelationship.cs @@ -20,6 +20,7 @@ public class TB_RePartsRelationship : BaseEntity /// [Display(Name = "替换零件号")] public string RepLU { set; get; } = null!; + //取值字段【客户编码】 [Display(Name = "客户编码")] public string ClientCode { set; get; } = null!;