Commit aedfcc9f authored by praut's avatar praut

Changes regarding updated framework components

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198788 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 861fdcf9
...@@ -7,16 +7,11 @@ import java.util.ArrayList; ...@@ -7,16 +7,11 @@ import java.util.ArrayList;
import javax.naming.InitialContext; import javax.naming.InitialContext;
//import ibase.planner.utility.ITMException;
import ibase.planner.utility.ITMException;
import ibase.system.config.AppConnectParm; import ibase.system.config.AppConnectParm;
import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.ejb.dis.*;
import ibase.webitm.ejb.sys.UtilMethods;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.utility.ITMException;
public class AssetInstall { public class AssetInstall {
......
...@@ -2510,7 +2510,14 @@ AssetSalesConfLocal,AssetSalesConfRemote ...@@ -2510,7 +2510,14 @@ AssetSalesConfLocal,AssetSalesConfRemote
String userId = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginCode"); String userId = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
// siteCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); // siteCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
DBAccessEJB dbAccess =new DBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18 DBAccessEJB dbAccess =new DBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18
String[] userInfoArray = dbAccess.getEmpInfo(userId, siteCode); //Changed by Prasad on 26/03/19 [pass transdb to getEmpInfo method] START
String transDb = "";
if ( getUserInfo() != null )
{
transDb = getUserInfo().getTransDB();
}
String[] userInfoArray = dbAccess.getEmpInfo( userId, siteCode, transDb );
//Changed by Prasad on 26/03/19 [pass transdb to getEmpInfo method] END
System.out.println("^^^^^^^ UserInfo ..> " + Arrays.toString(userInfoArray)); System.out.println("^^^^^^^ UserInfo ..> " + Arrays.toString(userInfoArray));
UserInfoBean userInfoBean = new UserInfoBean(); UserInfoBean userInfoBean = new UserInfoBean();
userInfoBean.setLoginCode(userId); userInfoBean.setLoginCode(userId);
......
...@@ -17,7 +17,7 @@ import ibase.webitm.ejb.*; ...@@ -17,7 +17,7 @@ import ibase.webitm.ejb.*;
import org.w3c.dom.*; import org.w3c.dom.*;
import com.itextpdf.text.log.SysoCounter; //import com.itextpdf.text.log.SysoCounter;
import ibase.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon; import ibase.webitm.ejb.fin.FinCommon;
......
...@@ -298,7 +298,9 @@ public class MiscPayAuto extends ValidatorEJB implements MiscPayAutoLocal,MiscPa ...@@ -298,7 +298,9 @@ public class MiscPayAuto extends ValidatorEJB implements MiscPayAutoLocal,MiscPa
} }
java.util.Date tranDate = sdf.parse(payDate.substring(0,8)); java.util.Date tranDate = sdf.parse(payDate.substring(0,8));
siteCode = genericUtility.getColumnValue("site_code__fr",dom); siteCode = genericUtility.getColumnValue("site_code__fr",dom);
errCode = nfCheckPeriod("FIN",tranDate,siteCode); //Changed by Prasad on 26/03/19 [passing connection to this method]
//errCode = nfCheckPeriod("FIN",tranDate,siteCode);
errCode = nfCheckPeriod("FIN",tranDate,siteCode,conn);
if(errCode != null && errCode.trim().length() > 0){ if(errCode != null && errCode.trim().length() > 0){
errString = itmDBAccess.getErrorString("site_code__fr",errCode,userId,"",conn);// changes by Nandkumar Gadkari on 20/07/18 errString = itmDBAccess.getErrorString("site_code__fr",errCode,userId,"",conn);// changes by Nandkumar Gadkari on 20/07/18
break; break;
......
...@@ -316,7 +316,12 @@ public class PurcVchrMultiAttachmentBean ...@@ -316,7 +316,12 @@ public class PurcVchrMultiAttachmentBean
InitialContext ctx = new InitialContext(new AppConnectParm().getProperty()); InitialContext ctx = new InitialContext(new AppConnectParm().getProperty());
DBAccessEJB dbAccess =new DBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18 DBAccessEJB dbAccess =new DBAccessEJB();// changes by Nandkumar Gadkari on 20/07/18
refSer = dbAccess.getRefSer(null, objName); refSer = dbAccess.getRefSer(null, objName);
//Changed by Prasad on 26/03/19 [passing transDB to documentHandlerEJB method]
String transDB = "";
if ( userInfo != null )
{
transDB = userInfo.getTransDB();
}
DocumentHandlerEJB docHandler = new DocumentHandlerEJB();// changes by Nandkumar Gadkari on 20/07/18 DocumentHandlerEJB docHandler = new DocumentHandlerEJB();// changes by Nandkumar Gadkari on 20/07/18
if (refId != null && refId.indexOf(",") != -1) if (refId != null && refId.indexOf(",") != -1)
{ {
...@@ -324,7 +329,8 @@ public class PurcVchrMultiAttachmentBean ...@@ -324,7 +329,8 @@ public class PurcVchrMultiAttachmentBean
{ {
DocumentHandlerWrapperEJB docWrapperHandler = new DocumentHandlerWrapperEJB(); DocumentHandlerWrapperEJB docWrapperHandler = new DocumentHandlerWrapperEJB();
System.out.println("@V@ In PurcVchrMultiAttachmentBean docWrapperHandler[" + docWrapperHandler + "]"); System.out.println("@V@ In PurcVchrMultiAttachmentBean docWrapperHandler[" + docWrapperHandler + "]");
xmlData = docWrapperHandler.getMultiDocumentInfoList(refSer, refId, refCol); //xmlData = docWrapperHandler.getMultiDocumentInfoList(refSer, refId, refCol);
xmlData = docWrapperHandler.getMultiDocumentInfoList(refSer, refId, refCol, transDB);
docWrapperHandler =null; docWrapperHandler =null;
} catch (Exception e) } catch (Exception e)
{ {
...@@ -334,7 +340,8 @@ public class PurcVchrMultiAttachmentBean ...@@ -334,7 +340,8 @@ public class PurcVchrMultiAttachmentBean
} else } else
{ {
xmlData = docHandler.getDocumentInfoList(refSer, refId, refCol); //xmlData = docHandler.getDocumentInfoList(refSer, refId, refCol);
xmlData = docHandler.getDocumentInfoList(refSer, refId, refCol, transDB);
} }
dbAccess =null; // added by Nandkumar Gadkari on 20/07/18 dbAccess =null; // added by Nandkumar Gadkari on 20/07/18
docHandler= null; docHandler= null;
...@@ -391,6 +398,11 @@ public class PurcVchrMultiAttachmentBean ...@@ -391,6 +398,11 @@ public class PurcVchrMultiAttachmentBean
} }
String pkValues = refId; String pkValues = refId;
System.out.println("pkValues==== " + pkValues); System.out.println("pkValues==== " + pkValues);
String transDB = "";
if ( userInfo != null )
{
transDB = userInfo.getTransDB();
}
InitialContext ctx = new InitialContext(new AppConnectParm().getProperty()); InitialContext ctx = new InitialContext(new AppConnectParm().getProperty());
...@@ -398,10 +410,12 @@ public class PurcVchrMultiAttachmentBean ...@@ -398,10 +410,12 @@ public class PurcVchrMultiAttachmentBean
DocumentHandlerEJB docHandler = new DocumentHandlerEJB();// changes by Nandkumar Gadkari on 20/07/18 DocumentHandlerEJB docHandler = new DocumentHandlerEJB();// changes by Nandkumar Gadkari on 20/07/18
if (pkValues != null && !pkValues.isEmpty()) if (pkValues != null && !pkValues.isEmpty())
{ {
String addedByUserId = docHandler.docAddedBy(docId); //String addedByUserId = docHandler.docAddedBy(docId);
String addedByUserId = docHandler.docAddedBy(docId, transDB);
System.out.println("addedByUserId = [" + addedByUserId + "]"); System.out.println("addedByUserId = [" + addedByUserId + "]");
boolean isAuthorized = dbAccess.deleteAttachmentAuth(docId, userLevel, profileId, loginCode, objName, pkValues, addedByUserId); //boolean isAuthorized = dbAccess.deleteAttachmentAuth(docId, userLevel, profileId, loginCode, objName, pkValues, addedByUserId);
boolean isAuthorized = dbAccess.deleteAttachmentAuth(docId, userLevel, profileId, loginCode, objName, pkValues, addedByUserId, transDB);
System.out.println("isAuthorized = [" + isAuthorized + "]"); System.out.println("isAuthorized = [" + isAuthorized + "]");
if (isAuthorized) if (isAuthorized)
...@@ -574,14 +588,21 @@ public class PurcVchrMultiAttachmentBean ...@@ -574,14 +588,21 @@ public class PurcVchrMultiAttachmentBean
InitialContext ctx = new InitialContext(new AppConnectParm().getProperty()); InitialContext ctx = new InitialContext(new AppConnectParm().getProperty());
DocumentHandlerEJB documentHandlerEJB = new DocumentHandlerEJB();// changes by Nandkumar Gadkari on 20/07/18 DocumentHandlerEJB documentHandlerEJB = new DocumentHandlerEJB();// changes by Nandkumar Gadkari on 20/07/18
String transDB = "";
if ( userInfo != null )
{
transDB = userInfo.getTransDB();
}
String[] documentIds = docIds.split(","); String[] documentIds = docIds.split(",");
for (int i = 0; i < documentIds.length; i++) for (int i = 0; i < documentIds.length; i++)
{ {
String docId = documentIds[i]; String docId = documentIds[i];
byte[] byteArray = documentHandlerEJB.getDocument(docId); //byte[] byteArray = documentHandlerEJB.getDocument(docId);
byte[] byteArray = documentHandlerEJB.getDocument(docId, userInfo);
docName = documentHandlerEJB.getDocumentName(docId); //docName = documentHandlerEJB.getDocumentName(docId);
docName = documentHandlerEJB.getDocumentName(docId, transDB);
System.out.println("docId = [" + docId + "] docName = [" + docName + "]"); System.out.println("docId = [" + docId + "] docName = [" + docName + "]");
documentNames += "," + docName; documentNames += "," + docName;
if (byteArray != null) if (byteArray != null)
......
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