|
|
|
@ -107,6 +107,21 @@ public class TransactionService {
|
|
|
|
Double creditAmount = gLtoGLRequest.getCreditGl().getSgtGntramtfc();
|
|
|
|
Double creditAmount = gLtoGLRequest.getCreditGl().getSgtGntramtfc();
|
|
|
|
Double debitAmount = gLtoGLRequest.getDebitGl().getSgtGntramtfc();
|
|
|
|
Double debitAmount = gLtoGLRequest.getDebitGl().getSgtGntramtfc();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String crGL = gLtoGLRequest.getCreditGl().getPcaGlaccode();
|
|
|
|
|
|
|
|
String drGL = gLtoGLRequest.getDebitGl().getPcaGlaccode();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(crGL == null || drGL == null) {
|
|
|
|
|
|
|
|
return ResponseEntity
|
|
|
|
|
|
|
|
.badRequest()
|
|
|
|
|
|
|
|
.body("Credit and Debit GL codes are required");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(crGL.equals(drGL)) {
|
|
|
|
|
|
|
|
return ResponseEntity
|
|
|
|
|
|
|
|
.badRequest()
|
|
|
|
|
|
|
|
.body("Credit and Debit GL codes cannot be same");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (creditAmount == null || debitAmount == null) {
|
|
|
|
if (creditAmount == null || debitAmount == null) {
|
|
|
|
return ResponseEntity
|
|
|
|
return ResponseEntity
|
|
|
|
.badRequest()
|
|
|
|
.badRequest()
|
|
|
|
@ -126,7 +141,7 @@ public class TransactionService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
String porOrgacode = gLtoGLRequest.getPorOrgacode();
|
|
|
|
String porOrgacode = gLtoGLRequest.getPorOrgacode();
|
|
|
|
String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT +"/gltogls";
|
|
|
|
String url = generalledgerURI + "/generalledger" + "/organizations/" + porOrgacode + "/transactions" + ACONNECT +"/gltogls";
|
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
|
headers.set("Authorization", tokenHeader);
|
|
|
|
headers.set("Authorization", tokenHeader);
|
|
|
|
headers.set("POR_ORGACODE", porOrgacode);
|
|
|
|
headers.set("POR_ORGACODE", porOrgacode);
|
|
|
|
@ -154,6 +169,21 @@ public class TransactionService {
|
|
|
|
BigDecimal creditAmount = accountToAccountDTO.getCreditAcc().getSgtGntramtfc();
|
|
|
|
BigDecimal creditAmount = accountToAccountDTO.getCreditAcc().getSgtGntramtfc();
|
|
|
|
BigDecimal debitAmount = accountToAccountDTO.getDebitAcc().getSgtGntramtfc();
|
|
|
|
BigDecimal debitAmount = accountToAccountDTO.getDebitAcc().getSgtGntramtfc();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String crAcc = accountToAccountDTO.getCreditAcc().getMbmBkmsnumber();
|
|
|
|
|
|
|
|
String drAcc = accountToAccountDTO.getDebitAcc().getMbmBkmsnumber();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(crAcc == null || drAcc == null) {
|
|
|
|
|
|
|
|
return ResponseEntity
|
|
|
|
|
|
|
|
.badRequest()
|
|
|
|
|
|
|
|
.body("Credit and Debit account numbers are required");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(crAcc.equals(drAcc)) {
|
|
|
|
|
|
|
|
return ResponseEntity
|
|
|
|
|
|
|
|
.badRequest()
|
|
|
|
|
|
|
|
.body("Debit Account Number and Credit Account Number shouldn't be same");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (creditAmount == null || debitAmount == null) {
|
|
|
|
if (creditAmount == null || debitAmount == null) {
|
|
|
|
return ResponseEntity
|
|
|
|
return ResponseEntity
|
|
|
|
.badRequest()
|
|
|
|
.badRequest()
|
|
|
|
|