Browse Source

更新版本

master
Administrator 1 year ago
parent
commit
2e73f663b7
  1. 10
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs
  2. 5
      code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs
  3. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalanceSumDetail.cs
  4. 6
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

10
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@ -1356,17 +1356,17 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
public class VmiBalanceSumDetailDto public class VmiBalanceSumDetailDto
{ {
[Display(Name = "生产码")] [Display(Name = "生产码")]
public string Vincode { set; get; } public string VinCode { set; get; }
[Display(Name = "零件号")] [Display(Name = "零件号")]
public string RealPartcode { set; get; } public string RealPartCode { set; get; }
[Display(Name = "库位")] [Display(Name = "库位")]
public string ErpToLoc { set; get; } public string ErpToLoc { set; get; }
[Display(Name = "最后发运时间")] [Display(Name = "最后发运时间")]
public DateTime? ShippingTime { set; get; } public DateTime? ShippingTime { set; get; }
[Display(Name = "最后结算时间")] [Display(Name = "最后结算时间")]
public DateTime? ReceiveTime { set; get; } public DateTime? BillTime { set; get; }
[Display(Name = "合计数量")] [Display(Name = "合计数量")]
public decimal SumQty { set; get; } public decimal Qty { set; get; }
[Display(Name = "发运入库数量")] [Display(Name = "发运入库数量")]
public decimal ShippingQty { set; get; } public decimal ShippingQty { set; get; }
[Display(Name = "结算出库数量")] [Display(Name = "结算出库数量")]
@ -1382,7 +1382,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{ {
[Display(Name = "零件号")] [Display(Name = "零件号")]
public string RealPartcode { set; get; } public string RealPartCode { set; get; }
[Display(Name = "零件描述")] [Display(Name = "零件描述")]
public string PartDesc { set; get; } public string PartDesc { set; get; }

5
code/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccountApplicationAutoMapperProfile.cs

@ -953,7 +953,10 @@ namespace Win.Sfs.SettleAccount
/// </summary> /// </summary>
private void CreateMapBalanceSumDetail() private void CreateMapBalanceSumDetail()
{ {
CreateMap<VmiBalanceSumDetail, VmiBalanceSumDetailDto>().ReverseMap(); CreateMap<VmiBalanceSumDetail, VmiBalanceSumDetailDto>()
.ForMember(x => x.BillTime, y => y.MapFrom(d => d.ShippingTime))
.ForMember(x => x.Qty, y => y.MapFrom(d => d.SumQty)).
ReverseMap();
} }
/// <summary> /// <summary>

12
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) 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; VinCode = vincode;
RealPartcode = realPartcode; RealPartCode = realPartcode;
ErpToLoc = erpToLoc; ErpToLoc = erpToLoc;
ShippingTime = shippingTime; ShippingTime = shippingTime;
ReceiveTime = receiveTime; ReceiveTime = receiveTime;
@ -31,8 +31,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi
public string Vincode { set; get; } public string VinCode { set; get; }
public string RealPartcode { set; get; } public string RealPartCode { set; get; }
public string ErpToLoc { set; get; } public string ErpToLoc { set; get; }
public DateTime? ShippingTime { set; get; } public DateTime? ShippingTime { set; get; }
public DateTime? ReceiveTime { 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) public VmiBalanceSum(string realPartcode, string erpToLoc, decimal sumQty)
{ {
RealPartcode = realPartcode; RealPartCode = realPartcode;
ErpToLoc = erpToLoc; ErpToLoc = erpToLoc;
SumQty = sumQty; SumQty = sumQty;
} }
[Display(Name ="零件号")] [Display(Name ="零件号")]
public string RealPartcode { set; get; } public string RealPartCode { set; get; }
[Display(Name = "库位")] [Display(Name = "库位")]
public string ErpToLoc { set; get; } public string ErpToLoc { set; get; }
[Display(Name = "数量")] [Display(Name = "数量")]

6
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.ToTable($"{options.TablePrefix}_VmiBalanceSum", options.Schema);
b.ConfigureByConvention(); b.ConfigureByConvention();
b.Property(x => x.ErpToLoc).HasMaxLength(50); 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.ConfigureByConvention();
b.Property(x => x.ErpToLoc).HasMaxLength(50); b.Property(x => x.ErpToLoc).HasMaxLength(50);
b.Property(x => x.RealPartcode).HasMaxLength(50); b.Property(x => x.RealPartCode).HasMaxLength(50);
b.Property(x => x.Vincode).HasMaxLength(50); b.Property(x => x.VinCode).HasMaxLength(50);
}); });
} }

Loading…
Cancel
Save