From a44e2ce4b081a41233ab8fc50aea5d5fe6b6a183 Mon Sep 17 00:00:00 2001
From: robin <robin333999@gmail.com>
Date: Mon, 4 Dec 2017 22:37:21 +0800
Subject: [PATCH] ..

---
 .../Bills/OutputForecastList.xml              | 29 +++++++++++++++++++
 .../Tools/SaleOrderUpdateList.cs              |  9 +++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/OutputForecastList.xml b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/OutputForecastList.xml
index cc5e91b..30ad576 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/OutputForecastList.xml
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Bills/OutputForecastList.xml
@@ -11,11 +11,36 @@
       <EQ>
         <Field name="ID"/>
         <QBE paramName="ID"/>
+      </EQ>      
+      <EQ>
+        <Field name="BillState"/>
+        <QBE paramName="BillState"/>
       </EQ>
        <EQ>
         <Field name="AccountingUnit_ID"/>
         <QBE paramName="AccountingUnit_ID"/>
       </EQ>
+      <EQ>
+        <Field name="Department_ID"/>
+        <QBE paramName="Department_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Employee_ID"/>
+        <QBE paramName="Employee_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="IsLocked"/>
+        <QBE paramName="IsLocked"/>
+      </EQ>
+      <Contains>
+        <Field name="CreateUser_Name"/>
+        <QBE paramName="CreateUser_Name"/>
+      </Contains>
+      <Contains>
+        <Field name="CheckUser_Name"/>
+        <QBE paramName="CheckUser_Name"/>
+      </Contains>
+
       <GreaterThanOrEqual>
         <Field name="Date"/>
         <QBE paramName="MinDate" />
@@ -24,6 +49,10 @@
         <Field name="Date"/>
         <QBE paramName="MaxDate"/>
       </LessThanOrEqual>
+      <Contains>
+        <Field name="Remark"/>
+        <QBE paramName="Remark"/>
+      </Contains>
     </And>
   </Where>
 </Select>
diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
index ba287c9..4547822 100644
--- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
+++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs
@@ -175,9 +175,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
         }
         htmlRow.Cells[numberIndext].InnerHtml = "";
         htmlRow.Cells[numberIndext].Controls.Add(bt);
-        var idField = row["GoodsProperty_ID"];
+        var idField = (long?)row["GoodsProperty_ID"];
         var number = ((decimal?)row["可用数量"]) ?? 0;
-        var url = AspUtil.UpdateUrlParam("SaleOrderUpdateEdit.aspx", "GoodsProperty_ID", ((long)idField).ToString());
+        var url = AspUtil.UpdateUrlParam("SaleOrderUpdateEdit.aspx", "GoodsProperty_ID", ( idField??0).ToString());
         url = AspUtil.UpdateUrlParam(url, "number", number.ToString());
         url = AspUtil.UpdateUrlParam(url, "cacheid", "'+__DFContainer.getValue('$HiddenField01')+'");
         bt.Url = url;
@@ -188,9 +188,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       };
 
       tPanel.Controls.Add(_grid);
-      var section = mPageLayoutManager.AddSection("Columns", "订单明细");
-      section.ApplyLayout(_grid, mPageLayoutManager, _dFInfo);
-
+       
     }
 
     private void DataBindGrid() {
@@ -371,6 +369,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
       query.GroupBy.Expressions.Add(DQExpression.Field("GoodsProperty_ID"));
       query.Where.Conditions.Add(DQCondition.EQ(bill, "ID", id));
+      query.Where.Conditions.Add(DQCondition.GreaterThan(detail, "GoodsProperty_ID", 0));
       return query;
     }