From 8359a5198dd87f977b6de0570a308ce4f2a08d23 Mon Sep 17 00:00:00 2001 From: luanhui <1029149336@@qq.com> Date: Tue, 30 Jan 2018 13:16:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138539?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs | 2 ++ .../Bills/SubKillWeightBill_/SubKillWeightBillList.cs | 3 +++ .../BL/Bills/SubKillWeightBill/SubKillWeightBillBL.cs | 2 ++ .../BO/Bills/SubKillWeightBill/SubKillWeightBill.cs | 9 +++++++++ 4 files changed, 16 insertions(+) diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs index 205cf25..d34b944 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillEdit.cs @@ -35,6 +35,8 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillWeightBill_ config.Add("Supplier_Address"); config.Add("Number"); config.Add("Weight"); + config.Add("MaoWeight"); + config.Add("PiWeight"); config.Add("PriceBill_ID"); config.Add("Remark"); layoutManager.Config = config; diff --git a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillList.cs b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillList.cs index 30bcf22..5fc9efd 100644 --- a/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillList.cs +++ b/B3SubstituteKill.Web/Pages/B3SubstituteKill/Bills/SubKillWeightBill_/SubKillWeightBillList.cs @@ -33,6 +33,9 @@ namespace BWP.Web.Pages.B3SubstituteKill.Bills.SubKillWeightBill_ AddDFBrowseGridColumn(grid, "Employee_Name"); AddDFBrowseGridColumn(grid, "Date"); AddDFBrowseGridColumn(grid, "Supplier_Name"); + AddDFBrowseGridColumn(grid, "MaoWeight"); + AddDFBrowseGridColumn(grid, "PiWeight"); + AddDFBrowseGridColumn(grid, "Weight"); AddDFBrowseGridColumn(grid, "Remark"); } } diff --git a/B3SubstituteKill/BL/Bills/SubKillWeightBill/SubKillWeightBillBL.cs b/B3SubstituteKill/BL/Bills/SubKillWeightBill/SubKillWeightBillBL.cs index df6bc3c..5e64cd9 100644 --- a/B3SubstituteKill/BL/Bills/SubKillWeightBill/SubKillWeightBillBL.cs +++ b/B3SubstituteKill/BL/Bills/SubKillWeightBill/SubKillWeightBillBL.cs @@ -37,6 +37,8 @@ namespace BWP.B3SubstituteKill.BL dmo.PriceBill_ID = SupplierRpc.GetPriceBillID(dmo.Supplier_ID.Value, dmo.Date.Value); dmo.Number = dmo.Details.Sum(x => x.Number ?? 0); dmo.Weight = dmo.Details.Sum(x => x.Weight.EToDecimal() ?? 0); + dmo.MaoWeight = dmo.Details.Sum(x => x.MaoWeight.EToDecimal() ?? 0); + dmo.PiWeight = dmo.Details.Sum(x => x.PiWeight.EToDecimal() ?? 0); base.beforeSave(dmo); } diff --git a/B3SubstituteKill/BO/Bills/SubKillWeightBill/SubKillWeightBill.cs b/B3SubstituteKill/BO/Bills/SubKillWeightBill/SubKillWeightBill.cs index aee5769..f4df22b 100644 --- a/B3SubstituteKill/BO/Bills/SubKillWeightBill/SubKillWeightBill.cs +++ b/B3SubstituteKill/BO/Bills/SubKillWeightBill/SubKillWeightBill.cs @@ -68,6 +68,15 @@ namespace BWP.B3SubstituteKill.BO [DFExtProperty("WebControlType", DFEditControl.StaticText)] public Money Weight { get; set; } + [LogicName("代宰毛重")] + [DFExtProperty("WebControlType", DFEditControl.StaticText)] + public Money MaoWeight { get; set; } + + [LogicName("代宰皮重")] + [DFExtProperty("WebControlType", DFEditControl.StaticText)] + public Money PiWeight { get; set; } + + [LogicName("价格单号")] [DFExtProperty("WebControlType", DFEditControl.StaticText)] public long? PriceBill_ID { get; set; }