Commit c1a24647 authored by msalla's avatar msalla

Unable to confirm the despatch

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213528 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b03361ae
...@@ -416,7 +416,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -416,7 +416,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodeSal == null || lsAcctCodeSal.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodeSal == null || lsAcctCodeSal.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTSLACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTSLACCT", "","", conn);
//return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodeSal); invAcctMap.put("cctr_code", lsCctrCodeSal);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -467,7 +472,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -467,7 +472,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodeDis == null || lsAcctCodeDis.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodeDis == null || lsAcctCodeDis.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTDISACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTDISACCT", "","", conn);
// return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodeDis); invAcctMap.put("cctr_code", lsCctrCodeDis);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -499,7 +509,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -499,7 +509,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodePr == null || lsAcctCodePr.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodePr == null || lsAcctCodePr.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn);
// return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodePr); invAcctMap.put("cctr_code", lsCctrCodePr);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -529,7 +544,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -529,7 +544,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodePr == null || lsAcctCodePr.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodePr == null || lsAcctCodePr.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTPRACCT", "","", conn);
// return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodePr); invAcctMap.put("cctr_code", lsCctrCodePr);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -777,7 +797,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -777,7 +797,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodeSal == null || lsAcctCodeSal.trim().length() == 0)// Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodeSal == null || lsAcctCodeSal.trim().length() == 0)// Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTSLACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTSLACCT", "","", conn);
//return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodeSal); invAcctMap.put("cctr_code", lsCctrCodeSal);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -824,7 +849,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -824,7 +849,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodeDis == null || lsAcctCodeDis.trim().length() == 0)// Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodeDis == null || lsAcctCodeDis.trim().length() == 0)// Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTDISACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTDISACCT", "","", conn);
//return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodeDis); invAcctMap.put("cctr_code", lsCctrCodeDis);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -882,7 +912,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -882,7 +912,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctCodeTax == null || lsAcctCodeTax.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTTXACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTTXACCT", "","", conn);
//return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrCodeTax); invAcctMap.put("cctr_code", lsCctrCodeTax);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -964,7 +999,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -964,7 +999,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(lsAcctReco == null || lsAcctReco.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(lsAcctReco == null || lsAcctReco.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTRECACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTRECACCT", "","", conn);
// return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", lsCctrReco); invAcctMap.put("cctr_code", lsCctrReco);
invAcctMap.put("anal_code", hdrAnalCode); invAcctMap.put("anal_code", hdrAnalCode);
...@@ -1037,7 +1077,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1037,7 +1077,12 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if(ls_acct_code__radj == null || ls_acct_code__radj.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null] if(ls_acct_code__radj == null || ls_acct_code__radj.trim().length() == 0) // Added by Mahesh Saggam on 29-07-2019 [account code should not be null]
{ {
retString = itmDBAccessEJB.getErrorString("", "VTRADJACCT", "","", conn); retString = itmDBAccessEJB.getErrorString("", "VTRADJACCT", "","", conn);
// return retString;
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString; return retString;
}//end
} }
invAcctMap.put("cctr_code", ls_cctr_code__radj); invAcctMap.put("cctr_code", ls_cctr_code__radj);
invAcctMap.put("amount",""+ ln_amount_radj); invAcctMap.put("amount",""+ ln_amount_radj);
...@@ -1060,7 +1105,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1060,7 +1105,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
retString = insertInvAcctList( invAcctList,conn ); retString = insertInvAcctList( invAcctList,conn );
//System.out.println("@@@@@1032 retString["+retString+"]"); //System.out.println("@@@@@1032 retString["+retString+"]");
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString;
}//end
//calling poonam code here start 13/06/16 cpatil //calling poonam code here start 13/06/16 cpatil
boolean lb_comm= false; boolean lb_comm= false;
...@@ -1096,6 +1145,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1096,6 +1145,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
//ls_errcode = lnvo_commission.gbf_calc_commission(ls_invoice_id[ll_cntr],'I','',ls_conf_drcr_opt,ls_conf_jv_opt) //ls_errcode = lnvo_commission.gbf_calc_commission(ls_invoice_id[ll_cntr],'I','',ls_conf_drcr_opt,ls_conf_jv_opt)
retString = calculateCommission.CalCommission(invoiceId, "I", "", confDrcrOpt, confJvOpt, xtraParams, conn); retString = calculateCommission.CalCommission(invoiceId, "I", "", confDrcrOpt, confJvOpt, xtraParams, conn);
//System.out.println("@@@@@1065 calculateCommission retString["+retString+"]"); //System.out.println("@@@@@1065 calculateCommission retString["+retString+"]");
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString;
}//end
}//end if }//end if
} }
...@@ -1461,7 +1515,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1461,7 +1515,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* sundry_bal update * sundry_bal update
* */ * */
retString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn); retString = finCommon.gbf_sundrybal_upd(sundryBalMap,conn);
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString;
}//end
} }
} }
rs.close(); rs.close();
...@@ -1811,6 +1869,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1811,6 +1869,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
retString = createRIBCA( InvoiceHrdMap, invoiceAcctList, conn); retString = createRIBCA( InvoiceHrdMap, invoiceAcctList, conn);
System.out.println("After createRIBCA retString ["+retString+"]"); System.out.println("After createRIBCA retString ["+retString+"]");
//Changed by wasim on 07-JUN-2017 for creating IBCA tranaction (Migration) [END] //Changed by wasim on 07-JUN-2017 for creating IBCA tranaction (Migration) [END]
//added by monika 13 dec 19 to check retstring null or not
if(retString != null && retString.trim().length() > 0)
{
return retString;
}//end
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -1876,6 +1939,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -1876,6 +1939,7 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
if("I".equals(gs_run_mode)) if("I".equals(gs_run_mode))
{ {
invIbcaGen = finCommon.getFinparams("999999","INV_IBCA_GEN",conn); invIbcaGen = finCommon.getFinparams("999999","INV_IBCA_GEN",conn);
System.out.println("createRIBCA--->INV_IBCA_GEN["+invIbcaGen+"]"); System.out.println("createRIBCA--->INV_IBCA_GEN["+invIbcaGen+"]");
if("NULLFOUND".equals(invIbcaGen)) if("NULLFOUND".equals(invIbcaGen))
...@@ -2329,6 +2393,13 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2329,6 +2393,13 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* */ * */
retString=finCommon.glTraceUpdate(glTraceMap,conn); retString=finCommon.glTraceUpdate(glTraceMap,conn);
//added by monika-13 dec-19-to return retstring
if(retString != null && retString.trim().length() > 0)
{
return retString;
}//end.
} }
...@@ -2536,6 +2607,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2536,6 +2607,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* gl_trace update * gl_trace update
* */ * */
retSting=finCommon.glTraceUpdate(glTraceMap,conn); retSting=finCommon.glTraceUpdate(glTraceMap,conn);
//added by monika 13 dec 19 to check retstring null or not
if(retSting != null && retSting.trim().length() > 0)
{
return retSting;
}//end
if(Math.abs(lcCramt) > 0) if(Math.abs(lcCramt) > 0)
{ {
...@@ -2548,6 +2624,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2548,6 +2624,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* gl_trace update * gl_trace update
* */ * */
retSting=finCommon.glTraceUpdate(glTraceMap,conn); retSting=finCommon.glTraceUpdate(glTraceMap,conn);
//added by monika 13 dec 19 to check retstring null or not
if(retSting != null && retSting.trim().length() > 0)
{
return retSting;
}//end
} }
//System.out.println("@@@@@@@@ disc_offinv_amt_hdr["+InvoiceHrdMap.get("disc_offinv_amt_hdr")+"]"); //System.out.println("@@@@@@@@ disc_offinv_amt_hdr["+InvoiceHrdMap.get("disc_offinv_amt_hdr")+"]");
...@@ -2629,6 +2710,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2629,6 +2710,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* gl_trace update * gl_trace update
* */ * */
retSting=finCommon.glTraceUpdate(glTraceMap,conn); retSting=finCommon.glTraceUpdate(glTraceMap,conn);
//added by monika 13 dec 19 to check retstring null or not
if(retSting != null && retSting.trim().length() > 0)
{
return retSting;
}//end
} }
if(Double.parseDouble(InvoiceHrdMap.get("disc_billback_amt_hdr"))>0) if(Double.parseDouble(InvoiceHrdMap.get("disc_billback_amt_hdr"))>0)
...@@ -2649,6 +2735,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2649,6 +2735,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
* gl_trace update * gl_trace update
* */ * */
retSting=finCommon.glTraceUpdate(glTraceMap,conn); retSting=finCommon.glTraceUpdate(glTraceMap,conn);
//added by monika 13 dec 19 to check retstring null or not
if(retSting != null && retSting.trim().length() > 0)
{
return retSting;
}//end
} }
sql="select count(*) as cnt from sord_cr_terms where sale_order = ? and cr_type = '03'"; sql="select count(*) as cnt from sord_cr_terms where sale_order = ? and cr_type = '03'";
...@@ -2777,6 +2868,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2777,6 +2868,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
retSting=gbfPostDrcradj(InvoiceHrdMap.get("invoice_id"),lineNoRef,conn); retSting=gbfPostDrcradj(InvoiceHrdMap.get("invoice_id"),lineNoRef,conn);
} }
//End Added by chandrashekar on 12-sep-2016 //End Added by chandrashekar on 12-sep-2016
//added by monika 13 dec 19 to check retstring null or not
if(retSting != null && retSting.trim().length() > 0)
{
return retSting;
}//end
} }
pstmt.close(); pstmt.close();
pstmt=null; pstmt=null;
...@@ -2852,6 +2948,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi ...@@ -2852,6 +2948,11 @@ public class PostOrdInvoicePost extends ActionHandlerEJB implements PostOrdInvoi
retSting=gbfPostDrcradj(InvoiceHrdMap.get("invoice_id"),lineNoRef,conn); retSting=gbfPostDrcradj(InvoiceHrdMap.get("invoice_id"),lineNoRef,conn);
} }
//End Added by chandrashekar on 12-sep-2016 //End Added by chandrashekar on 12-sep-2016
//added by monika 13 dec 19 to check retstring null or not
if(retSting != null && retSting.trim().length() > 0)
{
return retSting;
}//end
} }
} catch (ITMException e) } catch (ITMException e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment