.

B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/SaleSummaryReport_/SaleSummaryReport.cs

@@ -264,7 +264,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports.SaleSummaryReport_
       return secondFilterTree;
     }
 
-    readonly string[] goodsBrand = new string[] { "条类", "分割品", "副产品", "冻品", "熟食" };
+    readonly string[] goodsBrand = new string[] { "条类", "分割品", "副产品", "冻品" };
 
     protected override DQueryDom GetQueryDom()
     {
@@ -298,8 +298,12 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports.SaleSummaryReport_
         query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.EQ(goods, "Brand", item), DQCondition.EQ("Type", 1)), DQExpression.Field("MainNumber"), DQExpression.NULL)).ECastType<Money<decimal>?>(), item + "|重量"));
       }
 
-      query.Columns.Add(DQSelectColumn.Create(DQExpression.Divide(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("Type", 2), DQExpression.Field("MainNumber"), DQExpression.NULL)), DQExpression.Value(7)).ECastType<Money<decimal>?>(), "上周日均重量"));
-      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.EQ("Type", 1), DQExpression.Field("MainNumber"), DQExpression.NULL)).ECastType<Money<decimal>?>(), "当日重量合计"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Divide(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.EQ("Type", 2), DQCondition.InEQ(goods, "Brand", "熟食")), DQExpression.Field("MainNumber"), DQExpression.NULL)), DQExpression.Value(7)).ECastType<Money<decimal>?>(), "上周日均重量"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.EQ("Type", 1), DQCondition.InEQ(goods, "Brand", "熟食")), DQExpression.Field("MainNumber"), DQExpression.NULL)).ECastType<Money<decimal>?>(), "当日重量合计"));
+
+
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Divide(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.EQ(goods, "Brand", "熟食"), DQCondition.EQ("Type", 2)), DQExpression.Field("MainNumber"), DQExpression.NULL)), DQExpression.Value(7)).ECastType<Money<decimal>?>(), "熟食|上周日均重量"));
+      query.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.LogicCase(DQCondition.And(DQCondition.EQ(goods, "Brand", "熟食"), DQCondition.EQ("Type", 1)), DQExpression.Field("MainNumber"), DQExpression.NULL)).ECastType<Money<decimal>?>(), "熟食|重量"));
 
       var idx = 0;
       foreach (var col in query.Columns)