diff --git a/Controller/SCP_ASK_CONTROLLER.cs b/Controller/SCP_ASK_CONTROLLER.cs
index e86c066..2fbf00a 100644
--- a/Controller/SCP_ASK_CONTROLLER.cs
+++ b/Controller/SCP_ASK_CONTROLLER.cs
@@ -375,17 +375,25 @@ namespace CK.SCP.Controller
                     {
                         q = q.Where(p => p.PartDesc1.Contains(p_entity.PartDesc1));
                     }
-                    if (p_entity.BeginTime != null)
+                    if (p_entity.BeginTimeStart != null)
                     {
-                        q = q.Where(p => p.BeginTime >= p_entity.BeginTime);
+                        q = q.Where(p => p.BeginTime >= p_entity.BeginTimeStart);
                     }
                     if (p_entity.BeginTimeEnd != null)
                     {
                         q = q.Where(p => p.BeginTime <= p_entity.BeginTimeEnd);
                     }
-                    if (p_entity.EndTime != null)
+                    if (p_entity.EndTimeStart != null)
+                    {
+                        q = q.Where(p => p.EndTime >= p_entity.EndTimeStart);
+                    }
+                    if (p_entity.EndTimeEnd != null)
+                    {
+                        q = q.Where(p => p.EndTime <= p_entity.EndTimeEnd);
+                    }
+                    if (p_entity.VendId != null)
                     {
-                        q = q.Where(p => p.EndTime < p_entity.EndTime);
+                        q = q.Where(p => p.VendId.Contains(p_entity.VendId));
                     }
                     if (p_entity.UserInAddress != null && p_entity.UserInAddress.Count > 0)
                     {
diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
index ccc3ceb..4ed512c 100644
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
@@ -64,6 +64,8 @@
                     </f:FormRow>
                     <f:FormRow ColumnWidths="25% 25% 25% 25%" ID="FormRow_3"  runat="server">
                         <Items>
+                           <f:TextBox runat="server" Label="订单号" ID="TextVendId">
+                            </f:TextBox>
                  <f:Button runat="server" ID="btnQuery" Text="查询" OnClick="btnSearch_Click"></f:Button>
 
 <%--                 <f:DropDownList ID="ddl_DayState" runat="server" Label="发货预警">
diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
index 98a49fd..f239533 100644
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.cs
@@ -74,6 +74,10 @@ namespace SCP.PlanData
             {
                 _entity.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
             }
+            if (TextVendId.Text != null)
+            {
+                _entity.VendId = TextVendId.Text;
+            }
             if (TextBoxAskNo.Text != null)
             {
                 _entity.AskBillNum = TextBoxAskNo.Text;
@@ -175,6 +179,18 @@ namespace SCP.PlanData
             {
                 _ls.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
             }
+            if (dp_EndTimeStart.SelectedDate != null)
+            {
+                _ls.EndTimeStart = (DateTime)dp_EndTimeStart.SelectedDate;
+            }
+            if (dp_EndTimeEnd.SelectedDate != null)
+            {
+                _ls.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
+            }
+            if (TextVendId.Text != null)
+            {
+                _ls.VendId = TextVendId.Text;
+            }
             if (TextBoxAskNo.Text != null)
             {
                 _ls.AskBillNum = TextBoxAskNo.Text;
diff --git a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
index 3d38a84..3135594 100644
--- a/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
+++ b/SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx.designer.cs
@@ -230,6 +230,15 @@ namespace SCP.PlanData
         /// </remarks>
         protected global::FineUI.FormRow FormRow_3;
 
+        /// <summary>
+        /// TextVendId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextVendId;
+
         /// <summary>
         /// btnQuery 控件。
         /// </summary>
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
index ea5b405..121993f 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL.aspx.cs
@@ -216,7 +216,7 @@ namespace SCP.WarehouseData
                     {
                         if (_rec != null)
                         {
-                            int _count=SCPDB.TB_INVOICE_DETAIL.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.PoBillNum == _rec.PoBillNum).Count();
+                            int _count=SCPDB.TB_INVOICE_DETAIL.Where(p => p.ErpRecvBillNum == _rec.ErpRecvBillNum && p.PoBillNum == _rec.PoBillNum&&p.State!=(int)InvoiceState.Reject).Count();
                             if (_count > 0)
                             {
                                 Alert.Show("不能取消已经开票！");
diff --git a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx
index 322e5aa..7d1ef1f 100644
--- a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx
+++ b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx
@@ -38,7 +38,15 @@
                             <f:DatePicker runat="server" Label="至" ID="TextBillTime2"></f:DatePicker>                                   
                         </Items>
                     </f:FormRow>   
-                     <f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_2"  runat="server">
+             <f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow2"  runat="server">
+                        <Items>
+                            <f:TextBox runat="server" Label="订单号" ID="TextVendId">
+                            </f:TextBox>
+                                      <f:DatePicker runat="server" Label="计划到货日期" ID="dp_EndTimeStart"></f:DatePicker>
+                            <f:DatePicker runat="server" Label="至" ID="dp_EndTimeEnd"></f:DatePicker>             
+                        </Items>
+                    </f:FormRow>                                         
+                     <f:FormRow ColumnWidths="33% 33% 33%" ID="FormRow_3"  runat="server">
                         <Items>
                             <f:TextBox runat="server" Label="要货单据号" ID="TextBoxAskNo">
                             </f:TextBox>
@@ -48,7 +56,7 @@
                             </f:TextBox>                    
                         </Items>
                     </f:FormRow>   
-                    <f:FormRow ColumnWidths="25% 25% " ID="FormRow_3"  runat="server">
+                    <f:FormRow ColumnWidths="25% 25% " ID="FormRow_4"  runat="server">
                         <Items>
                  <f:Button runat="server" ID="btnQuery" Text="查询" OnClick="btnSearch_Click"></f:Button>
 
diff --git a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs
index f382a1f..fc70ccf 100644
--- a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs
+++ b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.cs
@@ -44,12 +44,24 @@ namespace SCP.Views.沈阳金杯.PlanData
             _entity.PoBillNum = TextBillNo.Text;
             if (TextBillTime1.SelectedDate != null)
             {
-                _entity.BeginTime = (DateTime)TextBillTime1.SelectedDate;
+                _entity.BeginTimeStart = (DateTime)TextBillTime1.SelectedDate;
             }
             if (TextBillTime2.SelectedDate != null)
             {
                 _entity.BeginTimeEnd = (DateTime)TextBillTime2.SelectedDate;
             }
+            if (dp_EndTimeStart.SelectedDate != null)
+            {
+                _entity.EndTimeStart = (DateTime)dp_EndTimeStart.SelectedDate;
+            }
+            if (dp_EndTimeEnd.SelectedDate != null)
+            {
+                _entity.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
+            }
+            if (TextVendId.Text != null)
+            {
+                _entity.VendId = TextVendId.Text;
+            }
             if (TextBoxAskNo.Text != null)
             {
                 _entity.AskBillNum = TextBoxAskNo.Text;
@@ -96,6 +108,18 @@ namespace SCP.Views.沈阳金杯.PlanData
             {
                 _ls.BeginTimeEnd = (DateTime)TextBillTime2.SelectedDate;
             }
+            if (dp_EndTimeStart.SelectedDate != null)
+            {
+                _ls.EndTimeStart = (DateTime)dp_EndTimeStart.SelectedDate;
+            }
+            if (dp_EndTimeEnd.SelectedDate != null)
+            {
+                _ls.EndTimeEnd = (DateTime)dp_EndTimeEnd.SelectedDate;
+            }
+            if (TextVendId.Text != null)
+            {
+                _ls.VendId = TextVendId.Text;
+            }
             if (TextBoxAskNo.Text != null)
             {
                 _ls.AskBillNum = TextBoxAskNo.Text;
diff --git a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs
index b354f25..ce71b19 100644
--- a/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs
+++ b/SCP/Views/沈阳金杯/Report/SCP_INCOMPLETE_ASK.aspx.designer.cs
@@ -114,13 +114,49 @@ namespace SCP.Views.沈阳金杯.PlanData
         protected global::FineUI.DatePicker TextBillTime2;
 
         /// <summary>
-        /// FormRow_2 控件。
+        /// FormRow2 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.FormRow FormRow_2;
+        protected global::FineUI.FormRow FormRow2;
+
+        /// <summary>
+        /// TextVendId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.TextBox TextVendId;
+
+        /// <summary>
+        /// dp_EndTimeStart 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker dp_EndTimeStart;
+
+        /// <summary>
+        /// dp_EndTimeEnd 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.DatePicker dp_EndTimeEnd;
+
+        /// <summary>
+        /// FormRow_3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUI.FormRow FormRow_3;
 
         /// <summary>
         /// TextBoxAskNo 控件。
@@ -150,13 +186,13 @@ namespace SCP.Views.沈阳金杯.PlanData
         protected global::FineUI.TextBox TextPartName;
 
         /// <summary>
-        /// FormRow_3 控件。
+        /// FormRow_4 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUI.FormRow FormRow_3;
+        protected global::FineUI.FormRow FormRow_4;
 
         /// <summary>
         /// btnQuery 控件。