From 6f129c31a3ec2641f03071746ac6e215fc51fda8 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Wed, 7 Feb 2018 17:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=BA=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E3=80=81=E5=87=BA=E5=BA=93=E9=87=91=E9=A2=9D=E3=80=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj     |  4 +++-
 .../Reports/ToFreightNetPriceReport2.cs        | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index c282cd4..1530ace 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -240,7 +240,9 @@
     <EmbeddedResource Include="Pages\B3YunKen\Reports\DynamicPriceReport.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\B3YunKen\Reports\ToFreightNetPriceReport2.xml" />
+    <EmbeddedResource Include="Pages\B3YunKen\Reports\ToFreightNetPriceReport2.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
index 0852bec..e52505e 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
@@ -71,6 +71,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       list.Add(new Tuple<string, string>("SaleKind_Name", "销售类型"));
       list.Add(new Tuple<string, string>("Employee_Name", "销售人员"));
       list.Add(new Tuple<string, string>("CreditPolicy_Name", "信用政策"));
+      list.Add(new Tuple<string, string>("OutBillID", "出库单号"));
       list.Add(new Tuple<string, string>("FreightMoney", "运费"));
       list.Add(new Tuple<string, string>("Money", "验收金额"));
       list.Add(new Tuple<string, string>("Store_Name", "仓库"));
@@ -93,6 +94,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       list.Add(new Tuple<string, string>("NetPrice", "去包装净价"));
       list.Add(new Tuple<string, string>("ToFreightNetPrice", "去运费单价"));
       list.Add(new Tuple<string, string>("PolicyPrice", "政策价格"));
+      list.Add(new Tuple<string, string>("OutNum", "出库数量"));
+      list.Add(new Tuple<string, string>("OutMoney", "出库金额"));
       list.Add(new Tuple<string, string>("CustomerDealer_Name", "经销商"));
 
       var section = mPageLayoutManager.AddSection("显示字段", "显示字段");
@@ -219,11 +222,14 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
       var goods = new JoinAlias(typeof(SaleGoods));
       var packageData = new JoinAlias(typeof(PackageData));
       var outStore = new JoinAlias(typeof(SaleOutStore));
+      var outDetail = new JoinAlias(typeof(SaleOutStore_Detail));
       dom.RegisterQueryTable(typeof(PackageData), new string[] { "Goods_ID", "Price", "AccountingUnit_ID" }, GetGoods_Package());
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(detail),
       DQCondition.EQ(main, "ID", detail, "CustomerAccept_ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(outStore), DQCondition.And(DQCondition.EQ(detail, "BillType",DmoTypeIDAttribute.GetID(typeof(SaleOutStore))),
       DQCondition.EQ(outStore, "ID", detail, "BillID")));
+      dom.From.AddJoin(JoinType.Left, new DQDmoSource(outDetail), DQCondition.And(DQCondition.EQ(detail, "BillType", DmoTypeIDAttribute.GetID(typeof(SaleOutStore))),
+      DQCondition.EQ(outDetail, "ID", detail, "SourceBillDetailID")));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(packageData),
         DQCondition.And(DQCondition.EQ(packageData, "Goods_ID", detail, "SaleGoods_ID"), DQCondition.EQ(packageData, "AccountingUnit_ID", main, "AccountingUnit_ID")));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods),
@@ -287,6 +293,18 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(outStore, field), item.Text));
             dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, field));
             break;
+          case "OutBillID":
+            dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(outStore, "ID"), item.Text));
+            dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, "ID"));
+            break;
+          case "OutNum":
+            dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(outDetail, "Number")), item.Text));
+            SumColumnIndexs.Add(dom.Columns.Count - 1);
+            break;
+          case "OutMoney":
+            dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(outDetail, "Money")), item.Text));
+            SumColumnIndexs.Add(dom.Columns.Count - 1);
+            break;
           case "GoodsPropertyCatalog_Name":
           case "Goods_Name":
           case "BrandItem_Name":