price_list_clg added

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

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

@@ -138,9 +138,9 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 			writeLog(filePtr,"G E T D A T A I N P R O C E S S ",false);
 			writeLog(filePtr,"S C O N T R A C T U P D A T E D",false);
 			ConnDriver connDriver = new ConnDriver();
-			//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 :START
+			//conn = connDriver.getConnectDB("DriverITM");
+			conn = getConnection();
 			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			System.out.println("xtraParams $$$$$$$$$$$$$$$$$$$$$$$$ "+xtraParams);
 			userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
@@ -169,10 +169,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 						count = rs.getInt("COUNT");
 						System.out.println("CONRACT_NO count is ::- "+count );
 						
-					}
-					rs.close();
-					rs = null;
-					stmt.close();
+					}
+					rs.close();
+					rs = null;
+					stmt.close();
 					stmt = null;
 					if(count == 0)
 					{
@@ -208,9 +208,9 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 						System.out.println("CUST_CODE count is ::- "+count );
 						writeLog(filePtr,"Count:-"+count,true);
 					}
-					rs.close();
+					rs.close();
 					rs = null;
-					stmt.close();
+					stmt.close();
 					stmt = null;
 					
 					
@@ -242,8 +242,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 							}
 							
 							rs.close();
-							stmt.close();
-							rs = null;
+							stmt.close();
+							rs = null;
 							stmt = null;
 							sql = "SELECT COUNT(1) AS COUNT FROM SCONTRACT WHERE CUST_CODE = '"+custCode+"' and CONTRACT_NO = '"+contractNo+"'" ;
 							writeLog(filePtr,"Detecting Record Exist In SCONTRACT   ["+sql+"]",true);
@@ -255,9 +255,9 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 								writeLog(filePtr,"Count[2]:::"+count2,true);
 								System.out.println("Count[2]::: ::- "+count2 );
 							}
-							rs.close();
-							rs = null;
-							stmt.close();
+							rs.close();
+							rs = null;
+							stmt.close();
 							stmt = null;
 							if(count1==0 && count2==0)
 							{
@@ -287,10 +287,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 				if(rs.next())
 				{
 					confirmed = rs.getString(1);
-				}
-				rs.close();
-				rs = null;
-				stmt.close();
+				}
+				rs.close();
+				rs = null;
+				stmt.close();
 				stmt = null;
 				System.out.println("confirmed =  "+confirmed );
 				if(confirmed.trim().equalsIgnoreCase("N"))
@@ -462,10 +462,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 	       			//Changed By PriyankaC on 16JAN18 [END..]
 
 				}//while
-	       		
-				rs.close();
-				rs = null;
-				pstmt.close();
+	       		
+				rs.close();
+				rs = null;
+				pstmt.close();
 				pstmt = null;
 				retTabSepStrBuff.append("</Header0></group0></DocumentRoot>"); //Added By PriyankaC on 17JAN2018
 			}//try
@@ -574,6 +574,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 		String consumeFc = "",projCode = "",currCodeCom = "",currCodeCom1 = "",currCodeCom2 = "",udfStr1 = "",udfStr3 = "",salesPers1 = "",salesPers2 = "";
 		String squantity = "",srelQty = "",itemCode = "",srelQtyPer = "",unit = "",sconvQtyStd = "",srate = "",unitRate = "",sconvRtuomStd = "",sdiscount = "";
 		String unitStd = "",srateStduom = "",packCode = "",packInstr = "",itemFlag = "",sqtyStuom = "",taxClass = "",taxChap = "",taxEnv = "",srateClg = "",snoArt = "";
+		String priceListClg="";// added by nandkumar gadkari on 03/05/19
 		NodeList parentNodeList = null;
 		NodeList childNodeList = null;
 		Node parentNode = null;
@@ -617,9 +618,9 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 			String tranDate = sdf1.format(date).toString();
 			
 			System.out.println("tranDate............."+tranDate);
-			//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 :START
+			//conn = connDriver.getConnectDB("DriverITM");
+			conn = getConnection();
 			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			conn.setAutoCommit(false);
 			//commented by rajendra for adding order_type
@@ -634,6 +635,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					+ "DIST_ROUTE,CONSUME_FC,PROJ_CODE,UDF__NUM1,UDF__NUM2,UDF__STR1,UDF__STR3,UDF__DATE1,"
 					+ "SALES_PERS__1,SALES_PERS__2,CURR_CODE__COMM,CURR_CODE__COMM_1,CURR_CODE__COMM_2,SITE_CODE,DLV_TERM,CR_TERM,  "
 					+ "CASE WHEN SITE_CODE__SHIP IS NULL THEN SITE_CODE ELSE SITE_CODE__SHIP END AS SITE_CODE__SHIP,TAX_CLASS,TAX_CHAP,TAX_ENV "
+					+ " ,PRICE_LIST__CLG " //added by nandkumar gadkari on 03/05/19  
 					+ "FROM SCONTRACT "
 					+ "WHERE CONTRACT_NO = '"+contractNo+"'";
 					writeLog(filePtr,"PROCESS SQL"+sql,true);
@@ -702,7 +704,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					System.out.println("taxChap.............."+taxChap);
 					taxEnv = rs.getString("TAX_ENV")== null ? "":rs.getString("TAX_ENV");
 					System.out.println("taxEnv.............."+taxEnv);
-							
+					priceListClg = rs.getString("PRICE_LIST__CLG");//added by nandkumar gadkari on 03/05/19		
 
 					// end of code on 2/27/2009 manazir
 					System.out.println("DLV_TERM.............."+dlvTerm);
@@ -711,8 +713,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					{
 						itemSer = "";
 					}
-				}
-				rs.close();
+				}
+				rs.close();
 				rs = null;
 				stmt.close();
 				stmt = null;
@@ -754,8 +756,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					tele2 = rs.getString(11); 
 					tele3 = rs.getString(12); 
 					fax = rs.getString(13);
-				}
-				rs.close();
+				}
+				rs.close();
 				rs = null;
 				stmt.close();
 				stmt = null;
@@ -803,8 +805,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 						  "QUOT_NO,PART_QTY,FRT_TERM,FRT_AMT,CURR_CODE__FRT,SALES_PERS,COMM_PERC,COMM_PERC_1,COMM_PERC_2,"+
 						  "COMM_PERC__ON,COMM_PERC_ON_2,ADV_PERC,DIST_ROUTE,CONSUME_FC,PROJ_CODE,UDF__NUM1,UDF__NUM2,UDF__STR1,"+
 						  "UDF__DATE1,SALES_PERS__1,SALES_PERS__2,CURR_CODE__COMM,CURR_CODE__COMM_1,CURR_CODE__COMM_2,CONTRACT_NO, " +
-						  "CONFIRMED, STATUS,DUE_DATE, SITE_CODE__SHIP, TAX_DATE,EMP_CODE__ORD,TAX_CLASS,TAX_CHAP,TAX_ENV,PL_DATE) "+
-						  "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'N','P',?,?,?,?,?,?,?,?)";
+						  "CONFIRMED, STATUS,DUE_DATE, SITE_CODE__SHIP, TAX_DATE,EMP_CODE__ORD,TAX_CLASS,TAX_CHAP,TAX_ENV,PL_DATE ,PRICE_LIST__CLG) "+ //PRICE_LIST__CLG column added by nandkumar gadkari on 03/05/19
+						  "VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,'N','P',?,?,?,?,?,?,?,?,?)";
 				//Commented and added by sarita to add pl_date in query and set orderDate to pl_date on 1 AUG 18 [END]
 				pstmt = conn.prepareStatement(sql);
 				
@@ -949,12 +951,13 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 				//Added by sarita to set orderDate to pl_date on 1 AUG 18 [START]
 				pstmt.setTimestamp(72,orderDate);
 				//Added by sarita to set orderDate to pl_date on 1 AUG 18 [END]
+				pstmt.setString(73,priceListClg);//PRICE_LIST__CLG column added by nandkumar gadkari on 03/05/19
 				int count = pstmt.executeUpdate(); 
 				System.out.println("No of records inserted into sorder........."+count);
-				pstmt.clearParameters();
-				pstmt.close();
+				pstmt.clearParameters();
+				pstmt.close();
 				pstmt = null;
-			}
+			}
 			
 			catch (SQLException ex)
 			{
@@ -1321,8 +1324,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 							cnt = pstmt.executeUpdate();
 							System.out.println("No of records updated in SCONTRACTDET for rel_qty is : "+cnt);
 							writeLog(filePtr," No of records updated in SCONTRACTDET for rel_qty is "+cnt,true);
-							pstmt.clearParameters();
-							pstmt.close();
+							pstmt.clearParameters();
+							pstmt.close();
 							pstmt = null;
 						}
 						catch (SQLException ex)
@@ -1336,8 +1339,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 							sql = "UPDATE SCONTRACTDET SET BAL_QTY_STDUOM = QUANTITY__STDUOM - CASE WHEN REL_QTY IS NULL THEN 0 ELSE REL_QTY END "
 								+ "WHERE CONTRACT_NO = '"+contractNo+"' AND LINE_NO = '"+line_No+"'";
 							stmt = conn.createStatement();
-							cnt = stmt.executeUpdate(sql);
-							stmt.close();
+							cnt = stmt.executeUpdate(sql);
+							stmt.close();
 							stmt = null;
 							System.out.println("No of records updated in SCONTRACTDET for bal_qty_stduom is : "+cnt);
 						}
@@ -1377,8 +1380,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 							if(rs.next())
 							{
 								itemDescr = rs.getString(1);
-							}
-							rs.close();
+							}
+							rs.close();
 							rs = null;
 							stmt.close();
 							stmt = null;
@@ -1407,8 +1410,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 							{
 								siteCode = rs.getString("SITE_CODE");
 								dspDate = rs.getTimestamp("DSP_DATE");
-							}
-							rs.close();
+							}
+							rs.close();
 							rs = null;
 							stmt.close();
 							stmt = null;
@@ -1523,8 +1526,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 							cnt = pstmt.executeUpdate();
 							writeLog(filePtr,"No of records inserted in SORDDET is : "+cnt,true);
 							System.out.println("No of records inserted in SORDDET is : "+cnt);
-							pstmt.clearParameters();
-							pstmt.close();
+							pstmt.clearParameters();
+							pstmt.close();
 							pstmt = null;
 						}//try
 						catch (SQLException ex)
@@ -1577,8 +1580,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 					pstmt.setDouble(1,ordAmtHdr);
 					pstmt.setDouble(2,taxAmtHdr);
 					pstmt.setDouble(3,totAmtHdr);
-					cnt = pstmt.executeUpdate();
-					pstmt.close();
+					cnt = pstmt.executeUpdate();
+					pstmt.close();
 					pstmt = null;
 					System.out.println("No of records updated in SORDER is : "+cnt);
 				}
@@ -1660,7 +1663,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 		String newKeystring = "";
 		try
 	 	{
-			//conn = connDriver.getConnectDB("DriverITM");
+			//conn = connDriver.getConnectDB("DriverITM");
 			sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = '"+windowName+"'";
 			stmt = conn.createStatement();
 			rs = stmt.executeQuery(sql);
@@ -1673,10 +1676,10 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 				keyString = rs.getString(1);
 				keyCol = rs.getString(2);
 				tranSer1 = rs.getString(3);				
-			}
-			rs.close();
-			rs = null;
-			stmt.close();
+			}
+			rs.close();
+			rs = null;
+			stmt.close();
 			stmt = null;
 			System.out.println("keyString :"+keyString);
 			System.out.println("keyCol :"+keyCol);
@@ -2097,8 +2100,8 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
 				}
 				pstmt.addBatch();
 		}
-		pstmt.executeBatch();
-		pstmt.close();
+		pstmt.executeBatch();
+		pstmt.close();
 		pstmt = null;
 	}
 	catch(SQLException se)