Changed passwd generation logic for despatch on confirm

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

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

@@ -459,7 +459,63 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 					pstmt1 = null;
 
 				}
+				//Changed by Pavan R 20jun2019 start
+				sql = "select channel_partner,dis_link,site_code__ch from  site_customer where  cust_code = ? and site_code = ? ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1,custCodeDlv);
+				pstmt.setString(2,siteCode);
+				rs = pstmt.executeQuery();
+				//23-Nov-16 Manoharan
+				//while(rs.next())
+				if(rs.next())
+				{
+					channelPartner = checkNull(rs.getString("channel_partner"));
+					disLink = checkNull(rs.getString("dis_link"));
+					siteCodeDlv = checkNull(rs.getString("site_code__ch"));
+
+					if(channelPartner == null)//not found in above query
+					{
+						sql1 = "select channel_partner,dis_link, site_code	from  customer where  cust_code = ? ";
+						pstmt1 = conn.prepareStatement(sql1);
+						pstmt1.setString(1,custCodeDlv);
+						rs1 = pstmt1.executeQuery();
+						if(rs1.next())
+						{
+							channelPartner = checkNull(rs1.getString("channel_partner"));
+							disLink = checkNull(rs1.getString("dis_link"));
+							siteCodeDlv = checkNull(rs1.getString("site_code__ch"));
+
+							if(channelPartner == null)
+							{
+								channelPartner = "N";
+							}
+						}
+						pstmt1.close();
+						pstmt1 = null;
+						rs1.close();
+						rs1 = null;
 
+					}	
+				}
+				pstmt.close();
+				pstmt = null;
+				rs.close();
+				rs = null;
+				//Pavan Rane 20jun19 start [to generate password channel partner auto receitp]
+				if("Y".equalsIgnoreCase(channelPartner) &&  ("E".equalsIgnoreCase(disLink) || "A".equalsIgnoreCase(disLink)))
+				{										
+					Random pwdGenerator = new Random();
+					confPasswd = "" + pwdGenerator.nextInt(12345678);
+					System.out.println("CPDespatch PWD #"+confPasswd);
+				}					
+				sql = "update despatch set conf_passwd = ?  where desp_id = ?";
+				pstmt = conn.prepareStatement(sql);			
+				pstmt.setString(1, confPasswd);
+				pstmt.setString(2, tranId);	
+				pstmt.close();
+				pstmt = null;
+				//Pavan Rane 20jun19 end [to generate password channel partner auto receitp]
+				
 				//despatch_edit.setitem(ll_ctr,"confirmed", 'Y')	//Ruchira 21/09/2k5 taken out of abovve if ... endif statement.
 				//		CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
 
@@ -610,7 +666,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						}//end of hld condn...
 
 
-						sql = "select channel_partner,dis_link,site_code__ch from  site_customer where  cust_code = ? and site_code = ? ";
+						/*sql = "select channel_partner,dis_link,site_code__ch from  site_customer where  cust_code = ? and site_code = ? ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,custCodeDlv);
 						pstmt.setString(2,siteCode);
@@ -651,7 +707,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 						pstmt = null;
 						rs.close();
 						rs = null;
-						//23-Nov-16 Manoharan
+*/						//23-Nov-16 Manoharan
 						//if(channelPartner == "N")
 						if("N".equals(channelPartner))
 						{
@@ -1460,20 +1516,12 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 			if(errString == null || errString.trim().length()== 0)
 			{
-				System.out.println("Insiding Despatch Confirmation!!!!!!channelPartner["+channelPartner+"]");
-				//Pavan Rane 20jun19 start [to generate password channel partner auto receitp]
-				if("Y".equalsIgnoreCase(channelPartner) &&  ("E".equalsIgnoreCase(disLink) || "A".equalsIgnoreCase(disLink)))
-				{										
-					Random pwdGenerator = new Random();
-					confPasswd = "" + pwdGenerator.nextInt(12345678);
-					System.out.println("CPDespatch PWD #"+confPasswd);
-				}					
-				sql = "update despatch set confirmed = 'Y', conf_date = ?, conf_passwd = ?  where desp_id = ?";
+				System.out.println("Insiding Despatch Confirmation!!!!!!");
+				
+				sql = "update despatch set confirmed = 'Y', conf_date = ? where desp_id = ?";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setTimestamp(1,new Timestamp(System.currentTimeMillis()));
-				pstmt.setString(2, confPasswd);
-				pstmt.setString(3,tranId);				
-				//Pavan Rane 20jun19 end [to generate password channel partner auto receitp]
+				pstmt.setTimestamp(1,new Timestamp(System.currentTimeMillis()));				
+				pstmt.setString(2,tranId);
 				int confirmCnt = pstmt.executeUpdate();
 
 				pstmt.close();