From 0928f49d90d67227995515b78ed33bff84f4e5d9 Mon Sep 17 00:00:00 2001 From: yibo <361071264@qq.com> Date: Tue, 15 May 2018 14:58:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=AD=E4=B8=9A=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs | 2 +- B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs index fdbbc09..938f65d 100644 --- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs +++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs @@ -314,7 +314,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports var 榜前重量 = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "ShackWeight"))); var 收购重量 = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "RealWeight"))); - var 损耗 = DQExpression.Subtract(榜前重量, 收购重量); + var 损耗 = DQExpression.LogicCase(DQCondition.EQ("PurchaseType_Name", "业务"), DQExpression.Subtract(榜前重量, 收购重量), DQExpression.NULL); var 皮肉重量 = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 2), DQExpression.Field(unionAlias, "TotalWeight"))); var 盈亏 = DQExpression.Subtract(DQExpression.Subtract(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "Money"))), DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "ActualMoney")))), DQExpression.Sum(DQExpression.Add(DQExpression.IfNull(DQExpression.Field(costRecord, "TransferFee"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field(costRecord, "JingJiFee"), DQExpression.Value(0))))); var costMoney = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Add(DQExpression.Add(DQExpression.IfNull(DQExpression.Field(costRecord, "TransferFee"), DQExpression.Value(0)), DQExpression.IfNull(DQExpression.Field(costRecord, "JingJiFee"), DQExpression.Value(0))), DQExpression.IfNull(DQExpression.Field(unionAlias, "ActualMoney"), DQExpression.Value(0))))); diff --git a/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs index adf9528..490363c 100644 --- a/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs +++ b/B3QingDaoWanFu/TypeIOCs/WeightBillTypeIoc.cs @@ -20,12 +20,13 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs } } - [TypeIOC(typeof(WeightBillBL), typeof(WeightBillBL.BaseBLIOCs.BeforeSave))] - public class WeightBillBeforeSave : WeightBillBL.BaseBLIOCs.BeforeSave + [TypeIOC(typeof(WeightBillBL), typeof(WeightBillBL.BaseBLIOCs.BeforeInsert))] + public class WeightBillBeforeSave : WeightBillBL.BaseBLIOCs.BeforeInsert { public void Invoke(IDmoContext context, WeighBill dmo) { - dmo.PayTarget = 付款对象.供应商; + if (dmo.PayTarget == null) + dmo.PayTarget = 付款对象.供应商; } } }