Commit 195ea470 authored by msharma's avatar msharma

Set Emp_code__aprv of chg_user, if not found from xtraparam..


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94112 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 53baa5b3
...@@ -73,6 +73,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -73,6 +73,7 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
ValidatorEJB validatorEJB = null; ValidatorEJB validatorEJB = null;
System.out.println("tran id = "+tranId); System.out.println("tran id = "+tranId);
boolean connStatus=false; boolean connStatus=false;
String chgUser="";
try try
{ {
if ( conn == null )//changed by Gulzar - 25/11/11 if ( conn == null )//changed by Gulzar - 25/11/11
...@@ -92,9 +93,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -92,9 +93,12 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
//connDriver = null; //connDriver = null;
//conn.setAutoCommit(false); //conn.setAutoCommit(false);
loginEmpCode = validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"); loginEmpCode =validatorEJB.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode");
System.out.println("Printing loginEmpCode--------"+loginEmpCode+"--");
sql = "select confirmed ,site_code from receipt where tran_id = ?"; sql = "select confirmed ,site_code,chg_user from receipt where tran_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId); pstmt.setString(1,tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -102,11 +106,32 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo ...@@ -102,11 +106,32 @@ public class ReceiptAdvConf extends ActionHandlerEJB implements ReceiptAdvConfLo
{ {
confirm = rs.getString("confirmed") == null ?"N":rs.getString("confirmed"); confirm = rs.getString("confirmed") == null ?"N":rs.getString("confirmed");
siteCode = rs.getString("site_code") == null ?" ":rs.getString("site_code"); siteCode = rs.getString("site_code") == null ?" ":rs.getString("site_code");
chgUser = rs.getString("chg_user") == null ?" ":rs.getString("chg_user");
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(chgUser==null || chgUser.trim().length()==0)
{
chgUser="SYSTEM";
}
if("null".equalsIgnoreCase(loginEmpCode) || loginEmpCode==null || loginEmpCode.trim().length()==0)
{
sql="select emp_code from users where code=?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,chgUser);
rs=pstmt.executeQuery();
if(rs.next())
{
loginEmpCode=rs.getString(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
if(confirm != null && confirm.equalsIgnoreCase("N")) if(confirm != null && confirm.equalsIgnoreCase("N"))
{ {
errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn); errString = gbfRetrieveReceipt(tranId,siteCode,xtraParams,conn);
......
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