|
@@ -111,14 +111,14 @@ public class EhsdPurchaseFlow extends FlowDelegate {
|
|
|
Contract contract = contractService.getById(purchase.getDataResourceId());
|
|
|
Assert.notEmpty(contract, "查询不到合同信息,无法生成编号");
|
|
|
long count = purchaseService.count(q -> q.eq(EhsdPurchase::getDataResourceId, contract.getId()));
|
|
|
- purchase.setCode(contract.getCode() + "-" + count);
|
|
|
+ purchase.setCode(contract.getCode() + "-" + (count + 1));
|
|
|
}
|
|
|
//样品单
|
|
|
if (2 == purchase.getDataResource()) {
|
|
|
Sample sample = sampleService.getById(purchase.getDataResourceId());
|
|
|
Assert.notEmpty(sample, "查询不到样品单信息,无法生成编号");
|
|
|
long count = purchaseService.count(q -> q.eq(EhsdPurchase::getDataResourceId, sample.getId()));
|
|
|
- purchase.setCode(sample.getCode() + "-" + count);
|
|
|
+ purchase.setCode(sample.getCode() + "-" + (count + 1));
|
|
|
}
|
|
|
// purchase.setCode(CodeEnum.PURCHASE.getCode());
|
|
|
purchase.setStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
|