diff --git a/Controller/SCP_RECEIVE_CONTROLLER.cs b/Controller/SCP_RECEIVE_CONTROLLER.cs index 0ea3505..55afc5d 100644 --- a/Controller/SCP_RECEIVE_CONTROLLER.cs +++ b/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); diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs index f4024e1..4a7a9d0 100644 --- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs +++ b/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 { diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx index 5ddee81..fc6ff7d 100644 --- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx +++ b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx @@ -90,7 +90,7 @@ diff --git a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs b/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs index 9e892dd..177d2bd 100644 --- a/SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs +++ b/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)); } //鏌ヨ diff --git a/UniApiGroup/Controller/OdbcApiQadController.cs b/UniApiGroup/Controller/OdbcApiQadController.cs index cbaded0..03d0752 100644 --- a/UniApiGroup/Controller/OdbcApiQadController.cs +++ b/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;//更新日期