git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@202270 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/PostOrdCreditChk.java

@@ -557,13 +557,14 @@ public class PostOrdCreditChk
 						{
 							lsConsiderPbo = "Y";
 						}
+						System.out.println("***mTotOsAmt VAlues before addidng["+adNetAmt+"]mCrLimit["+mTotOsAmt);
 						if ("Y".equalsIgnoreCase(lsConsiderPbo))
 						{
 							/// amish 13-08-03
 							/// pick up the outstanding order amount. on the basis of the despatch percentage.
 							/// order should be pending and order should not be the same as the current order.
 							//Changed By PriyankaC on 03June2019.[Start]
-							/*lsSql = "SELECT round(sum( sorddet.net_amt * (100 - ( (case when sorditem.qty_desp is null then 0 else sorditem.qty_desp end ) / sorditem.qty_ord * 100) ) / 100 ),3) pend_amt "
+							lsSql = "SELECT round(sum( sorddet.net_amt * (100 - ( (case when sorditem.qty_desp is null then 0 else sorditem.qty_desp end ) / sorditem.qty_ord * 100) ) / 100 ),3) pend_amt "
 									+ " FROM sorddet, sorder, sorditem " 
 									+ " WHERE ( sorddet.sale_order = sorditem.sale_order ) "
 									+ " and ( sorddet.line_no = sorditem.line_no ) "
@@ -575,22 +576,22 @@ public class PostOrdCreditChk
 									+ " and ( sorditem.qty_ord > 0 ) "
 									+ " and ( sorder.item_ser in (select item_ser from itemser "
 									+ " where (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end ) = ?)) ";
-*/
-							lsSql = "SELECT round(sum( (case when sorddet.net_amt = 0 then sorddet.ord_value else sorddet.net_amt end )  * (100 - ( (case when sorditem.qty_desp is null then 0 else sorditem.qty_desp end ) / sorditem.qty_ord * 100) ) / 100 ),3) pend_amt "
+
+							/*lsSql = "SELECT round(sum( (case when sorddet.net_amt = 0 then sorddet.ord_value else sorddet.net_amt end )  * (100 - ( (case when sorditem.qty_desp is null then 0 else sorditem.qty_desp end ) / sorditem.qty_ord * 100) ) / 100 ),3) pend_amt "
 									+ " FROM sorddet, sorder, sorditem " 
 									+ " WHERE ( sorddet.sale_order = sorditem.sale_order ) "
 									+ " and ( sorddet.line_no = sorditem.line_no ) "
 									+ " and ( sorder.sale_order = sorddet.sale_order ) "
 									+ " and ( sorder.cust_code__bil = ? ) "
-									+ " and ( sorder.status = 'P' ) "
-									+ " and ( sorder.confirmed = 'Y' )"
-									+ " and ( sorder.order_type <> ? ) "
-									+ " and ( sorditem.qty_ord > 0 ) "
-									+ " and ( sorder.item_ser in (select item_ser from itemser "
-									+ " where (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end ) = ?)) ";
+									+  "and ( sorder.status not in ('C','X') )"
+  								    + " and ( sorder.confirmed = 'Y' )";
+							        +" and ( sorder.order_type <> ? ) "
+							        + " and ( sorditem.qty_ord > 0 ) "
+							        + " and ( sorder.item_ser in (select item_ser from itemser "
+							        + " where (case when item_ser__crpolicy is null then item_ser else item_ser__crpolicy end ) = ?)) ";
 
 							//Changed By PriyankaC on 03June2019.[END]
-							pstmt = conn.prepareStatement(lsSql);
+*/							pstmt = conn.prepareStatement(lsSql);
 							if("P02".equals(lsCrPolicy.trim()))
 							{
 								pstmt.setString(1,asCustCodeBil);
@@ -617,7 +618,8 @@ public class PostOrdCreditChk
 						{
 							lcPendOrd = 0;
 						}
-
+						//System.out.println("Total Pending Amount after sql executation["+lcPendOrd);
+					 	System.out.println("***mTotOsAmt["+mTotOsAmt+"]adNetAmt["+adNetAmt  +"lcPendOrd"+ lcPendOrd);
 						//TAKING INTO CONSIDERATION THE CURRENT INVOICE AMOUNT
 						mTotOsAmt = mTotOsAmt + adNetAmt + lcPendOrd;
 						lsSql = "select sum(case when credit_lmt is null then 0 else credit_lmt end ) cr_limit "