Skip to content

B
business-java
Commit 58fc1331 authored by jshaikh's avatar jshaikh
Browse files
Options

Multi-tendency changes 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@179592 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 43327faf
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 16 deletions
webitm-dis/ibase/webitm/ejb/dis/AdjustmentIssueWF.java → webitm-dis/ibase/webitm/ejb/dis/AdjustmentIssueConfWF.java
View file @ 58fc1331
package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
......@@ -8,10 +9,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
public class AdjustmentIssueWF
public class AdjustmentIssueConfWF
{
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
{
System.out.println("Parameters ::: tranId[" + tranId + "],empCodeAprv[" + empCodeAprv + "],xmlDataAll[" + xmlDataAll + "],processId[" + processId + "],keyFlag[" + keyFlag + "]");
String retString = "";
......@@ -24,10 +24,18 @@ public class AdjustmentIssueWF
try
{
conn = connDriver.getConnectDB("DriverITM");
//conn = connDriver.getConnectDB("DriverITM");
//conn = getConnection();
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);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
if ((xmlDataAll != null) && (xmlDataAll.trim().length() != 0)) {
......
webitm-dis/ibase/webitm/ejb/dis/AdjustmentReceiptWF.java → webitm-dis/ibase/webitm/ejb/dis/AdjustmentReceiptConfWF.java
View file @ 58fc1331
package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
......@@ -8,9 +9,9 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
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 = "";
......@@ -23,9 +24,17 @@ public class AdjustmentReceiptWF
try {
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;
conn.setAutoCommit(false);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
if ((xmlDataAll != null) && (xmlDataAll.trim().length() != 0))
......
webitm-dis/ibase/webitm/ejb/dis/IndentReqConfWF.java
View file @ 58fc1331
......@@ -50,8 +50,8 @@ public class IndentReqConfWF
{
conn = connDriver.getConnectDB(transDB);
}
conn.setAutoCommit(false);
connDriver = null;
conn.setAutoCommit(false);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
......
webitm-dis/ibase/webitm/ejb/dis/SaleReturnConfWF.java
View file @ 58fc1331
......@@ -8,6 +8,7 @@ package ibase.webitm.ejb.dis;
import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import java.net.URL;
......@@ -29,7 +30,7 @@ import org.apache.axis.encoding.XMLType;
@Stateless
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("Parameters ::: qorder_no["+tran_id+"],empCodeAprv["+empCodeAprv+"],keyFlag["+keyFlag+"]");
String loginCode = "";
......@@ -47,10 +48,18 @@ public class SaleReturnConfWF implements SaleReturnConfWFRemote, SaleReturnConfW
}
else{
try {
conn = connDriver.getConnectDB("DriverITM");
//conn = connDriver.getConnectDB("DriverITM");
//conn = getConnection();
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);
empCodeAprv = empCodeAprv == null ? "" : empCodeAprv.trim();
String methodName = "";
......
webitm-dis/ibase/webitm/ejb/dis/SaleReturnConfWFLocal.java
View file @ 58fc1331
......@@ -7,5 +7,5 @@ import javax.ejb.Local;
@Local
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;
}
webitm-dis/ibase/webitm/ejb/dis/SaleReturnConfWFRemote.java
View file @ 58fc1331
......@@ -7,5 +7,5 @@ import javax.ejb.Remote;
@Remote
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