Commit 87ba655b authored by prane's avatar prane

bug fixed @ credit check policy case.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190762 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6fb95c3e
...@@ -1421,7 +1421,7 @@ public class PostOrdCreditChk ...@@ -1421,7 +1421,7 @@ public class PostOrdCreditChk
lcPickRate = 0; lcPickRate = 0;
lsSql = "select (case when fn_pick_rate(?, ?, ?, ' ', 'L') is null then 0 " lsSql = "select (case when fn_pick_rate(?, ?, ?, ' ', 'L') is null then 0 "
+ " else fn_pick_rate(?, ?, :lsItemCode, ' ', 'L') end) as pick_rate " + " else fn_pick_rate(?, ?, ?, ' ', 'L') end) as pick_rate "
+ " from dual"; + " from dual";
pstmt1 = conn.prepareStatement(lsSql); pstmt1 = conn.prepareStatement(lsSql);
pstmt1.setString(1,lsPriceList); pstmt1.setString(1,lsPriceList);
...@@ -2482,14 +2482,15 @@ public class PostOrdCreditChk ...@@ -2482,14 +2482,15 @@ public class PostOrdCreditChk
{ {
lsStr3 = " , Sales Order Amt.=> " + adNetAmt; lsStr3 = " , Sales Order Amt.=> " + adNetAmt;
} }
lsStr = lcCheckAmt + "\t" + lsStr1 + ", " + lsStr2 + ", " + lsStr3;
if (lcCheckAmt > 0 ) if (lcCheckAmt > 0 )
{ {
lsStr = lsStr + ", Overriden amount exceeds."; lsStr = lsStr + ", Overriden amount exceeds.";
} }
if (lcCheckAmt > 0 ) /*if (lcCheckAmt > 0 )
{ {
lsStr = lsStr + ", Overriden amount exceeds."; lsStr = lsStr + ", Overriden amount exceeds.";
} }*/
////Always when credit check fails it must get added into as_mail. ////Always when credit check fails it must get added into as_mail.
if (!"O".equals(lsStatus)) if (!"O".equals(lsStatus))
{ {
...@@ -3234,7 +3235,8 @@ public class PostOrdCreditChk ...@@ -3234,7 +3235,8 @@ public class PostOrdCreditChk
System.out.println("@@@@@@3229 adNetAmt["+adNetAmt+"]lsStr1["+lsStr1+"]lsStr3["+lsStr3+"]"); System.out.println("@@@@@@3229 adNetAmt["+adNetAmt+"]lsStr1["+lsStr1+"]lsStr3["+lsStr3+"]");
//lsStr = String(adNetAmt)+"\t"+lsStr1+", "+lsStr3; //lsStr = String(adNetAmt)+"\t"+lsStr1+", "+lsStr3;
lsStr = String(adNetAmt)+" "+lsStr1+","+lsStr3; //lsStr = String(adNetAmt)+" "+lsStr1+","+lsStr3;
lsStr = lcCheckAmt+"\t"+String(adNetAmt)+" "+lsStr1+","+lsStr3;
System.out.println("@@@@@@3233 lsStr["+lsStr+"]"); System.out.println("@@@@@@3233 lsStr["+lsStr+"]");
...@@ -3266,8 +3268,9 @@ public class PostOrdCreditChk ...@@ -3266,8 +3268,9 @@ public class PostOrdCreditChk
//asCheck[ctr] = lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr; //asCheck[ctr] = lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr;
//ctr = ctr + 1; //ctr = ctr + 1;
//asCheckList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr); //asCheckList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
//Pavan R on 14sept18 [to handle NumberFormatException in writeBusinessLogicCheck()]
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr+"\t"+lcCheckAmt+"\t"+lsStatus); //failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr+"\t"+lcCheckAmt+"\t"+lsStatus);
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr+"\t"+lsStatus);
System.out.println("@@@@@@@@@@@failedPolicyList Size["+failedPolicyList.size()+"]"); System.out.println("@@@@@@@@@@@failedPolicyList Size["+failedPolicyList.size()+"]");
System.out.println("@@@@@@@@@@@ failedPolicyList ["+failedPolicyList+"]"); System.out.println("@@@@@@@@@@@ failedPolicyList ["+failedPolicyList+"]");
} }
......
...@@ -1516,12 +1516,15 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -1516,12 +1516,15 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
} }
if( strArray.length > 3 ) if( strArray.length > 3 )
{ {
lsStr=strArray[3];
//lsStr=strArray[3];//Pavan R on 14sept18 [to handle NumberFormatException from lsStr in failedPolicyList]
chkamt =(Double.parseDouble(strArray[3]));
} }
//Added by Pavan R on 27/OCT/17 //Added by Pavan R on 27/OCT/17
if( strArray.length > 4 ) if( strArray.length > 4 )
{ {
chkamt =(Double.parseDouble(strArray[4])); //chkamt =(Double.parseDouble(strArray[4]));//Pavan R on 14sept18 [to handle NumberFormatException from lsStr in failedPolicyList]
lsStr=strArray[4];
} }
if( strArray.length > 5 ) if( strArray.length > 5 )
{ {
......
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