|
@@ -477,9 +477,20 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -477,9 +477,20 @@ public class ContractDistributorStandardServiceImpl extends |
|
477
|
}
|
477
|
}
|
|
478
|
|
478
|
|
|
479
|
private ContractDistributorStandard createContractBase(CreateContractDistributorStandardVo vo) {
|
479
|
private ContractDistributorStandard createContractBase(CreateContractDistributorStandardVo vo) {
|
|
|
|
480
|
+ if (StringUtils.isBlank(vo.getCode())) {
|
|
|
|
481
|
+ throw new DefaultClientException("合同编号不能为空!");
|
|
|
|
482
|
+ }
|
|
|
|
483
|
+ // 编号查重:全表校验(含已删除状态),保证新增合同编号不重复
|
|
|
|
484
|
+ long codeCount = count(Wrappers.lambdaQuery(ContractDistributorStandard.class)
|
|
|
|
485
|
+ .eq(ContractDistributorStandard::getCode, vo.getCode()));
|
|
|
|
486
|
+ if (codeCount > 0) {
|
|
|
|
487
|
+ throw new DefaultClientException("合同编号[" + vo.getCode() + "]已存在,请勿重复使用!");
|
|
|
|
488
|
+ }
|
|
|
|
489
|
+
|
|
480
|
ContractDistributorStandard data = new ContractDistributorStandard();
|
490
|
ContractDistributorStandard data = new ContractDistributorStandard();
|
|
481
|
data.setId(IdUtil.getUUID());
|
491
|
data.setId(IdUtil.getUUID());
|
|
482
|
data.setCode(vo.getCode());
|
492
|
data.setCode(vo.getCode());
|
|
|
|
493
|
+ data.setCodeUnique(vo.getCode());
|
|
483
|
data.setSupplier(vo.getSupplier());
|
494
|
data.setSupplier(vo.getSupplier());
|
|
484
|
data.setBuyer(vo.getBuyer());
|
495
|
data.setBuyer(vo.getBuyer());
|
|
485
|
data.setDeptId(vo.getDeptId());
|
496
|
data.setDeptId(vo.getDeptId());
|
|
@@ -558,6 +569,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -558,6 +569,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
558
|
|
569
|
|
|
559
|
LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
|
570
|
LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
|
|
560
|
.set(ContractDistributorStandard::getCode, vo.getCode())
|
571
|
.set(ContractDistributorStandard::getCode, vo.getCode())
|
|
|
|
572
|
+ .set(ContractDistributorStandard::getCodeUnique, vo.getCode())
|
|
561
|
.set(ContractDistributorStandard::getSupplier, vo.getSupplier())
|
573
|
.set(ContractDistributorStandard::getSupplier, vo.getSupplier())
|
|
562
|
.set(ContractDistributorStandard::getBuyer, vo.getBuyer())
|
574
|
.set(ContractDistributorStandard::getBuyer, vo.getBuyer())
|
|
563
|
.set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
|
575
|
.set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
|
|
@@ -797,6 +809,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -797,6 +809,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
797
|
|
809
|
|
|
798
|
LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
|
810
|
LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
|
|
799
|
.set(ContractDistributorStandard::getCode, vo.getCode())
|
811
|
.set(ContractDistributorStandard::getCode, vo.getCode())
|
|
|
|
812
|
+ .set(ContractDistributorStandard::getCodeUnique, vo.getCode())
|
|
800
|
.set(ContractDistributorStandard::getSupplier, vo.getSupplier())
|
813
|
.set(ContractDistributorStandard::getSupplier, vo.getSupplier())
|
|
801
|
.set(ContractDistributorStandard::getBuyer, vo.getBuyer())
|
814
|
.set(ContractDistributorStandard::getBuyer, vo.getBuyer())
|
|
802
|
.set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
|
815
|
.set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
|
|
@@ -944,6 +957,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -944,6 +957,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
944
|
BeanUtil.copyProperties(original, newContract);
|
957
|
BeanUtil.copyProperties(original, newContract);
|
|
945
|
newContract.setId(IdUtil.getUUID());
|
958
|
newContract.setId(IdUtil.getUUID());
|
|
946
|
newContract.setCode(newCode);
|
959
|
newContract.setCode(newCode);
|
|
|
|
960
|
+ newContract.setCodeUnique(newCode);
|
|
947
|
newContract.setParentId(null);
|
961
|
newContract.setParentId(null);
|
|
948
|
newContract.setTotalQuantity(splitTotalQuantity);
|
962
|
newContract.setTotalQuantity(splitTotalQuantity);
|
|
949
|
newContract.setCreateTime(LocalDateTime.now());
|
963
|
newContract.setCreateTime(LocalDateTime.now());
|
|
@@ -1152,6 +1166,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -1152,6 +1166,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
1152
|
|
1166
|
|
|
1153
|
LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
|
1167
|
LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
|
|
1154
|
.set(ContractDistributorStandard::getCode, vo.getCode())
|
1168
|
.set(ContractDistributorStandard::getCode, vo.getCode())
|
|
|
|
1169
|
+ .set(ContractDistributorStandard::getCodeUnique, vo.getCode())
|
|
1155
|
.set(ContractDistributorStandard::getSupplier, vo.getSupplier())
|
1170
|
.set(ContractDistributorStandard::getSupplier, vo.getSupplier())
|
|
1156
|
.set(ContractDistributorStandard::getBuyer, vo.getBuyer())
|
1171
|
.set(ContractDistributorStandard::getBuyer, vo.getBuyer())
|
|
1157
|
.set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
|
1172
|
.set(vo.getDeptId() != null, ContractDistributorStandard::getDeptId, vo.getDeptId())
|
|
@@ -1445,6 +1460,8 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -1445,6 +1460,8 @@ public class ContractDistributorStandardServiceImpl extends |
|
1445
|
}
|
1460
|
}
|
|
1446
|
|
1461
|
|
|
1447
|
data.setId(IdUtil.getUUID());
|
1462
|
data.setId(IdUtil.getUUID());
|
|
|
|
1463
|
+ // 锁价子合同编号与原合同一致,不参与编号唯一校验
|
|
|
|
1464
|
+ data.setCodeUnique(null);
|
|
1448
|
data.setTotalQuantity(vo.getTotalQuantity());
|
1465
|
data.setTotalQuantity(vo.getTotalQuantity());
|
|
1449
|
data.setTotalAmountCapital(vo.getTotalAmountCapital());
|
1466
|
data.setTotalAmountCapital(vo.getTotalAmountCapital());
|
|
1450
|
data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
|
1467
|
data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
|
|
@@ -1598,6 +1615,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
@@ -1598,6 +1615,7 @@ public class ContractDistributorStandardServiceImpl extends |
|
1598
|
|
1615
|
|
|
1599
|
data.setId(IdUtil.getUUID());
|
1616
|
data.setId(IdUtil.getUUID());
|
|
1600
|
data.setCode(lockContractCode);
|
1617
|
data.setCode(lockContractCode);
|
|
|
|
1618
|
+ data.setCodeUnique(lockContractCode);
|
|
1601
|
data.setTotalQuantity(vo.getTotalQuantity());
|
1619
|
data.setTotalQuantity(vo.getTotalQuantity());
|
|
1602
|
data.setTotalAmountCapital(vo.getTotalAmountCapital());
|
1620
|
data.setTotalAmountCapital(vo.getTotalAmountCapital());
|
|
1603
|
data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
|
1621
|
data.setTotalAmountExcludingTax(vo.getTotalAmountExcludingTax());
|