diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs index 1617a44..b7af8cc 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/StatPay_/StatPayEdit.cs @@ -23,7 +23,10 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.StatPay_ protected override void BuildBasePropertiesEditor(TitlePanel titlePanel, CustomPageLayout.PageLayoutSection pageLayoutSection) { var layoutManager = new LayoutManager("", mDFInfo, mDFContainer); - + if (MinDmo.SourceBillID.HasValue) + layoutManager.Add("SourceBillID", new DFEntityLink(DmoTypeIDAttribute.ResolveID(MinDmo.SourceBillType.Value))); + else + layoutManager.Add("SourceBillID", new DFValueLabel()); var config = new AutoLayoutConfig(); config.Add("AccountingUnit_ID"); config.Add("Department_ID"); @@ -37,6 +40,8 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.StatPay_ config.Add("Weight"); config.Add("PriceBill_ID"); config.Add("ReceiveMoney"); + config.Add("SourceBillType"); + config.Add("SourceBillID"); config.Add("Remark"); layoutManager.Config = config; pageLayoutSection.ApplyLayout(layoutManager, config, mPageLayoutManager, mDFInfo); diff --git a/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs b/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs index ad8a88c..adb1f0f 100644 --- a/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs +++ b/B3SubstituteKill/BL/Bills/StatPay/StatPayBL.cs @@ -29,5 +29,16 @@ namespace BWP.B3SubstituteKill.BL dmo.ReceiveMoney = dmo.CostDetails.CostMoney - dmo.CallbackPayDetails.CallbackPayMoney; base.beforeSave(dmo); } + + protected override List MinDmoProperties + { + get + { + var b = base.MinDmoProperties; + b.Add("SourceBillID"); + b.Add("SourceBillType"); + return b; + } + } } } diff --git a/B3SubstituteKill/BO/Bills/StatPay/StatPay.cs b/B3SubstituteKill/BO/Bills/StatPay/StatPay.cs index 37b62dd..d81e4e4 100644 --- a/B3SubstituteKill/BO/Bills/StatPay/StatPay.cs +++ b/B3SubstituteKill/BO/Bills/StatPay/StatPay.cs @@ -89,8 +89,11 @@ namespace BWP.B3SubstituteKill.BO //[Join("Weigh_ID", "ID")] //public DateTime? WeighTime { get; set; } + [LogicName("来源单号")] public long? SourceBillID { get; set; } + [LogicName("来源单据")] + [DmoTypeIDFormat] public short? SourceBillType { get; set; } private StatPay_CostDetailCollection _mCostDetails = new StatPay_CostDetailCollection();