|
@@ -353,7 +353,7 @@ public class BillManFacade {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(!conditionLabels.contains(condition.getConditionLabel())){
|
|
|
+ if (!conditionLabels.contains(condition.getConditionLabel())) {
|
|
|
throw new CommonException(CommonErrorCode.IS_EXISTS, "开单项目与条件明细无关联");
|
|
|
}
|
|
|
|
|
@@ -380,7 +380,8 @@ public class BillManFacade {
|
|
|
BillSaveVO oldBillRecord = getRecordByRelationId(relationIdVO);
|
|
|
if (oldBillRecord != null
|
|
|
&& oldBillRecord.getRelationId().equals(billSaveVO.getRelationId())
|
|
|
- && !oldBillRecord.getCondition().getName().equals(condition.getName())) {
|
|
|
+ && (!oldBillRecord.getCondition().getId().equals(condition.getId())
|
|
|
+ || !oldBillRecord.getConcept().getId().equals(concept.getId()))) {
|
|
|
baseNodeRepository.deleteRelationStatusById(billSaveVO.getRelationId());
|
|
|
}
|
|
|
}
|