From 2069e50e9f429edf5dee2138ff76f67451f1eae0 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Mon, 5 Nov 2018 21:09:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bills/Pay_/PayEdit.cs | 17 ++++++++++---- .../Reports/PayAnalyse_/PayAnalyse.cs | 2 +- .../BL/Bill/StatPayBL/StatPayBL.cs | 22 +++++++++---------- B3SheepButcherManage/BO/Bill/Pay/Pay.cs | 8 +++---- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs index 3dfc24f..fb6060b 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/Pay_/PayEdit.cs @@ -37,9 +37,10 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Bills.Pay_ config.Add("Date"); config.Add("Supplier_ID"); config.Add("Supplier_Bank"); + config.Add("Supplier_BankAccount"); config.Add("Supplier_Card_ID"); config.Add("Account_ID"); - config.Add("Account_BankAccountNumber"); + //config.Add("Account_BankAccountNumber"); config.Add("PaySupplier_ID"); config.Add("PaySupplier_AccountNo"); config.Add("Remark"); @@ -74,13 +75,13 @@ __DFContainer.setValue('PaySupplier_AccountNo',''); } if (layoutManager.Contains("Supplier_ID")) { - var paySupplierInput = layoutManager["PaySupplier_ID"].InputControl as DFChoiceBox; + var paySupplierInput = layoutManager["Supplier_ID"].InputControl as DFChoiceBox; if (paySupplierInput != null) { var script = @" var txtValue =parseInt(__DFContainer.getValue('Supplier_ID')); -simpleRestCall('/MainSystem/B3CowButcherManage/Rpcs/SupplierRpc/GetBySupplierID',[txtValue,['Bank','Card_ID']], +simpleRestCall('/MainSystem/B3CowButcherManage/Rpcs/SupplierRpc/GetBySupplierID',[txtValue,['Bank','Card_ID','BankAccount']], function(result){ if(typeof(result.Bank)!='undefined') { @@ -97,7 +98,15 @@ if(typeof(result.Card_ID)!='undefined') else { __DFContainer.setValue('Supplier_Card_ID',''); -} +} +if(typeof(result.BankAccount)!='undefined') +{ + __DFContainer.setValue('Supplier_BankAccount',result.BankAccount); +} +else +{ +__DFContainer.setValue('Supplier_BankAccount',''); +} },{ });"; paySupplierInput.OnClientSelected = script; } diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs index 114eb19..fe513d9 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs @@ -66,7 +66,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.PayAnalyse_ mDisplayHelper.AddOptionItem("付款日期", "bill", "Date", false); mDisplayHelper.AddOptionItem("供应商", "bill", "Supplier_Name", false); mDisplayHelper.AddOptionItem("开户银行", "bill", "Supplier_Bank", false); - mDisplayHelper.AddOptionItem("银行账号", "bill", "Account_BankAccountNumber", false); + mDisplayHelper.AddOptionItem("银行账号", "bill", "Supplier_BankAccount", false); mDisplayHelper.AddOptionItem("付款金额", "bill", "Money", false, true); mDisplayHelper.AddOptionItem("手续费", "detail", "ServiceFee", false, true); mDisplayHelper.AddOptionItem("扣费额金额", "detail", "SubServiceMoney", false, true); diff --git a/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs b/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs index e9cb850..9cfeb61 100644 --- a/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs +++ b/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs @@ -118,7 +118,7 @@ namespace BWP.B3SheepButcherManage.BL foreach (var detail in dmo.HurryButcherDetails) { - detail.Money = detail.Price * detail.Weight; + detail.Money = detail.Price * detail.PriceWeight; } foreach (var detail in dmo.Details) @@ -352,18 +352,18 @@ namespace BWP.B3SheepButcherManage.BL dmo.RealNumber = 屠宰记录头数 + 急宰记录头数;//收购头数计算 - //var 榜前急宰重量 = Math.Round(dmo.HurryButcherDetails.Sum(x => (decimal?)x.Weight ?? 0), 2); - //if (总磅后头数 + 已结算过磅单头数 == (dmo.WeighBill_BuyNum ?? 0)) - //{ + var 榜前急宰重量 = Math.Round(dmo.HurryButcherDetails.Sum(x => (decimal?)x.Weight ?? 0), 2); + if (总磅后头数 + 已结算过磅单头数 == (dmo.WeighBill_BuyNum ?? 0)) + { //如果刚好等于过磅单的头数，则重量直接减掉，防止小数点 dmo.RealWeight = Math.Round((decimal)(dmo.WeighBill_BuyWeigh1 ?? 0), 2);//收购重量计算 - //} - //else - //{ - //var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum; - //var 本次榜后结算重量 = Math.Round((总磅后头数 * 过磅单每头猪的重量 ?? 0), 2); - // dmo.RealWeight = 榜前急宰重量 + 本次榜后结算重量; - //} + } + else + { + var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum; + var 本次榜后结算重量 = Math.Round((总磅后头数 * 过磅单每头猪的重量 ?? 0), 2); + dmo.RealWeight = 榜前急宰重量 + 本次榜后结算重量; + } //更新到数据库 UpdateHeadNumAndWeight(dmo.ID, dmo.RealNumber, dmo.RealWeight); } diff --git a/B3SheepButcherManage/BO/Bill/Pay/Pay.cs b/B3SheepButcherManage/BO/Bill/Pay/Pay.cs index 7475b24..4a9f657 100644 --- a/B3SheepButcherManage/BO/Bill/Pay/Pay.cs +++ b/B3SheepButcherManage/BO/Bill/Pay/Pay.cs @@ -87,10 +87,10 @@ namespace BWP.B3SheepButcherManage.BO [Join("Supplier_ID", "ID")] public string Supplier_Bank { get; set; } - //[LogicName("银行账号")] - //[ReferenceTo(typeof(Supplier), "BankAccount")] - //[Join("Supplier_ID", "ID")] - //public string Supplier_BankAccount { get; set; } + [LogicName("银行账号")] + [ReferenceTo(typeof(Supplier), "BankAccount")] + [Join("Supplier_ID", "ID")] + public string Supplier_BankAccount { get; set; } [LogicName("身份证号")] [ReferenceTo(typeof(Supplier), "Card_ID")]