From cf295c84e78f3aa5581e213389073cbdc76eef1f Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Fri, 15 Dec 2017 09:08:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137643=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj             |  2 +-
 .../B3YunKen/Dialogs/ProductionCompletionDialog.xml    | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index f6f527c..ceab29f 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -189,7 +189,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.xml" />
+    <EmbeddedResource Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.xml" />
     <EmbeddedResource Include="Pages\B3YunKen\Reports\ProduceFinishDiffReport.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml
index 6ea213e..57197ec 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml
@@ -37,10 +37,14 @@
         <Field name="Employee_ID"/>
         <QBE paramName="Employee_ID"/>
       </EQ>
-      <Contains>
+      <GreaterThanOrEqual>
         <Field name="Date"/>
-        <QBE paramName="Date"/>
-      </Contains>
+        <QBE paramName="MinDate" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="Date"/>
+        <QBE paramName="MaxDate"/>
+      </LessThanOrEqual>
     </And>
   </Where>
 </Select>

From 74ae8ff9b05c4e8d821552008bf48b5e60c317d9 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Fri, 15 Dec 2017 09:26:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137235=20?=
 =?UTF-8?q?=E8=AE=A2=E8=B4=A7=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaleOrderToProductNoticePage.xml          | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
index 8d94db6..10b49d6 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.xml
@@ -85,14 +85,22 @@
         <Field name="BillState" />
         <QBE paramName="BillState"/>
       </EQ>
-      <Contains>
+      <GreaterThanOrEqual>
         <Field name="OrderDate"/>
-        <QBE paramName="OrderDate"/>
-      </Contains>
-      <Contains>
+        <QBE paramName="MinOrderDate" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="OrderDate"/>
+        <QBE paramName="MaxOrderDate"/>
+      </LessThanOrEqual>
+      <GreaterThanOrEqual>
+        <Field name="LoadTime"/>
+        <QBE paramName="MinLoadTime" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
         <Field name="LoadTime"/>
-        <QBE paramName="LoadTime"/>
-      </Contains>
+        <QBE paramName="MaxLoadTime"/>
+      </LessThanOrEqual>
     </And>
   </Where>
 </Select>
\ No newline at end of file