From 7c1ebb9582363de547ee4be606ba8b4e4036c210 Mon Sep 17 00:00:00 2001 From: 44673626 <44673626@qq.com> Date: Wed, 5 Jan 2022 14:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BT_Car/BT_Car_PlatformDto.cs | 20 +++++++++ .../Entities/BT_Car/BT_Car_PlatformDtoBase.cs | 20 +++++++++ .../BT_Car/BT_Car_PlatformExportDto.cs | 25 +++++++++++ .../BT_Car/BT_Car_PlatformImportDto.cs | 24 +++++++++++ .../BT_Car/BT_Car_PlatformRequestDto.cs | 20 +++++++++ .../Entities/HQ_F/HQ_F_PlatformDto.cs | 19 +++++++++ .../Entities/HQ_F/HQ_F_PlatformDtoBase.cs | 19 +++++++++ .../Entities/HQ_F/HQ_F_PlatformExportDto.cs | 23 ++++++++++ .../Entities/HQ_F/HQ_F_PlatformImportDto.cs | 23 ++++++++++ .../Entities/HQ_F/HQ_F_PlatformRequestDto.cs | 19 +++++++++ .../Entities/HQ_M/HQ_M_PlatformDto.cs | 20 +++++++++ .../Entities/HQ_M/HQ_M_PlatformDtoBase.cs | 20 +++++++++ .../Entities/HQ_M/HQ_M_PlatformExportDto.cs | 24 +++++++++++ .../Entities/HQ_M/HQ_M_PlatformImportDto.cs | 24 +++++++++++ .../Entities/HQ_M/HQ_M_PlatformRequestDto.cs | 20 +++++++++ .../Entities/BT_Car/BT_Car_Platform.cs | 38 ++++++++++++++++- .../Entities/HQ_F/HQ_F_Platform.cs | 42 +++++++++++-------- .../Entities/HQ_M/HQ_M_Platform.cs | 42 ++++++++++++------- ...AccountDbContextModelCreatingExtensions.cs | 1 + 19 files changed, 408 insertions(+), 35 deletions(-) diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs index dc89ff81..e230bc17 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDto.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs index 12180351..6f000845 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformDtoBase.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs index 9ac1a36b..a835d119 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformExportDto.cs @@ -81,5 +81,30 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// [ExporterHeader(DisplayName = "存储地点描述")] public string StorageLocationDesc { get; set; } + + + /// + ///验收单号 + /// + [ExporterHeader(DisplayName = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ExporterHeader(DisplayName = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs index 5b35507c..0a6598c3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformImportDto.cs @@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// [ImporterHeader(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ImporterHeader(Name = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ImporterHeader(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ImporterHeader(Name = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs index 600cced9..7896945f 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BT_Car/BT_Car_PlatformRequestDto.cs @@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// public string StorageLocation { get; set; } + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } + /// /// 存储地点描述 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs index f49ce8ce..16e546b6 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDto.cs @@ -68,5 +68,24 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs index 3d3cf82a..a496a00b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformDtoBase.cs @@ -68,5 +68,24 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs index 086fab5e..75cb76d1 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformExportDto.cs @@ -81,5 +81,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// [ExporterHeader(DisplayName = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ExporterHeader(DisplayName = "验收单号")] + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ExporterHeader(DisplayName = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs index 6bbeaf48..52521ca5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformImportDto.cs @@ -81,5 +81,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// [ImporterHeader(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ImporterHeader(Name = "验收单号")] + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ImporterHeader(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ImporterHeader(Name = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs index 52b1bc57..6f38b676 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_F/HQ_F_PlatformRequestDto.cs @@ -65,6 +65,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F /// public string StorageLocation { get; set; } + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } + /// /// 存储地点描述 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs index de9a7648..9a1847c5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDto.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs index 4e24abce..f3879604 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformDtoBase.cs @@ -68,5 +68,25 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// 存储地点描述 /// public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs index ac758d0d..8f41c9f3 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformExportDto.cs @@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// [ExporterHeader(DisplayName = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ExporterHeader(DisplayName = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ExporterHeader(DisplayName = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ExporterHeader(DisplayName = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ExporterHeader(DisplayName = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs index a8190c22..dab9e93b 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformImportDto.cs @@ -81,5 +81,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// [ImporterHeader(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [ImporterHeader(Name = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [ImporterHeader(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [ImporterHeader(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [ImporterHeader(Name = "金额")] + public decimal Amt { set; get; } } } diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs index fb74a3d0..7197dae8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/HQ_M/HQ_M_PlatformRequestDto.cs @@ -65,6 +65,26 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M /// public string StorageLocation { get; set; } + /// + ///验收单号 + /// + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + public decimal Qty { set; get; } + + /// + /// 单价 + /// + public decimal Price { set; get; } + + /// + /// 金额 + /// + public decimal Amt { set; get; } + /// /// 存储地点描述 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs index 3002ffa2..0916c151 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BT_Car/BT_Car_Platform.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car public BT_Car_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber, string kanbanNumber, string year, string factory, DateTime acceptanceDate, string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc, - string materialCode) : base(Id) + string materialCode, string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id) { MaterialVoucherNo = materialVoucherNo; KanbanNumber = kanbanNumber; @@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car Supplier = supplier; StorageLocation = storageLocation; StorageLocationDesc = storageLocationDesc; + AcceptanceNo = acceptanceNo; + Qty = qty; + Price = price; + Amt = amt; } //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 @@ -67,7 +71,11 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car /// [Display(Name = "物料凭证号")] public string MaterialVoucherNo { get; set; } - + ///// + /////验收单号 + ///// + //[Display(Name = "验收单号")] + //public string AcceptanceNo { get; set; } /// ///会计年度 /// @@ -120,6 +128,32 @@ namespace Win.Sfs.SettleAccount.Entities.BT_Car [Display(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + + /// + ///验收单号 + /// + [Display(Name = "验收单号")] + public string AcceptanceNo { get; set; } + + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { set; get; } + + /// + /// 单价 + /// + [Display(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [Display(Name = "金额")] + public decimal Amt { set; get; } + + /// /// 备注 /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs index f871b668..2b673fc8 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_F/HQ_F_Platform.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F public HQ_F_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber, string kanbanNumber, string year, string factory, DateTime acceptanceDate, string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc, - string materialCode) : base(Id) + string materialCode, string acceptanceNo,decimal qty, decimal price, decimal amt) : base(Id) { MaterialVoucherNo = materialVoucherNo; KanbanNumber = kanbanNumber; @@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F Supplier = supplier; StorageLocation = storageLocation; StorageLocationDesc = storageLocationDesc; + AcceptanceNo = acceptanceNo; + Qty = qty; + Price = price; + Amt = amt; } //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 @@ -124,24 +128,28 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_F [Display(Name = "存储地点描述")] public string StorageLocationDesc { get; set; } + /// + ///验收单号 + /// + [Display(Name = "验收单号")] + public string AcceptanceNo { get; set; } + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { set; get; } - ///// - ///// 数量 - ///// - //[Display(Name = "数量")] - //public decimal Qty { set; get; } - - ///// - ///// 单价 - ///// - //[Display(Name = "单价")] - //public decimal Price { set; get; } + /// + /// 单价 + /// + [Display(Name = "单价")] + public decimal Price { set; get; } - ///// - ///// 金额 - ///// - //[Display(Name = "金额")] - //public decimal Amt { set; get; } + /// + /// 金额 + /// + [Display(Name = "金额")] + public decimal Amt { set; get; } /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs index c3a3df94..779fb3b9 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/HQ_M/HQ_M_Platform.cs @@ -24,7 +24,7 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M public HQ_M_Platform(Guid Id, string materialVoucherNo, string externalKanbanNumber, string kanbanNumber, string year, string factory, DateTime acceptanceDate, string period, string version, string kanBan, string supplier, string storageLocation, string storageLocationDesc, - string materialCode) : base(Id) + string materialCode, string acceptanceNo, decimal qty, decimal price, decimal amt) : base(Id) { MaterialVoucherNo = materialVoucherNo; KanbanNumber = kanbanNumber; @@ -39,6 +39,10 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M Supplier = supplier; StorageLocation = storageLocation; StorageLocationDesc = storageLocationDesc; + AcceptanceNo = acceptanceNo; + Qty = qty; + Price = price; + Amt = amt; } //验收单号 外部单号 物料凭证号 物料凭证日期 物料凭证记账日期 看板编号 外部看板编号 物料号 物料描述 数量 单价 金额 @@ -125,23 +129,29 @@ namespace Win.Sfs.SettleAccount.Entities.HQ_M public string StorageLocationDesc { get; set; } - ///// - ///// 数量 - ///// - //[Display(Name = "数量")] - //public decimal Qty { set; get; } + /// + ///验收单号 + /// + [Display(Name = "验收单号")] + public string AcceptanceNo { get; set; } - ///// - ///// 单价 - ///// - //[Display(Name = "单价")] - //public decimal Price { set; get; } + /// + /// 数量 + /// + [Display(Name = "数量")] + public decimal Qty { set; get; } - ///// - ///// 金额 - ///// - //[Display(Name = "金额")] - //public decimal Amt { set; get; } + /// + /// 单价 + /// + [Display(Name = "单价")] + public decimal Price { set; get; } + + /// + /// 金额 + /// + [Display(Name = "金额")] + public decimal Amt { set; get; } /// diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs index 647dfd8c..887894ab 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -365,6 +365,7 @@ namespace Win.Sfs.SettleAccount b.Property(x => x.Supplier).HasMaxLength(50); b.Property(x => x.StorageLocation).HasMaxLength(50); b.Property(x => x.StorageLocationDesc).HasMaxLength(150); + b.Property(x => x.AcceptanceNo).HasMaxLength(50); //创建组合索引 b.HasIndex(x => new { x.Version, x.HQHKanBan, x.MaterialCode }).IsUnique().HasFilter(IsDeletedFilter);