Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出入金导入 去掉用途校验

Browse Source
This commit is contained in:
吴方海
2025-04-24 13:29:11 +08:00
parent 35db617079
commit 465fae3160
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/ClientModule/ClientCashImportService.cs
+24 -19
View File
@@ -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<ClientBankCard>();
var directionList = new List<string> { "出金", "入金", "其他收入", "其他支出" };
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();