From 997a602a5d5d61344d9f10b22ab1c9b4a003fc60 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Thu, 1 Mar 2018 17:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138767?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/ToFreightNetPriceReport2.cs       | 19 ++++++++++++++++++-
 .../Reports/ToFreightNetPriceReport2.xml      | 12 ++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
index e603687..aac7b10 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
@@ -47,7 +47,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports
     DFChoiceBox _goods, _brandItem, _productLine, _goodsBatch;
     DFTextBox _saleout;
     DFNamedValueInput<运费承担方> freightBear;
-    //
+    DFDropDownList billTypeBox;
+
     private readonly DFInfo mDFInfo = DFInfo.Get(typeof(CustomerAccept));
     private readonly DFInfo _detailInfo = DFInfo.Get(typeof(CustomerAccept_Detail));
 
@@ -75,6 +76,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       list.Add(new Tuple<string, string>("OrderDate", "订货时间"));
       list.Add(new Tuple<string, string>("LoadTime", "发货时间"));
       list.Add(new Tuple<string, string>("ArriveTime", "到货时间"));
+      list.Add(new Tuple<string, string>("CheckTime", "审核时间"));
+      list.Add(new Tuple<string, string>("BillType", "业务类型"));
       list.Add(new Tuple<string, string>("Department_Name", "部门"));
       list.Add(new Tuple<string, string>("CustomerSaleZone_Name", "地区"));
       list.Add(new Tuple<string, string>("SaleKind_Name", "销售类型"));
@@ -187,10 +190,19 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
       layout.Add("FreightBear", new SimpleLabel("运费承担方"), freightBear = QueryCreator.DFNameValueInputEnableMultiSelection<运费承担方>(mDFInfo.Fields["ID"]));
       layout["SaleOutID"].NotAutoAddToContainer = true;
       layout["FreightBear"].NotAutoAddToContainer = true;
+      billTypeBox = new DFDropDownList() { Width = Unit.Pixel(160) };
+      billTypeBox.Items.Add("");
+      billTypeBox.Items.Add(new ListItem("销售出库", DmoTypeIDAttribute.GetID(typeof(SaleOutStore)).ToString()));
+      billTypeBox.Items.Add(new ListItem("退货入库", DmoTypeIDAttribute.GetID(typeof(ReturnInStore)).ToString()));
+      layout.Add("BillType", new SimpleLabel("业务类型"), billTypeBox);
+      layout["BillType"].NotAutoAddToContainer = true;
+      
       var config = layout.CreateDefaultConfig(4);
       config.Expand = false;
       config.Add("LoadTime");
       config.Add("OrderDate");
+      config.Add("CheckTime");
+      config.Add("Code");
       //config.Add("SaleOutID");
       //config.Add("ArriveTime");
       //config.Add("AccountingUnit_ID");
@@ -319,6 +331,8 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
           case "Store_Name":
           case "CustomerDealer_Name":
           case "Customer_Name":
+          case "CheckTime":
+          case "BillType":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text));
             dom.GroupBy.Expressions.Add(DQExpression.Field(main, field));
             break;
@@ -454,6 +468,9 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
       {
         dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(outStore, "FreightBear"), freightBear.GetValues().Select(x=> DQExpression.Value(x)).ToArray()));
       }
+      if (billTypeBox.SelectedIndex > 0){
+        dom.Where.Conditions.Add(DQCondition.EQ("BillType", billTypeBox.SelectedValue));
+      }
       dom.Where.Conditions.Add(DQCondition.EQ(main, "BillState", 单据状态.已审核));
       return dom;
     }
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml
index f8b2c6b..a50a220 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.xml
@@ -11,6 +11,10 @@
         <Field name="ID"/>
         <QBE paramName="ID"/>
       </EQ>
+      <Like>
+        <Field name="Code"/>
+        <QBE paramName="Code"/>
+      </Like>
       <GreaterThanOrEqual>
         <Field name="LoadTime"/>
         <QBE paramName="MinLoadTime" />
@@ -27,6 +31,14 @@
         <Field name="OrderDate"/>
         <QBE paramName="MaxOrderDate"/>
       </LessThanOrEqual>
+      <GreaterThanOrEqual>
+        <Field name="CheckTime"/>
+        <QBE paramName="MinCheckTime" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="CheckTime"/>
+        <QBE paramName="MaxCheckTime"/>
+      </LessThanOrEqual>
       <QBEIn>
         <Field name="AccountingUnit_ID"/>
         <QBE paramName="AccountingUnit_ID"/>