diff --git a/BO/BO/Bill/WeightBill/PrintWeightBill.cs b/BO/BO/Bill/WeightBill/PrintWeightBill.cs index 630c572..8aee937 100644 --- a/BO/BO/Bill/WeightBill/PrintWeightBill.cs +++ b/BO/BO/Bill/WeightBill/PrintWeightBill.cs @@ -22,10 +22,33 @@ namespace BO.BO public string HogGrade_Name { get; set; } + public string PurchaseType_Name { get; set; } + + public string Car_Name { get; set; } + public decimal? Weight { get; set; } public int? Number { get; set; } + public decimal? ShackWeight { get; set; } + + public decimal? ShackMoney { get; set; } + + public decimal? JingJianFee { get; set; } + + public decimal? DiscontMoney { get; set; } + + public decimal? PayMoney + { + get + { + var m = (ShackMoney ?? 0) + (JingJianFee ?? 0) - (DiscontMoney ?? 0); + if (m == 0) + return null; + return m; + } + } + public string TotalDiscont { get { return string.Format("{0:#0.######}", Details.Sum(x => x.Money ?? 0)); } } private List _details = new List(); diff --git a/Setup/Release/Setup.msi b/Setup/Release/Setup.msi index b15d026..e4afca1 100644 Binary files a/Setup/Release/Setup.msi and b/Setup/Release/Setup.msi differ