From adc4fc6b1ca6293ab0939d51f50a703b4aaa18b5 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Mon, 5 Nov 2018 09:26:10 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=9C=80=E6=B1=82=E5=8D=95No.141696?= =?UTF-8?q?=20=E7=BE=8A=E5=AE=9A=E4=BB=B7=E5=8D=95=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=AE=A1=E6=89=B9=E3=80=82=202=E3=80=81?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.141700=20=E7=BE=8A=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E5=88=86=E6=9E=90=E8=A1=A8=20=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0{=E5=BC=80=E6=88=B7?= =?UTF-8?q?=E9=93=B6=E8=A1=8C}=E5=92=8C{=E9=93=B6=E8=A1=8C=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7}=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reports/PayAnalyse_/PayAnalyse.cs | 4 +++- .../BL/Bill/FixedPriceBL/FixedPriceBL.cs | 9 +++++++ .../BL/Bill/StatPayBL/StatPayBL.cs | 24 +++++++++---------- .../Plugins/B3SheepButcherManage.Plugin | 1 + 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs index fd39d2e..114eb19 100644 --- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs +++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/PayAnalyse_/PayAnalyse.cs @@ -63,8 +63,10 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.PayAnalyse_ { mDisplayHelper.AddOptionItem("单号", "bill", "ID", false); mDisplayHelper.AddOptionItem("会计单位", "bill", "AccountingUnit_Name", false); - mDisplayHelper.AddOptionItem("供应商", "bill", "Supplier_Name", false); 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", "Money", false, true); mDisplayHelper.AddOptionItem("手续费", "detail", "ServiceFee", false, true); mDisplayHelper.AddOptionItem("扣费额金额", "detail", "SubServiceMoney", false, true); diff --git a/B3SheepButcherManage/BL/Bill/FixedPriceBL/FixedPriceBL.cs b/B3SheepButcherManage/BL/Bill/FixedPriceBL/FixedPriceBL.cs index ab8f6fc..7700e84 100644 --- a/B3SheepButcherManage/BL/Bill/FixedPriceBL/FixedPriceBL.cs +++ b/B3SheepButcherManage/BL/Bill/FixedPriceBL/FixedPriceBL.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using TSingSoft.WebPluginFramework; namespace BWP.B3SheepButcherManage.BL { @@ -20,6 +21,14 @@ namespace BWP.B3SheepButcherManage.BL public class FixedPriceBL : DepartmentWorkFlowBillBL, IFixedPriceBL { + protected override bool HasWorkFlowWeChatApproveFeature + { + get + { + return FeatureUtil.Enabled("B3SheepButcherManage.0006"); + } + } + public void RsetPrice(FixedPrice dmo) { var dom = new DmoQuery(typeof(StatPay)); diff --git a/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs b/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs index 39aee1b..551563e 100644 --- a/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs +++ b/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs @@ -316,18 +316,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 = 榜前急宰重量 + 本次榜后结算重量; - } + 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 = 榜前急宰重量 + 本次榜后结算重量; + //} //更新到数据库 UpdateHeadNumAndWeight(dmo.ID, dmo.RealNumber, dmo.RealWeight); } @@ -435,7 +435,7 @@ namespace BWP.B3SheepButcherManage.BL var wid = InnerBLUtil.GetDmoPropertyByID(Session, typeof(StatPay), "WeightBill_ID", statPayID); if (wid.HasValue) { - var sql = string.Format("update d set d.StatPay_ID = null from B3SheepButcherManage_Butcher_Detail d left outer join B3SheepButcherManage_StatPay m on d.StatPay_ID=m.ID where d.WeightBill_ID={0} and m.ID is null and d.StatPay_ID is not null", wid); + var sql = string.Format("update d set d.StatPay_ID = null from B3SheepButcherManage_Butcher_Detail d left outer join B3SheepButcherManage_StatPay m on d.StatPay_ID=m.ID where d.WeightBill_ID={0} and m.ID ={1} and d.StatPay_ID is not null", wid, statPayID); Session.ExecuteSqlNonQuery(sql); } CancelAllDetails(statPayID); diff --git a/WebFolder/config/Plugins/B3SheepButcherManage.Plugin b/WebFolder/config/Plugins/B3SheepButcherManage.Plugin index a661caa..59e6142 100644 --- a/WebFolder/config/Plugins/B3SheepButcherManage.Plugin +++ b/WebFolder/config/Plugins/B3SheepButcherManage.Plugin @@ -152,6 +152,7 @@ +