Commit 58fc1331 authored by jshaikh's avatar jshaikh

Multi-tendency changes

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179592 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 43327faf
package ibase.webitm.ejb.dis; package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -8,10 +9,9 @@ import java.sql.Connection; ...@@ -8,10 +9,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
public class AdjustmentIssueWF public class AdjustmentIssueConfWF
{ {
public String confirm(String tranId, String empCodeAprv, String xmlDataAll, String processId, String keyFlag) public String confirm(String tranId, String empCodeAprv, String xmlDataAll, String processId, String keyFlag, String userInfoStr) throws RemoteException, ITMException
throws RemoteException, ITMException
{ {
System.out.println("Parameters ::: tranId[" + tranId + "],empCodeAprv[" + empCodeAprv + "],xmlDataAll[" + xmlDataAll + "],processId[" + processId + "],keyFlag[" + keyFlag + "]"); System.out.println("Parameters ::: tranId[" + tranId + "],empCodeAprv[" + empCodeAprv + "],xmlDataAll[" + xmlDataAll + "],processId[" + processId + "],keyFlag[" + keyFlag + "]");
String retString = ""; String retString = "";
...@@ -24,10 +24,18 @@ public class AdjustmentIssueWF ...@@ -24,10 +24,18 @@ public class AdjustmentIssueWF
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//conn = getConnection(); //conn = getConnection();
connDriver = null; UserInfoBean userInfo = new UserInfoBean(userInfoStr);
String transDB = userInfo.getTransDB();
if (transDB != null && transDB.trim().length() > 0)
{
conn = connDriver.getConnectDB(transDB);
}
connDriver = null;
conn.setAutoCommit(false); conn.setAutoCommit(false);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim(); empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
if ((xmlDataAll != null) && (xmlDataAll.trim().length() != 0)) { if ((xmlDataAll != null) && (xmlDataAll.trim().length() != 0)) {
......
package ibase.webitm.ejb.dis; package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
...@@ -8,9 +9,9 @@ import java.sql.Connection; ...@@ -8,9 +9,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.SQLException; import java.sql.SQLException;
public class AdjustmentReceiptWF public class AdjustmentReceiptConfWF
{ {
public String confirm(String tranId, String empCodeAprv, String xmlDataAll, String processId, String keyFlag) throws RemoteException, ITMException public String confirm(String tranId, String empCodeAprv, String xmlDataAll, String processId, String keyFlag, String userInfoStr) throws RemoteException, ITMException
{ {
String retString = ""; String retString = "";
...@@ -23,9 +24,17 @@ public class AdjustmentReceiptWF ...@@ -23,9 +24,17 @@ public class AdjustmentReceiptWF
try { try {
System.out.println("Exception in Try block of AdjustmentReceiptWF.confirm()"); System.out.println("Exception in Try block of AdjustmentReceiptWF.confirm()");
conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
UserInfoBean userInfo = new UserInfoBean(userInfoStr);
String transDB = userInfo.getTransDB();
if (transDB != null && transDB.trim().length() > 0)
{
conn = connDriver.getConnectDB(transDB);
}
connDriver = null; connDriver = null;
conn.setAutoCommit(false); conn.setAutoCommit(false);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim(); empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
if ((xmlDataAll != null) && (xmlDataAll.trim().length() != 0)) if ((xmlDataAll != null) && (xmlDataAll.trim().length() != 0))
......
...@@ -49,10 +49,10 @@ public class IndentReqConfWF ...@@ -49,10 +49,10 @@ public class IndentReqConfWF
if (transDB != null && transDB.trim().length() > 0) if (transDB != null && transDB.trim().length() > 0)
{ {
conn = connDriver.getConnectDB(transDB); conn = connDriver.getConnectDB(transDB);
} }
conn.setAutoCommit(false);
connDriver = null; connDriver = null;
conn.setAutoCommit(false);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim(); empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
......
...@@ -8,6 +8,7 @@ package ibase.webitm.ejb.dis; ...@@ -8,6 +8,7 @@ package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import java.net.URL; import java.net.URL;
...@@ -29,7 +30,7 @@ import org.apache.axis.encoding.XMLType; ...@@ -29,7 +30,7 @@ import org.apache.axis.encoding.XMLType;
@Stateless @Stateless
public class SaleReturnConfWF implements SaleReturnConfWFRemote, SaleReturnConfWFLocal { public class SaleReturnConfWF implements SaleReturnConfWFRemote, SaleReturnConfWFLocal {
public String confirm(String tran_id, String empCodeAprv, String loginSiteCode, String keyFlag) throws RemoteException, ITMException { public String confirm(String tran_id, String empCodeAprv, String loginSiteCode, String keyFlag, String userInfoStr) throws RemoteException, ITMException {
System.out.println("SaleReturnConfWF confirm method invocation"); System.out.println("SaleReturnConfWF confirm method invocation");
System.out.println("Parameters ::: qorder_no["+tran_id+"],empCodeAprv["+empCodeAprv+"],keyFlag["+keyFlag+"]"); System.out.println("Parameters ::: qorder_no["+tran_id+"],empCodeAprv["+empCodeAprv+"],keyFlag["+keyFlag+"]");
String loginCode = ""; String loginCode = "";
...@@ -47,10 +48,18 @@ public class SaleReturnConfWF implements SaleReturnConfWFRemote, SaleReturnConfW ...@@ -47,10 +48,18 @@ public class SaleReturnConfWF implements SaleReturnConfWFRemote, SaleReturnConfW
} }
else{ else{
try { try {
conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//conn = getConnection(); //conn = getConnection();
UserInfoBean userInfo = new UserInfoBean(userInfoStr);
String transDB = userInfo.getTransDB();
if (transDB != null && transDB.trim().length() > 0)
{
conn = connDriver.getConnectDB(transDB);
}
connDriver = null; connDriver = null;
conn.setAutoCommit(false); conn.setAutoCommit(false);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim(); empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
String methodName = ""; String methodName = "";
......
...@@ -7,5 +7,5 @@ import javax.ejb.Local; ...@@ -7,5 +7,5 @@ import javax.ejb.Local;
@Local @Local
public interface SaleReturnConfWFLocal { public interface SaleReturnConfWFLocal {
public String confirm(String tran_id, String empCodeAprv, String loginSiteCode, String keyFlag) throws RemoteException, ITMException; public String confirm(String tran_id, String empCodeAprv, String loginSiteCode, String keyFlag, String userInfoStr) throws RemoteException, ITMException;
} }
...@@ -7,5 +7,5 @@ import javax.ejb.Remote; ...@@ -7,5 +7,5 @@ import javax.ejb.Remote;
@Remote @Remote
public interface SaleReturnConfWFRemote { public interface SaleReturnConfWFRemote {
public String confirm(String tran_id, String empCodeAprv, String loginSiteCode, String keyFlag) throws RemoteException, ITMException; public String confirm(String tran_id, String empCodeAprv, String loginSiteCode, String keyFlag, String userInfoStr) throws RemoteException, ITMException;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment