diff --git a/SCP/Admin/UNIAPI.aspx b/SCP/Admin/UNIAPI.aspx
index ba98cb7..c0e292a 100644
--- a/SCP/Admin/UNIAPI.aspx
+++ b/SCP/Admin/UNIAPI.aspx
@@ -18,26 +18,29 @@
             <Items>
                 <f:Form runat="server">
                     <Toolbars>
-                        <f:Toolbar ID="Toolbar2" runat="server">
+                        <f:Toolbar ID="Toolbar1" runat="server">
                             <Items>
-                                <f:DropDownList runat="server" ID="DDL_State" Label="查询接口">
+                                <f:DropDownList runat="server" ID="DDL_State" Label="查询接口" LabelWidth="60px" >
                                             <f:ListItem Text="订单接口" Value="xxqad_pod_det"/>
                                             <f:ListItem Text="QAD收货单接口" Value="xxqad_prh_det" />
                                             <f:ListItem Text="WMS收货单接口" Value="xxwms_rc_det" />
                                             <f:ListItem Text="发货单接口" Value="xxscm_tx_mstr" />
                                             <f:ListItem Text="发票接口" Value="xxscm_inv_det" />                                           
                                         </f:DropDownList>
-                                  <f:TextArea runat="server" Label="单据号" ID="TXT_billnum"  Width="600" ></f:TextArea>
-                                   <f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找">
+                                <f:Button ID="BtnSearch" runat="server" OnClick="BtnSearch_Click" Text="快速查找" Icon="Zoom">
                                         </f:Button>
                             </Items>
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar2" runat="server">
+                            <Items>
+                                <f:TextArea runat="server" Label="单据号" ID="TXT_billnum" Width="600" LabelWidth="60px"  EmptyText="填写单据号（可多单号查询用 , 号隔开）" ></f:TextArea>
+                            </Items>
+                        </f:Toolbar>
                     </Toolbars>
                 </f:Form>
         
 
-               <f:Grid ID = "Grid"  EnableCollapse = "true"  ShowBorder = "true" ShowHeader = "true"  runat ="server"  
-                >
+                <f:Grid ID="Grid" EnableCollapse="true" ShowBorder="true" ShowHeader="true" runat="server">
                    
                     <Columns>
                                   
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx
index 54b2158..b8ab661 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_DETAIL_VIEW.aspx
@@ -59,21 +59,23 @@
                     <Columns>
 
                         <%--<f:BoundField runat="server" HeaderText="供应商" ColumnID="" DataField="VendName" />--%>
-                        <f:TemplateField HeaderText="可用开票数量" Width="70px" ColumnID="Total">
+                        <f:TemplateField HeaderText="状态" Width="70px" ColumnID="Total">
                             <ItemTemplate>
                              <asp:label ID="Total1" runat="server" Width="60px"  Enabled="false"  Text='<%# Eval("State").ToString()=="1"?"审核通过":"已收货" %>' ></asp:label>
                            </ItemTemplate>
                         </f:TemplateField>
-                        <f:BoundField runat="server" HeaderText="单据号" ColumnID="" DataField="RecvBillNum" />
-                        <f:BoundField runat="server" HeaderText="订单号" ColumnID="" DataField="PoBillNum" />
-                        <f:BoundField runat="server" HeaderText="发货单号" ColumnID="" DataField="AsnBillNum" />
-                        <f:BoundField SortField="PoLine" DataField="PoLine" HeaderText="订单行" ColumnID="UnitCode" Width="60px" />
-                        <f:BoundField SortField="PartCode" DataField="PartCode" HeaderText="零件号" ColumnID="PackageQty" Width="100px" />
-                        <f:BoundField SortField="PartDesc1" DataField="PartDesc1" HeaderText="零件名称" ColumnID="CurrencyCode" Width="200px" />
-                        <f:BoundField SortField="Qty" DataField="Qty" HeaderText="数量" ColumnID="PlanQty" Width="60px" />
-                        <f:BoundField SortField="ShipTime" DataField="ShipTime" HeaderText="时间" ColumnID="ShipQty" Width="60px" DataFormatString="{0:yy-MM-dd}"/>
-                        <f:BoundField runat="server" HeaderText="供应商编码" ColumnID="" DataField="VendId" />
-                        <f:BoundField SortField="Unit" DataField="Unit" HeaderText="单位" ColumnID="Price" Width="80px" />                      
+                        <f:BoundField runat="server" HeaderText="供应商编码" ColumnID="VendId" DataField="VendId" />
+                        <f:BoundField runat="server" HeaderText="ERP单据号" ColumnID="ErpRecvBillNum" DataField="ErpRecvBillNum" />
+                        <f:BoundField runat="server" HeaderText="WMS单据号" ColumnID="RecvBillNum" DataField="RecvBillNum" />
+                        <f:BoundField runat="server" HeaderText="订单号" ColumnID="PoBillNum" DataField="PoBillNum" />
+                        <f:BoundField runat="server" HeaderText="发货单号" ColumnID="AsnBillNum" DataField="AsnBillNum" />
+                        <f:BoundField SortField="PoLine" DataField="PoLine" HeaderText="订单行" ColumnID="PoLine" Width="60px" />
+                        <f:BoundField SortField="PartCode" DataField="PartCode" HeaderText="零件号" ColumnID="PartCode" Width="100px" />
+                        <f:BoundField SortField="PartDesc1" DataField="PartDesc1" HeaderText="零件名称" ColumnID="PartDesc1" Width="200px" />
+                        <f:BoundField SortField="Qty" DataField="Qty" HeaderText="数量" ColumnID="Qty" Width="60px" />
+                        <f:BoundField SortField="ShipTime" DataField="ShipTime" HeaderText="时间" ColumnID="ShipTime" Width="60px" DataFormatString="{0:yy-MM-dd}"/>
+
+                        <f:BoundField SortField="Unit" DataField="Unit" HeaderText="单位" ColumnID="Unit" Width="80px" />                      
                         
                      
                     </Columns>
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
index 85d8459..5ddee81 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx
@@ -25,10 +25,6 @@
                                 <f:Button ID="Button3" runat="server" EnablePostBack="True" Text="刷新" Icon="Add" OnClientClick="location.reload();">
                                 </f:Button>
 
-                                <%--                                <f:Button ID="Button1" runat="server" EnablePostBack="True" Text="修改" Icon="Add">--%>
-                                <%--                                </f:Button>--%>
-                                <%--                                <f:Button ID="Button2" runat="server" EnablePostBack="True" Text="删除" Icon="Add">--%>
-                                <%--                                </f:Button>--%>
                               
                                 <f:ToolbarSeparator runat="server" />
                                 <f:Button ID="btnOutput" runat="server" Text="导出" Icon="PageExcel" OnClick="btnOutput_OnClick">
@@ -59,24 +55,26 @@
                                             <f:ListItem Text="审核通过" Value="1" />
                                            <%-- <f:ListItem Text="已开票" Value="2" />--%>
                                         </f:DropDownList>
+                                        <f:TextBox ID="txtSupplier" runat="server" Label="供应商代码" />
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow runat="server">
                                     <Items>
-                                        <f:Label runat="server" Label="单据号" />
-                                        <f:TextBox ID="txtReceiveBill" runat="server" />
-                                        <f:Label runat="server" Label="供应商" />
-                                        <f:TextBox ID="txtSupplier" runat="server" />
-                                        <f:Label runat="server" Label="订单号" />
-                                        <f:TextBox ID="txtPO" runat="server" />
+                                         <f:TextBox ID="txtErpBill" runat="server" Label="ERP单据号" />
+                                        <f:TextBox ID="txtReceiveBill" runat="server" Label="WMS单据号" />
+                                        <f:TextBox ID="txtPO" runat="server" Label="订单号" />
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow runat="server">
                                     <Items>
-                                        <f:Label runat="server" Label="发货单号" />
-                                        <f:TextBox ID="AsnBillNum" runat="server" />
-                                        <f:Label runat="server" Label="操作员" />
-                                        <f:TextBox ID="OperName" runat="server" />
+                                        <f:TextBox ID="AsnBillNum" runat="server" Label="发货单号" />
+                                            <f:DatePicker ID="txtShipTimeStar" runat="server" Label="收货时间" EmptyText="开始时间"></f:DatePicker>
+                                        <f:DatePicker ID="txtShipTimeEnd" runat="server" Label="至" EmptyText="结束时间"></f:DatePicker>
+                                    </Items>
+                                </f:FormRow>
+                                 <f:FormRow runat="server">
+                                    <Items>
+                                           <f:TextBox ID="OperName" runat="server" Label="审核员" />
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow runat="server">
@@ -116,15 +114,15 @@
                         <f:BoundField runat="server" HeaderText="状态" ColumnID="" DataField="State_DESC" />
                         <f:BoundField runat="server" HeaderText="供应商" ColumnID="" DataField="VendName" />
                         <f:BoundField runat="server" HeaderText="供应商编码" ColumnID="" DataField="VendId" />
-                        <f:BoundField runat="server" HeaderText="单据号" ColumnID="" DataField="RecvBillNum" />
-                        <f:BoundField runat="server" HeaderText="Erp单据号" ColumnID="" DataField="ErpRecvBillNum" />
+                        <f:BoundField runat="server" HeaderText="ERP单据号" ColumnID="" DataField="ErpRecvBillNum" />
+                        <f:BoundField runat="server" HeaderText="WMS单据号" ColumnID="" DataField="RecvBillNum" />
                         <f:BoundField runat="server" HeaderText="订单号" ColumnID="" DataField="PoBillNum" />
                         <f:BoundField runat="server" HeaderText="发货单号" ColumnID="" DataField="AsnBillNum"   />
 
                         <f:BoundField runat="server" HeaderText="时间" ColumnID="" DataField="ShipTime" />
                        
                         <f:BoundField runat="server" HeaderText="类型" ColumnID="" DataField="BillType_DESC" />
-                       
+                        <f:BoundField runat="server" HeaderText="审核员" ColumnID="" DataField="OperName" />
                     </Columns>
                 </f:Grid>
             </Items>
diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
index fdfe41a..c5f199d 100644
--- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
+++ b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs
@@ -50,6 +50,7 @@ namespace SCP.WarehouseData
         {
             var _entity = new V_TB_RECEIVE();
             _entity.RecvBillNum=txtReceiveBill.Text;//单据号
+            _entity.ErpRecvBillNum = txtErpBill.Text;//ERP单据号
             if (!string.IsNullOrEmpty(ddl.SelectedValue))
             {
                 //已收货:0,审核通过:1,已开票,2
@@ -86,11 +87,18 @@ namespace SCP.WarehouseData
             }
             _entity.UserInAddress = CurrentUser.FactoryList;
             _entity.UserInVendIds = CurrentUser.VenderList;
-            _entity.VendName = txtSupplier.Text;//供应商
+            _entity.VendId = txtSupplier.Text;//供应商代码
             _entity.PoBillNum = txtPO.Text;//订单号
             _entity.AsnBillNum = AsnBillNum.Text;//发货单号
             _entity.OperName = OperName.Text;//操作员
-
+            if (txtShipTimeStar.SelectedDate != null)
+            {
+                _entity.ShipTimeStart = (DateTime)txtShipTimeStar.SelectedDate;
+            }
+            if (txtShipTimeEnd.SelectedDate != null)
+            {
+                _entity.ShipTimeEnd = (DateTime)txtShipTimeEnd.SelectedDate;
+            }
             SCP_RECIVECE_CONTROLLER.Get_V_TB_RECEIVE_GG_List(_entity, (ret) =>
             {
                 if (ret.State == ReturnStatus.Succeed)