朱园亮 / xingyun-erp · Commits

Commit da45f861c2a395cb658daca1d75177a536c6de5b

Authored by 杨鸣坤
1 parent f55f42d2

楚江ERP：bug修复

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
@@ -3,9 +3,9 @@ server: @@ -3,9 +3,9 @@ server:
3 port: 8081 3 port: 8081
4 spring: 4 spring:
5 application: 5 application:
6 - name: @project.artifactId@ 6 + name: "@project.artifactId@"
7 profiles: 7 profiles:
8 - active: @profiles-active@ 8 + active: "@profiles-active@"
9 servlet: 9 servlet:
10 multipart: 10 multipart:
11 #是否开启文件上传 11 #是否开启文件上传
@@ -496,7 +496,9 @@ public class ContractDistributorStandardServiceImpl extends @@ -496,7 +496,9 @@ public class ContractDistributorStandardServiceImpl extends
496 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized()) 496 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
497 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name()); 497 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
498 if (!data.getStatus().equals("STANDARD") 498 if (!data.getStatus().equals("STANDARD")
499 - && ("DISTRIB_STD".equals(data.getType()) || "INTL_STD_CONTRACT".equals(data.getType()))) { // 只有经销(外贸)标准合同才修改状态 499 + && ("DISTRIB_STD".equals(data.getType())
  500 + || "INTL_STD_CONTRACT".equals(data.getType())
  501 + || "PROCESS_STD_AGMT".equals(data.getType()))) { // 只有经销(外贸、加工)标准合同才修改状态
500 updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD") 502 updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD")
501 .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now()); 503 .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now());
502 } 504 }