diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index b298aa0..d15ccb4 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -190,10 +190,8 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.xml" />
-    <EmbeddedResource Include="Pages\B3YunKen\Reports\ProduceFinishDiffReport.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.xml" />
+    <EmbeddedResource Include="Pages\B3YunKen\Reports\ProduceFinishDiffReport.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
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>
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