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 b3dbe62a..13e12d27 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 @@ -2088,6 +2088,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { [Display(Name = "生产码")] public string VinCode { set; get; } + [Display(Name = "虚拟零件号")] + public string MatchNumber { set; get; } + [Display(Name = "零件类型")] + public string CodeType { set; get; } [Display(Name = "厂内零件号")] public string RealPartCode { set; get; } [Display(Name = "库位")] 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 8c9ce393..c27970cb 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 @@ -14,11 +14,13 @@ 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) + public VmiBalanceSumDetail(string vinCode, string realPartCode, string erpToLoc, string matchNumber, string codeType, 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; + MatchNumber = matchNumber; + CodeType = codeType; ShippingTime = shippingTime; ReceiveTime = receiveTime; SumQty = sumQty; @@ -29,11 +31,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi OutputQty = outputQty; } - - public string VinCode { set; get; } public string RealPartCode { set; get; } public string ErpToLoc { set; get; } + public string MatchNumber {set;get;} + public string CodeType { set; get; } public DateTime? ShippingTime { set; get; } public DateTime? ReceiveTime { set; get; } public decimal SumQty { set; get; } @@ -48,7 +50,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi public VmiBalanceSum() { } - public VmiBalanceSum(string realPartcode, string erpToLoc, decimal sumQty) { RealPartCode = realPartcode; 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 b0bdc94b..59e46f8d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs @@ -1141,6 +1141,8 @@ namespace Win.Sfs.SettleAccount 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.MatchNumber).HasMaxLength(50); + b.Property(x => x.CodeType).HasMaxLength(50); }); }