Added Code conn=getConnection().

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

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

@@ -91,7 +91,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 		FinCommon fincommon = new FinCommon();
 		DistCommon discommon = new DistCommon();
 		Timestamp amdDate = null, dlvDate = null, reqDate = null, ordDate = null;
-		String siteCodeOrd = "", purcOrder = "", status = "", confirmed = "", modName = "", siteCodeDlv = "", siteCodeBill = "", suppCode = "";
+		String siteCodeOrd = "", purcOrder = "", status = "",amdStatus="", confirmed = "", modName = "", siteCodeDlv = "", siteCodeBill = "", suppCode = "";
 		String suppCodeO = "", deptCode = "", empCode = "", itemSer = "", crTerm = "", purcOrderHdr = "";
 		String currCode = "", suppCurrCode = "", baseCurrCode = "", exchRate = "", amdDateStr = "";
 		String taxEnv = "", taxEnvpt = "", taxChap = "", taxChappt = "", taxClass = "", taxClasspt = "", projCode = "", quotNo = "", salesPers = "", varValue = "";
@@ -162,10 +162,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 		DistCommon distCommon = new DistCommon();
 		try {
 			System.out.println("@@@@@@@@ wfvaldata called");
-			//Changes and Commented By Bhushan on 09-06-2016 :START
 			//conn = connDriver.getConnectDB("DriverITM");
 			conn = getConnection();
-			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			connDriver = null;
 			userId = getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			if (objContext != null && objContext.trim().length() > 0) {
@@ -664,7 +662,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 								purcOrder = checkNull(genericUtility.getColumnValue("purc_order", dom));
 								lineNoOrd = "    " + lineNoOrd;
 								lineNoOrd = lineNoOrd.substring(lineNoOrd.length() - 3,lineNoOrd.length());
-
+								amdStatus = checkNull(genericUtility.getColumnValue("status", dom));
 								sql = " select status,dlv_qty,quantity from porddet where purc_order = ? and line_no = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, purcOrder);
@@ -676,7 +674,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 									status = rs.getString("status");
 									dlvQuty=rs.getDouble("dlv_qty");
 									qty=rs.getDouble("quantity");
+									
 								}
+								System.out.println("STATUS@@"+status);
+								System.out.println("amdStatus@@"+amdStatus);
+								
 								rs.close();
 								rs = null;
 								pstmt.close();
@@ -685,9 +687,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 								if ("C".equalsIgnoreCase(status)) 
 								{	
 									//Condition used for allow close to open PO
-									
-									if((qty-dlvQuty)>0)
+									System.out.println("STATUS@@"+status);
+									if((qty-dlvQuty)>0 && amdStatus.equals("O"))
 									{
+										System.out.println("status@(qty-dlvQuty)>0@"+status);
 										System.out.println("entered in@@::[(qty-dlvQuty)>0]::");
 										break;
 										
@@ -3572,10 +3575,8 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 			String sysDate = sdf.format(currentDate.getTime());
 			System.out.println("Now the date is :=>  " + sysDate);
 
-			//Changes and Commented By Bhushan on 09-06-2016 :START
 			//conn = connDriver.getConnectDB("DriverITM");
 			conn = getConnection();
-			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			conn.setAutoCommit(false);
 			connDriver = null;