撤销掉结算单应付金额里关于人工费运费的计算。收购综合报表盈亏 减去人工费运费。

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs

@@ -94,34 +94,34 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
         table.SumRow["死亡头数"] = n;
       }
 
-      if (_checkbox.Items.FindByText("人工费").Selected)
-      {
-        Money<金额> n = 0m;
-        foreach (DFDataRow row in table.Rows)
-        {
-          n += Convert.ToDecimal(row["人工费"] ?? 0);
-        }
-        table.SumRow["人工费"] = n;
-      }
-
-      if (_checkbox.Items.FindByText("运费").Selected)
-      {
-        Money<金额> n = 0;
-        foreach (DFDataRow row in table.Rows)
-        {
-          n += Convert.ToDecimal(row["运费"] ?? 0);
-        }
-        table.SumRow["运费"] = n;
-      } 
-      if (_checkbox.Items.FindByText("里程").Selected)
-      {
-        decimal n = 0;
-        foreach (DFDataRow row in table.Rows)
-        {
-          n += Convert.ToDecimal(row["里程"] ?? 0);
-        }
-        table.SumRow["里程"] = n;
-      }
+      //if (_checkbox.Items.FindByText("人工费").Selected)
+      //{
+      //  Money<金额> n = 0m;
+      //  foreach (DFDataRow row in table.Rows)
+      //  {
+      //    n += Convert.ToDecimal(row["人工费"] ?? 0);
+      //  }
+      //  table.SumRow["人工费"] = n;
+      //}
+
+      //if (_checkbox.Items.FindByText("运费").Selected)
+      //{
+      //  Money<金额> n = 0;
+      //  foreach (DFDataRow row in table.Rows)
+      //  {
+      //    n += Convert.ToDecimal(row["运费"] ?? 0);
+      //  }
+      //  table.SumRow["运费"] = n;
+      //}
+      //if (_checkbox.Items.FindByText("里程").Selected)
+      //{
+      //  decimal n = 0;
+      //  foreach (DFDataRow row in table.Rows)
+      //  {
+      //    n += Convert.ToDecimal(row["里程"] ?? 0);
+      //  }
+      //  table.SumRow["里程"] = n;
+      //}
 
       //      Set占比(table,);
     }
@@ -357,7 +357,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       query.From.AddJoin(JoinType.Left, new DQDmoSource(unionAlias), DQCondition.EQ(bill, "ID", unionAlias, "StatPay_ID"));
       var costRecord = new JoinAlias(typeof(CostRecordTemp));
       CostRecordTemp.Register(query);
-      query.From.AddJoin(JoinType.Left, new DQDmoSource(costRecord), DQCondition.EQ(bill, "Weigh_ID", costRecord, "WeightBill_ID"));
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(costRecord), DQCondition.And(DQCondition.EQ(unionAlias, "UnionType", 1), DQCondition.EQ(bill, "Weigh_ID", costRecord, "WeightBill_ID")));
 
 
       query.GroupBy.Expressions.Add(DQExpression.Field(bill, "Date"));
@@ -366,7 +366,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       var 收购重量 = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "RealWeight")));
       var 损耗 = DQExpression.Subtract(榜前重量, 收购重量);
       var 皮肉重量 = DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 2), DQExpression.Field(unionAlias, "TotalWeight")));
-      var 盈亏 = 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"))));
+      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 sumColumn = new List<string>();
 
@@ -396,11 +396,10 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
               query.GroupBy.Expressions.Add(DQExpression.Field(field.Value));
               break;
             case "里程":
-            case"运费":
-            case"人工费":
-              query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(costRecord, field.Value), field.Text));
-              query.GroupBy.Expressions.Add(DQExpression.Field(weight, "ID"));
-              query.GroupBy.Expressions.Add(DQExpression.Field(costRecord, field.Value));
+            case "运费":
+            case "人工费":
+              query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(costRecord, field.Value)), field.Text));
+              sumColumn.Add(field.Text);
               break;
             case "均重":
               query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "RealWeight"))).ESafeDivide(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ(unionAlias, "UnionType", 1), DQExpression.Field(unionAlias, "RealNumber")))).ECastType<Money<金额>>(), "均重"));

B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs

@@ -109,24 +109,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
         dmo.ActualPrice = decimal.Round(dmo.ActualMoney.EToDecimal() ?? 0, 2) / we;
         if (dmo.ActualPrice.HasValue)
           dmo.ActualPrice = decimal.Round(dmo.ActualPrice.Value.Value, 2);
-        if (dmo.Weigh_ID.HasValue)
-          dmo.Money = dmo.Money - GetCostRecordMoney(dmo.Weigh_ID.Value, context.Session);
       }
     }
-
-    decimal GetCostRecordMoney(long weightID, IDmoSession session)
-    {
-      var main = new JoinAlias("_Main",typeof(CostRecord));
-      var detail = new JoinAlias(typeof(CostRecord_Detail));
-      var query = new DQueryDom(main);
-      query.From.AddJoin(JoinType.Left, new DQDmoSource(detail), DQCondition.EQ(main, "ID", detail, "CostRecord_ID"));
-      query.Columns.Add(DQSelectColumn.Sum(detail, "JingJiFee"));
-      query.Columns.Add(DQSelectColumn.Sum(detail, "TransferFee"));
-      query.Where.Conditions.Add(DQCondition.And(DQCondition.GreaterThanOrEqual("BillState", 单据状态.已审核), DQCondition.EQ(detail, "WeightBill_ID", weightID)));
-      var result = query.EExecuteScalar<Money<金额>?, Money<金额>?>(session);
-      if (result == null)
-        return 0;
-      return (result.Item1 ?? 0) + (result.Item2 ?? 0);
-    }
   }
 }