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

fix: 去除非国联客户审批配置case

Browse Source
This commit is contained in:
tengyufan
2026-08-11 14:35:34 +08:00
parent 870cd337f6
commit fcf94ce982
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/ClientModule/ClientDutyService.cs
+4 -4
View File
@@ -98,7 +98,7 @@ namespace YLErp.Modules.ClientModule
//针对法人，授权协议签署人才做唯一性判断,有效期结束后可新增
if ((contactType == contactypelist.FirstOrDefault(x => x.ContactType == "法人")?.id || (contactType == contactypelist.FirstOrDefault(x => x.ContactType == "授权协议签署人")?.id && PS.Config.Company == Configuration.CompanyEnum.国泰君安))
&& DbContext.clientduty.Any(x => x.ApprovalOrder < 1 && x.ClientId == req.ClientId && x.ContactTypeId.Contains(contactType.ToString()) && (x.DeadLine >= DateTime.Now || !x.DeadLine.HasValue))
&& !PS.Config.Is浙期 && PS.Config.Company != Configuration.CompanyEnum.国联)
&& PS.Config.Company != Configuration.CompanyEnum.国联)
{
throw new ServiceException("法人在有效期内必须唯一，授权协议签署人必须唯一");
}
@@ -113,7 +113,7 @@ namespace YLErp.Modules.ClientModule
//针对法人，授权协议签署人才做唯一性判断，有效期结束后可新增
if ((contactType == contactypelist.FirstOrDefault(x => x.ContactType == "法人")?.id || contactType == contactypelist.FirstOrDefault(x => x.ContactType == "授权协议签署人")?.id)
&& DbContext.clientduty.Any(x => x.ApprovalOrder < 1 && x.ClientId == req.ClientId && x.ContactTypeId.Contains(contactType.ToString()) && x.id != req.id && (x.DeadLine >= DateTime.Now || !x.DeadLine.HasValue))
&& !PS.Config.Is浙期 && PS.Config.Company != Configuration.CompanyEnum.国联)
&& PS.Config.Company != Configuration.CompanyEnum.国联)
{
throw new ServiceException("法人在有效期内必须唯一，授权协议签署人必须唯一");
}
@@ -209,7 +209,7 @@ namespace YLErp.Modules.ClientModule
if (dbmodel.ApprovalOrder == 0)
{
if (clientCount > 0 && client.ProcessStatus == "已开户"
&& (PS.Config.Is浙期 || PS.Config.Company == Configuration.CompanyEnum.国联))
&& PS.Config.Company == Configuration.CompanyEnum.国联)
{
if (!isAdd)
{
@@ -399,7 +399,7 @@ namespace YLErp.Modules.ClientModule
var clientCount = yldb.approvalprocess.Where(x => x.processType == "ClientProcess").Count();
if (clientCount > 0 && client.ProcessStatus == "已开户"
&& (PS.Config.Is浙期 || PS.Config.Company == Configuration.CompanyEnum.国联)
&& PS.Config.Company == Configuration.CompanyEnum.国联
&& clientDuty.ApprovalOrder == 0)
{
clientDuty.ApprovalOrder = (int)ApprovalOrderEnum.删除;
YLErpDAL/Modules/ClientModule/ClientFileService.cs
+1 -1
View File
@@ -1103,7 +1103,7 @@ namespace YLErp.Modules.ClientModule
public bool resetClientProcess(client_file file, ApprovalOrderEnum orderEnum)
{
if (string.IsNullOrWhiteSpace(file.ProtocolNumber) && file.ApprovalOrder == (int)ApprovalOrderEnum.无需审批
&& !PS.Config.Is浙期 && PS.Config.Company != Configuration.CompanyEnum.国联)
&& PS.Config.Company != Configuration.CompanyEnum.国联)
{
return false;
}
YLErpDAL/Modules/ClientModule/ClientImportService.cs
+1 -1
View File
@@ -1778,7 +1778,7 @@ namespace YLErp.Modules.ClientModule
var processlist = yldb.approvalprocess.Where(x => x.processType == "ClientProcess");
if (processlist.Count() > 0 && client.ProcessStatus == "已开户"
&& (PS.Config.Is浙期 || PS.Config.Company == Configuration.CompanyEnum.国联))
&& PS.Config.Company == Configuration.CompanyEnum.国联)
{
clientDuty.ApprovalOrder = (int)ApprovalOrderEnum.导入;