From 09ef7403da08ee8500a1b9db2682f93906a834a6 Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Tue, 13 Oct 2020 11:21:14 +0800 Subject: [PATCH 1/3] 1 --- SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs | 6 +++--- SCP/default.aspx | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs index 3dd9145..f4024e1 100644 --- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs +++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs @@ -73,9 +73,9 @@ namespace SCP.SupplierData public void LoadData() { // 每页记录数 - //Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize; - //ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString(); - //BindData(); + Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize; + ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString(); + BindData(); } private void SearchData(Action> p_action) { diff --git a/SCP/default.aspx b/SCP/default.aspx index 0072930..8139869 100644 --- a/SCP/default.aspx +++ b/SCP/default.aspx @@ -111,10 +111,10 @@ for (var i = 0; obj.options.length; i++) { - if ('CNS' == obj.options[i].value) { + if ('JZ1' == obj.options[i].value) { obj.options[i].selected = true; _factory = document.getElementById(_factoryValue); - _factory.value = 'CNS'; + _factory.value = 'JZ1'; } } From 20be69d81392b9b08e745e1067f1e48dbe1e2b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 13 Oct 2020 15:04:20 +0800 Subject: [PATCH 2/3] 3 --- UniApiGroup/Controller/OdbcApiQadController.cs | 1 - UniApiGroup/Controller/OdbcApiScpController.cs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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;// diff --git a/UniApiGroup/Controller/OdbcApiScpController.cs b/UniApiGroup/Controller/OdbcApiScpController.cs index 44a5315..90a5a94 100644 --- a/UniApiGroup/Controller/OdbcApiScpController.cs +++ b/UniApiGroup/Controller/OdbcApiScpController.cs @@ -329,7 +329,7 @@ namespace CK.SCP.GrupUniApi.Controller qadData.xxscm_inv_totdiscount = _invoice.DiscountPrice == null ? 0 : _invoice.DiscountPrice.Value; qadData.xxscm_inv_tottaxvar = _invoice.BlancePrice == null ? 0 : _invoice.BlancePrice.Value; qadData.xxscm_inv_totclaim= _invoice.ContractPrice == null ? 0 : _invoice.ContractPrice.Value; - qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : q_invoice.Extend1.Value; + qadData.xxscm_inv_extend1 = _invoice.Extend1 == null ? 0 : _invoice.Extend1.Value; qadData.xxscm_inv_extend2 = _invoice.Extend2 == null ? 0 : _invoice.Extend2.Value; qadDataList.Add(qadData); p.State = (int)BillState.Finish; From 6bbe618f8c4fbedca083287e2a84f547ea83eb9f Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Wed, 14 Oct 2020 09:18:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=94=A6=E5=B7=9E=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/SCP_RECEIVE_CONTROLLER.cs | 2 +- SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs | 2 +- SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx | 2 +- SCP/Views/WarehouseData/SCP_RECEIVE_VIEW.aspx.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) 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)); } //查询