Merge branch 'master' of https://gitee.com/zxyabc/COMONE

Controller/SCP_RECEIVE_CONTROLLER.cs

@@ -1028,7 +1028,7 @@ namespace CK.SCP.Controller
                     if (p_entity.UIDList != null && p_entity.UIDList.Count > 0)
                     {
                         q = q.Where(p => p_entity.UIDList.Contains(p.UID));
-                    }
+                    }                 
                     _ret.State = ReturnStatus.Succeed;
                     _ret.Result = q;
                     p_action(_ret);

SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs

@@ -141,7 +141,7 @@ namespace SCP.SupplierData
                         var _vender = SCP_TB_VENDER_CONTROLLER.GetVender(_venderId, _ls.Site);
                         if (_vender.Tax != null)
                         {
-                            lbTaxRate.SelectedValue = _vender.Tax.ToString();
+                            lbTaxRate.Text = _vender.Tax.ToString();
                         }
                         else
                         {

SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx

@@ -90,7 +90,7 @@
                     </Items>
                 </f:GroupPanel>
                 <f:Grid ID="Grid_V_TB_RECEIVE" ShowBorder="true" ShowHeader="true" PageSize="20" BoxFlex="1" CssClass="maingrid"
-                    runat="server" DataKeyNames="UID,RecvBillNum,ReceiveDetailList,Site" IsDatabasePaging="True" AllowPaging="True" EnableRowDoubleClickEvent="True" OnRowDataBound="Grid_V_TB_RECEIVE_RowDataBound"
+                    runat="server" DataKeyNames="UID,RecvBillNum,ReceiveDetailList,Site,ErpRecvBillNum" IsDatabasePaging="True" AllowPaging="True" EnableRowDoubleClickEvent="True" OnRowDataBound="Grid_V_TB_RECEIVE_RowDataBound"
                     OnRowDoubleClick="Grid1_OnRowDoubleClick" SortDirection="DESC" SortField="ShipTime" EnableCheckBoxSelect="True" EnableCollapse="true"
                     EnableRowSelectEvent="False" AutoScroll="True" OnPageIndexChange="Grid1_OnPageIndexChange">
                     <PageItems>

SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs

@@ -162,8 +162,8 @@ namespace SCP.WarehouseData
                 STATE = "0";
             }
 
-            string roleID = GetSelectedDataKey(Grid_V_TB_RECEIVE, 1);
-            string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&STATE={1}", roleID, STATE);
+            string ErpRecvBillNum = GetSelectedDataKey(Grid_V_TB_RECEIVE,4);
+            string url = String.Format("../WarehouseData/SCP_RECEIVE_DETAIL.aspx?ID={0}&STATE={1}", ErpRecvBillNum, STATE);
             PageContext.RegisterStartupScript(Window1.GetShowReference(url));
         }
         //查询

UniApiGroup/Controller/OdbcApiQadController.cs

@@ -976,7 +976,6 @@ namespace CK.SCP.GrupUniApi.Controller
                         wmsPoDetail.State = Convert.ToInt32(qadData.xxqad_pod_status);//状态
                         wmsPoDetail.Site = qadData.xxqad_pod_domain;//备注
                         wmsPoDetail.SubSite = qadData.xxqad_pod_site;
-
                         wmsPoDetail.CreateTime = firstqadData.xxqad_pod_createdt == null ? DateTime.Now : (DateTime)firstqadData.xxqad_pod_createdt;//创建日期
                         wmsPoDetail.CreateUser = firstqadData.xxqad_pod_buyer;//创建用户
                         wmsPoDetail.UpdateTime = firstqadData.xxqad_pod_updatedt;//更新日期