From 8901bffbe026c6a7751fdd767e3b358caf30f1ae Mon Sep 17 00:00:00 2001 From: TML <1448969505@qq.com> Date: Sun, 7 Feb 2021 15:51:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E5=B7=9E=E5=BC=80=E7=A5=A8=E6=95=B0?= =?UTF-8?q?=E9=87=8F=EF=BC=8C=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/ScpCache.cs | 2 ++ SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs | 3 ++- SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx | 10 ++++------ SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs | 6 ++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Models/ScpCache.cs b/Models/ScpCache.cs index 6d305f3..34d4d81 100644 --- a/Models/ScpCache.cs +++ b/Models/ScpCache.cs @@ -317,5 +317,7 @@ namespace CK.SCP.Models public string 托码序列号格式 { get; set; } = "700000"; public string 小包装条码序列号格式 { get; set; } = "600000"; public bool 负数发票 { get; set; } = false; + public bool 开票数量限制 { get; set; } = true; + public bool 数据中心接口 { get; set; } = true; } } \ No newline at end of file diff --git a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs index 28596fc..d116fd8 100644 --- a/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs +++ b/SCP/Views/PlanData/SCP_PO_EXTEND.aspx.cs @@ -13,6 +13,7 @@ using System.Data; using CK.SCP.Models.ScpEntity.ExcelImportEntity; using CK.SCP.Models.Enums; using CK.SCP.Common; +using CK.SCP.Models; using System.Text; using CK.SCP.Models.ScpEntity.ExcelExportEnttity; @@ -280,7 +281,7 @@ namespace SCP.PlanData Alert.Show(string.Join("
", checkret.MessageList)); return; } - if (CurrentUser.ConfigList.ContainsKey("数据中心接口")) + if (ScpCache.Config.数据中心接口) { saveret = SCP_DC_UNI_CONTROLLER.WritePo(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, p_modtype, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone); } diff --git a/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx b/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx index 7f5e3ea..4e70522 100644 --- a/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx +++ b/SCP/Views/SupplierData/SCP_INVOICE_CREATE.aspx @@ -33,7 +33,7 @@ - - - - + runat="server"> + + diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs index 6e309cc..1223f1f 100644 --- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs +++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs @@ -73,9 +73,7 @@ namespace SCP.SupplierData public void LoadData() { - // 每页记录数 - Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize; - ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString(); + // 每页记录数 BindData(); } private void SearchData(Action> p_action) @@ -316,7 +314,7 @@ namespace SCP.SupplierData - if (IdList.Count > 10000) + if (IdList.Count > 1000&&ScpCache.Config.开票数量限制) { Alert.Show("选择发票条数"+ IdList.Count + "超过1000条,发票允许条数!"); return;