credit check condition

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

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

@@ -85,6 +85,7 @@ public class PostOrdCreditChk
 		//E12GenericUtility e12GenericUtility = new E12GenericUtility();		
 		ArrayList<String> retArrayList = new ArrayList<String>();
 		long startTime = 0, endTime = 0, totalTime = 0, totalHrs = 0, totlMts = 0, totSecs = 0; // Added
+		String crChkReq="",ordType="";//added by nandkumar gakari on 10/12/19-
 		try
 		{
 			startTime = System.currentTimeMillis();
@@ -123,7 +124,35 @@ public class PostOrdCreditChk
 			
 			/// new product order type should not be consider.
 			/// amish 01-10-03
-
+			//added by nandkumar gakari on 10/12/19--------------start-----------------------
+			lsSql = "select order_type  from sorder where sale_order =  ?" ;
+			pstmt = conn.prepareStatement(lsSql);
+			pstmt.setString(1,asSorder);
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				ordType = rs.getString("order_type");
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			lsSql = "select cr_chk__req  from sordertype where order_type =  ?" ;
+			pstmt = conn.prepareStatement(lsSql);
+			pstmt.setString(1,ordType);
+			rs = pstmt.executeQuery();
+			if (rs.next())
+			{
+				crChkReq = rs.getString("cr_chk__req");
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			crChkReq = crChkReq== null || crChkReq.trim().length() == 0 ? "Y" : crChkReq;
+			if("Y".equalsIgnoreCase(crChkReq))
+			{
+				//added by nandkumar gakari on 10/12/19--------------end-----------------------
 				lsOrdNewPrd = disCommon.getDisparams("999999","ORD_TYPE_NEWPRD",conn);
 				if ("NULLFOUND".equals(lsOrdNewPrd) || lsOrdNewPrd.trim().length() == 0 )
 				{
@@ -356,7 +385,7 @@ public class PostOrdCreditChk
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-*/
+	*/
 						//Changed By PriyankaC on 03June2019[END]
 						if ("P01".equals(lsCrPolicy.trim()) || "P21".equals(lsCrPolicy.trim()))
 						{
@@ -608,7 +637,7 @@ public class PostOrdCreditChk
 								        + " 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);
@@ -3516,7 +3545,7 @@ public class PostOrdCreditChk
 					System.out.println("@@@@ 3192 lsFail["+lsFail+"]::lsCrPolicy");
 					//Added Ruchira 08/06/2k6
 					//Credit check is failed so adding it into the asCheck array.
-//02/11/17 Pavan R start
+	//02/11/17 Pavan R start
 		/*		if("T".equalsIgnoreCase(lsFail))
 					{		//asCheck[ctr] = 'R99'+"\t"+asDespId+"\t"+asSorder+"\t"+'Dynamic credit check failed !!!'	//Commented Ruchira 08/06/2k6
 						//lsStr1 = 'Dynamic credit check failed !!!'	//Commented Ruchira 27/06/2k6
@@ -3562,7 +3591,7 @@ public class PostOrdCreditChk
 					//lsStr = String(adNetAmt)+"\t"+lsStr1+", "+lsStr3;
 					lsStr = String(adNetAmt)+" "+lsStr1+","+lsStr3;
 					System.out.println("@@@@@@3233 lsStr["+lsStr+"]");
-*/
+	*/
 		//02/11/17 Pavan R end
 					//			asCheck[ctr] = lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr
 					//			ctr = ctr + 1
@@ -3570,8 +3599,8 @@ public class PostOrdCreditChk
 					////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
 					//******************							gbf_credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
 					
-// Pavan Rane Start			
-/*				retArrayList =  credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
+	// Pavan Rane Start			
+	/*				retArrayList =  credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
 	
 					// added on 19/04/16 for status and amount
 					System.out.println("@@@@@@@@@  retArrayList.size()["+ retArrayList.size()+"]");
@@ -3726,7 +3755,7 @@ public class PostOrdCreditChk
 				totSecs = (int) (totSecs - ((totalHrs * 3600) + (totlMts * 60)));
 	
 				System.out.println("Total Time Spend credit check [" + totalHrs + "] Hours [" + totlMts + "] Minutes [" + totSecs + "] seconds");
-			
+			}	
 		}
 		catch( Exception e)
 		{