Commit da45f861c2a395cb658daca1d75177a536c6de5b

Authored by 杨鸣坤
1 parent f55f42d2

楚江ERP:bug修复

... ... @@ -3,9 +3,9 @@ server:
3 3 port: 8081
4 4 spring:
5 5 application:
6   - name: @project.artifactId@
  6 + name: "@project.artifactId@"
7 7 profiles:
8   - active: @profiles-active@
  8 + active: "@profiles-active@"
9 9 servlet:
10 10 multipart:
11 11 #是否开启文件上传
... ...
... ... @@ -496,7 +496,9 @@ public class ContractDistributorStandardServiceImpl extends
496 496 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
497 497 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
498 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 502 updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD")
501 503 .set(ContractDistributorStandard::getStandardizedAt, LocalDateTime.now());
502 504 }
... ...