From 6cfcbc659252e4536a8da78148e155216ef664ff Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Fri, 5 Jan 2018 15:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138082?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs   | 5 +++--
 .../Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.xml  | 4 ++++
 .../B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs    | 3 +++
 .../B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml   | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs
index 046b5ea..bd5a84b 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs
@@ -94,7 +94,7 @@ namespace BWP.Web.Pages.B3YunKen {
       titlePanel.Controls.Add(vPanel);
       var layoutManager = new LayoutManager("main", _dFInfo, _dFContainer);
       var config = new AutoLayoutConfig { Cols = 6 };
-      config.Add("ID");
+      config.Add("Code");
       config.Add("Customer_ID");
       config.Add("AccountCustomer_Name");
       config.Add("CustomerDealer_Name");
@@ -223,6 +223,7 @@ namespace BWP.Web.Pages.B3YunKen {
         MultiSelectionEnabled = true
       });
       _grid.Columns.EAdd(new DFBrowseGridColumn("ID"));
+      _grid.Columns.Add(new DFBrowseGridColumn("Code"));
       _grid.Columns.EAdd(new DFBrowseGridColumn("Order_ID"));
       _grid.Columns.EAdd(new DFBrowseGridColumn("OrderDate"));
       _grid.Columns.EAdd(new DFBrowseGridColumn("LoadTime"));
@@ -273,7 +274,7 @@ namespace BWP.Web.Pages.B3YunKen {
     private void CreateQueryPanel(ClientTab titlePanel) {
       var layer = new LayoutManager("", _dFInfo, _queryContainer);
       layer.Add("ID", QueryCreator.DFTextBox(_dFInfo.Fields["ID"]));
-
+      layer.Add("Code", QueryCreator.DFTextBox(_dFInfo.Fields["Code"]));
       layer.Add("OrderDate", QueryCreator.TimeRange(_dFInfo.Fields["OrderDate"], _queryContainer, "MinOrderDate", "MaxOrderDate"));
       layer.Add("LoadTime", QueryCreator.TimeRange(_dFInfo.Fields["LoadTime"], _queryContainer, "MinLoadTime", "MaxLoadTime"));
       DFChoiceBox accInput;
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.xml
index 8caee4c..02d9067 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.xml
@@ -12,6 +12,10 @@
         <Field name="ID"/>
         <QBE paramName="ID"/>
       </EQ>
+      <EQ>
+        <Field name="Code"/>
+        <QBE paramName="Code"/>
+      </EQ>
       <EQ>
         <Field name="Customer_ID"/>
         <QBE paramName="Customer_ID"/>
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs
index 31ffec8..b282029 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs
@@ -220,6 +220,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
     private void BuildGrid(DFBrowseGrid grid)
     {
       grid.Columns.Add(new DFBrowseGridColumn("ID"));
+      grid.Columns.Add(new DFBrowseGridColumn("Code"));
       grid.Columns.Add(new DFBrowseGridColumn("BillState"));
       grid.Columns.Add(new DFBrowseGridColumn("BrandItem_Name"));
       grid.Columns.Add(new DFBrowseGridColumn("Customer_Name"));
@@ -251,6 +252,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
     public void CreateQueryPanel(TitlePanel panel)
     {
       var manager = new LayoutManager("", mDFInfo, mQueryContainer);
+      manager.Add("Code", QueryCreator.DFTextBox(mDFInfo.Fields["Code"]));
       manager.Add("Customer_ID", QueryCreator.DFChoiceBox(mDFInfo.Fields["Customer_ID"], B3SaleDataSources.客户));
       manager.Add("Department_ID", QueryCreator.DFChoiceBox(mDFInfo.Fields["Department_ID"], "授权部门"));
       manager.Add("OrderDate", QueryCreator.TimeRange(mDFInfo.Fields["OrderDate"], mQueryContainer, "MinOrderDate", "MaxOrderDate"));
@@ -290,6 +292,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
       dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.已审核));
 
       dom.Columns.Add(DQSelectColumn.Field("ID", "单号"));
+      dom.Columns.Add(DQSelectColumn.Field("Code"));
       dom.Columns.Add(DQSelectColumn.Field("Customer_ID"));
       dom.Columns.Add(DQSelectColumn.Field("Department_ID"));
       dom.Columns.Add(DQSelectColumn.Field("BillState"));
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
index 10b49d6..74772b3 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
@@ -45,6 +45,10 @@
         <Field name="ID" />
         <QBE paramName="ID"/>
       </EQ>
+      <EQ>
+        <Field name="Code" />
+        <QBE paramName="Code"/>
+      </EQ>
       <EQ>
         <Field name="Customer_ID" />
         <QBE paramName="Customer_ID"/>