|
@@ -604,7 +604,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
|
|
|
for(VerificationdetDTO det : items1){
|
|
for(VerificationdetDTO det : items1){
|
|
|
Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
|
|
Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
|
|
|
Subledger sub = subledgerMapper.selectByPrimaryKey(Math.toIntExact(det.getVd_slid()));
|
|
Subledger sub = subledgerMapper.selectByPrimaryKey(Math.toIntExact(det.getVd_slid()));
|
|
|
- if (sub != null && sub.getSl_preamount() != 0 &&
|
|
|
|
|
|
|
+ if (sub != null && sub.getSl_preamount() !=null && sub.getSl_preamount() != 0 &&
|
|
|
("receivable_to_receivable".equals(verificationDTO.getVc_kind()) || "payable_to_payable".equals(verificationDTO.getVc_kind()))) {
|
|
("receivable_to_receivable".equals(verificationDTO.getVc_kind()) || "payable_to_payable".equals(verificationDTO.getVc_kind()))) {
|
|
|
nowbalanceDet=-1*nowbalanceDet;
|
|
nowbalanceDet=-1*nowbalanceDet;
|
|
|
}
|
|
}
|
|
@@ -898,7 +898,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
|
|
|
for(Verificationdet det : items1){
|
|
for(Verificationdet det : items1){
|
|
|
Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
|
|
Double nowbalanceDet = det.getVd_nowbalance()==null?new Double(0):det.getVd_nowbalance();
|
|
|
Subledger sub = subledgerMapper.selectByPrimaryKey(Math.toIntExact(det.getVd_slid()));
|
|
Subledger sub = subledgerMapper.selectByPrimaryKey(Math.toIntExact(det.getVd_slid()));
|
|
|
- if (sub != null && sub.getSl_preamount() != 0 &&
|
|
|
|
|
|
|
+ if (sub != null && sub.getSl_preamount() != null && sub.getSl_preamount() != 0 &&
|
|
|
("receivable_to_receivable".equals(verificationDTO.getVc_kind()) || "payable_to_payable".equals(verificationDTO.getVc_kind())
|
|
("receivable_to_receivable".equals(verificationDTO.getVc_kind()) || "payable_to_payable".equals(verificationDTO.getVc_kind())
|
|
|
|| "应收转应收".equals(verificationDTO.getVc_kind()) || "应付转应付".equals(verificationDTO.getVc_kind()))) {
|
|
|| "应收转应收".equals(verificationDTO.getVc_kind()) || "应付转应付".equals(verificationDTO.getVc_kind()))) {
|
|
|
nowbalanceDet=-1*nowbalanceDet;
|
|
nowbalanceDet=-1*nowbalanceDet;
|