From 465fae3160f3c2d9ad5c054532b6215c34be212c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=96=B9=E6=B5=B7?= Date: Thu, 24 Apr 2025 13:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E9=87=91=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=20=E5=8E=BB=E6=8E=89=E7=94=A8=E9=80=94=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClientModule/ClientCashImportService.cs | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/YLErpDAL/Modules/ClientModule/ClientCashImportService.cs b/YLErpDAL/Modules/ClientModule/ClientCashImportService.cs index 7903def5..e059eaf8 100644 --- a/YLErpDAL/Modules/ClientModule/ClientCashImportService.cs +++ b/YLErpDAL/Modules/ClientModule/ClientCashImportService.cs @@ -1,6 +1,7 @@ using BaseOUDAL; using OfficeOpenXml; using YLErp.Commons; +using YLErp.DBModels.Enums; using YLErp.Helpers; namespace YLErp.Modules.ClientModule @@ -30,7 +31,7 @@ namespace YLErp.Modules.ClientModule var bankcardList = new List(); var directionList = new List { "出金", "入金", "其他收入", "其他支出" }; - + ExcelPackage.LicenseContext = LicenseContext.NonCommercial; //读取文件 using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read)) { @@ -144,7 +145,9 @@ namespace YLErp.Modules.ClientModule CreatorName = UserName, CreateDate = DateTime.Now, SerialNumber = serialNum, - Comments = remark + Comments = remark, + ValidState = ConsGlobal.Valid, + cash_type = CashTypeEnum.初保账户.ToString() }; //客户名称检查 @@ -195,14 +198,14 @@ namespace YLErp.Modules.ClientModule //检查银行卡 var bankCardModel = DbContext.bankcard.Where(c => c.ApprovalOrder < 1 && openBankCard.Equals(c.Card) && client.id == c.ClientId && c.ValidState != "InValid"); - if (CheckPermission) - { - var dictionaryName = CheckCashAccountTypePermission(clientCash.Direction); - if (!bankCardModel.Where(b => dictionaryName.Contains(b.Use) && b.Card == openBankCard).Any()) - { - return string.Format("第{0}行，出入金方向和银行卡账号类型不匹配!", m); - } - } + //if (CheckPermission) + //{ + // var dictionaryName = CheckCashAccountTypePermission(clientCash.Direction); + // if (!bankCardModel.Where(b => dictionaryName.Contains(b.Use) && b.Card == openBankCard).Any()) + // { + // return string.Format("第{0}行，出入金方向和银行卡账号类型不匹配!", m); + // } + //} if ("出金".Equals(clientCash.Direction)) { var bcModel = bankCardModel.FirstOrDefault(); @@ -326,7 +329,9 @@ namespace YLErp.Modules.ClientModule CreatorName = UserName, CreateDate = DateTime.Now, SerialNumber = SerialNumber, - Uses = uses + Uses = uses, + ValidState = ConsGlobal.Valid, + cash_type = CashTypeEnum.初保账户.ToString() }; //客户名称检查 @@ -356,14 +361,14 @@ namespace YLErp.Modules.ClientModule //检查银行卡 var bankCard = DbContext.bankcard.Where(c => c.ApprovalOrder < 1 && openBankCard.Equals(c.Card) && client.id == c.ClientId && c.ValidState != "InValid"); - if (CheckPermission) - { - var dictionaryName = CheckCashAccountTypePermission(clientCash.Direction); - if (!bankCard.Where(b => dictionaryName.Contains(b.Use) && b.Card == openBankCard).Any()) - { - return string.Format("第{0}行，出入金方向和银行卡账号类型不匹配!", m); - } - } + //if (CheckPermission) + //{ + // var dictionaryName = CheckCashAccountTypePermission(clientCash.Direction); + // if (!bankCard.Where(b => dictionaryName.Contains(b.Use) && b.Card == openBankCard).Any()) + // { + // return string.Format("第{0}行，出入金方向和银行卡账号类型不匹配!", m); + // } + //} if ("出金".Equals(clientCash.Direction)) { var bcModel = bankCard.FirstOrDefault();