From 2e73f663b749cfb7a9f7051e40a041a3960e5ab6 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 15 Dec 2023 09:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/VmiAppService.cs | 10 +++++----- .../SettleAccountApplicationAutoMapperProfile.cs | 5 ++++- .../Entities/BQ/Vmi/VmiBalanceSumDetail.cs | 12 ++++++------ .../SettleAccountDbContextModelCreatingExtensions.cs | 6 +++--- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index 52459bfc..1f0611c2 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -1356,17 +1356,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ public class VmiBalanceSumDetailDto { [Display(Name = "生产码")] - public string Vincode { set; get; } + public string VinCode { set; get; } [Display(Name = "零件号")] - public string RealPartcode { set; get; } + public string RealPartCode { set; get; } [Display(Name = "库位")] public string ErpToLoc { set; get; } [Display(Name = "最后发运时间")] public DateTime? ShippingTime { set; get; } [Display(Name = "最后结算时间")] - public DateTime? ReceiveTime { set; get; } + public DateTime? BillTime { set; get; } [Display(Name = "合计数量")] - public decimal SumQty { set; get; } + public decimal Qty { set; get; } [Display(Name = "发运入库数量")] public decimal ShippingQty { set; get; } [Display(Name = "结算出库数量")] @@ -1382,7 +1382,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { [Display(Name = "零件号")] - public string RealPartcode { set; get; } + public string RealPartCode { set; get; } [Display(Name = "零件描述")] public string PartDesc { set; get; } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs index 8d0a8bd9..012a113e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs @@ -953,7 +953,10 @@ namespace Win.Sfs.SettleAccount /// private void CreateMapBalanceSumDetail() { - CreateMap().ReverseMap(); + CreateMap() + .ForMember(x => x.BillTime, y => y.MapFrom(d => d.ShippingTime)) + .ForMember(x => x.Qty, y => y.MapFrom(d => d.SumQty)). + ReverseMap(); } /// diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalanceSumDetail.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalanceSumDetail.cs index accbea94..8c9ce393 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalanceSumDetail.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalanceSumDetail.cs @@ -16,8 +16,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi public VmiBalanceSumDetail(string vincode, string realPartcode, string erpToLoc, DateTime? shippingTime, DateTime? receiveTime, decimal sumQty, decimal shippingQty, decimal settleQty, decimal returnQty, decimal inputQty, decimal outputQty) { - Vincode = vincode; - RealPartcode = realPartcode; + VinCode = vincode; + RealPartCode = realPartcode; ErpToLoc = erpToLoc; ShippingTime = shippingTime; ReceiveTime = receiveTime; @@ -31,8 +31,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi - public string Vincode { set; get; } - public string RealPartcode { set; get; } + public string VinCode { set; get; } + public string RealPartCode { set; get; } public string ErpToLoc { set; get; } public DateTime? ShippingTime { set; get; } public DateTime? ReceiveTime { set; get; } @@ -51,12 +51,12 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi public VmiBalanceSum(string realPartcode, string erpToLoc, decimal sumQty) { - RealPartcode = realPartcode; + RealPartCode = realPartcode; ErpToLoc = erpToLoc; SumQty = sumQty; } [Display(Name ="零件号")] - public string RealPartcode { set; get; } + public string RealPartCode { set; get; } [Display(Name = "库位")] public string ErpToLoc { set; get; } [Display(Name = "数量")] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs index 89d9c3da..37fabbab 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -1126,7 +1126,7 @@ namespace Win.Sfs.SettleAccount b.ToTable($"{options.TablePrefix}_VmiBalanceSum", options.Schema); b.ConfigureByConvention(); b.Property(x => x.ErpToLoc).HasMaxLength(50); - b.Property(x => x.RealPartcode).HasMaxLength(50); + b.Property(x => x.RealPartCode).HasMaxLength(50); }); } @@ -1138,8 +1138,8 @@ namespace Win.Sfs.SettleAccount b.ConfigureByConvention(); b.Property(x => x.ErpToLoc).HasMaxLength(50); - b.Property(x => x.RealPartcode).HasMaxLength(50); - b.Property(x => x.Vincode).HasMaxLength(50); + b.Property(x => x.RealPartCode).HasMaxLength(50); + b.Property(x => x.VinCode).HasMaxLength(50); }); }