Changed passwd generation logic for despatch on confirm

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

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

@@ -28,7 +28,7 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
-
+import java.util.Random;
 import org.w3c.dom.Document;
 @javax.ejb.Stateless
 public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirmLocal,DespatchConfirmRemote{
@@ -225,7 +225,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 		Timestamp expDate = null, mfgDate = null;
 		String siteCodeMfg = "", packCode = "";
 		Timestamp tranDate = null;
-
+		String confPasswd = "";
 		String poRcpTranId = "";//Modified by Anjali R. on [12/11/2018]
 		try
 		{
@@ -1460,13 +1460,20 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 
 			if(errString == null || errString.trim().length()== 0)
 			{
-				System.out.println("Insiding Despatch Confirmation!!!!!!");
-				sql = "update despatch set confirmed = 'Y', conf_date = ?  where desp_id = ?";
-
+				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 = ?";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setTimestamp(1,new Timestamp(System.currentTimeMillis()));
-				pstmt.setString(2,tranId);
-
+				pstmt.setString(2, confPasswd);
+				pstmt.setString(3,tranId);				
+				//Pavan Rane 20jun19 end [to generate password channel partner auto receitp]
 				int confirmCnt = pstmt.executeUpdate();
 
 				pstmt.close();

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

@@ -1650,9 +1650,9 @@ public class PostOrdDespatchGen
 				//System.out.println("@@@@ generated tranId :["+tranId+"]");
 				gpNo=generateGpNo("gpno",siteCde,tempMap.get("sord_no").toString(),conn);
 				//Pavan Rane 11jun19 start [to generate password channel partner auto receitp]
-				Random pwdGenerator = new Random();
+				/*Random pwdGenerator = new Random();
 				String confPasswd = "" + pwdGenerator.nextInt(12345678);
-				System.out.println("CPDespatch PWD #"+confPasswd);
+				System.out.println("CPDespatch PWD #"+confPasswd);*/
 				//Pavan Rane 11jun19 end
 				//Pavan Rane 11mar19 start [despatch generation instead of dire insert xml to be generated and processrequest to be called]
 				/*confirmed="N";
@@ -1803,11 +1803,11 @@ public class PostOrdDespatchGen
 				if(cpFlag)
 				{
 					xmlBuff.append("<channel_partner><![CDATA[" + "Y" + "]]></channel_partner>");
-					xmlBuff.append("<conf_passwd><![CDATA[" + confPasswd + "]]></conf_passwd>");
+					//xmlBuff.append("<conf_passwd><![CDATA[" + confPasswd + "]]></conf_passwd>");
 				}else 
 				{
 					xmlBuff.append("<channel_partner><![CDATA[" + "N" + "]]></channel_partner>");
-					xmlBuff.append("<conf_passwd><![CDATA[ ]]></conf_passwd>");
+					//xmlBuff.append("<conf_passwd><![CDATA[ ]]></conf_passwd>");
 				}
 				////Pavan Rane 11jun19 start			
 				xmlBuff.append("</Detail1>");