From 85a29ad37145176d5bba607ac9ccbf270456fddc Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Wed, 13 Dec 2017 15:38:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137235=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaleOrderToProductNoticePage.cs           |  6 ++---
 .../SaleOrderToProductNoticePage.xml          | 24 +++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs
index cf10649..31ffec8 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs
@@ -161,12 +161,11 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
       var productionUnitId = long.Parse(ccbxProductionUnit.Value);
       var inputDate = cDateInput.Value.Value;
       var remark = ccbxRemark.Text;
-
-      var minEmployee = DomainUserUtil.GetCurrentBindingMinEmployee();
-      var employeeID = minEmployee == null ? (long?)null : minEmployee.ID;
+      var employeeID = long.Parse(ccbxEmployeeUnit.Value);
 
       var dmo = new ProductNotice();
       //dmo.AccountingUnit_ID = accounitingId;
+      bl.InitNewDmo(dmo);
       dmo.Department_ID = departmentId;
       dmo.ProductionUnit_ID = productionUnitId;
       dmo.Date = inputDate;
@@ -198,7 +197,6 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
 
       }
 
-      bl.InitNewDmo(dmo);
       bl.Insert(dmo);
       return dmo.ID;
     }
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
index 56c2109..8d94db6 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
@@ -41,6 +41,10 @@
   </From>
   <Where>
     <And>
+      <EQ>
+        <Field name="ID" />
+        <QBE paramName="ID"/>
+      </EQ>
       <EQ>
         <Field name="Customer_ID" />
         <QBE paramName="Customer_ID"/>
@@ -66,13 +70,29 @@
         <QBE paramName="GoodsPropertyCatalog_ID"/>
       </EQ>
       <EQ>
-        <Field name="BrandItem_ID" />
+        <Field name="BrandItem_ID" alias="detail"/>
         <QBE paramName="BrandItem_ID"/>
       </EQ>
       <EQ>
-        <Field name="ProductLine_ID" />
+        <Field name="ProductLine_ID" alias="goods"/>
         <QBE paramName="ProductLine_ID"/>
       </EQ>
+      <EQ>
+        <Field name="AccountingUnit_ID" />
+        <QBE paramName="AccountingUnit_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="BillState" />
+        <QBE paramName="BillState"/>
+      </EQ>
+      <Contains>
+        <Field name="OrderDate"/>
+        <QBE paramName="OrderDate"/>
+      </Contains>
+      <Contains>
+        <Field name="LoadTime"/>
+        <QBE paramName="LoadTime"/>
+      </Contains>
     </And>
   </Where>
 </Select>
\ No newline at end of file