Commit ac60a642 authored by sbade's avatar sbade

Added site code inv field for other site transaction


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93200 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1e888fcd
...@@ -183,6 +183,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca ...@@ -183,6 +183,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
ResultSet rs1 = null; ResultSet rs1 = null;
ResultSet rs2 = null; ResultSet rs2 = null;
ResultSet rs3 = null; ResultSet rs3 = null;
String siteCodeInv="";
String errCode = "" ,errString = ""; String errCode = "" ,errString = "";
String itemSer=null; String itemSer=null;
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
...@@ -191,6 +192,8 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca ...@@ -191,6 +192,8 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
try try
{ {
System.out.println("<---- IN RECEIPTADVACT IN TRY ----->"); System.out.println("<---- IN RECEIPTADVACT IN TRY ----->");
//detCnt = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"detCnt"); //Will be Uncommented later - Jiten //detCnt = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"detCnt"); //Will be Uncommented later - Jiten
if (detCnt.equals("0")) if (detCnt.equals("0"))
...@@ -198,12 +201,21 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca ...@@ -198,12 +201,21 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
System.out.println("<-----IN RECEIPTADVACT IN TRY detCnt equal 0----->"); System.out.println("<-----IN RECEIPTADVACT IN TRY detCnt equal 0----->");
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
siteCode = genericUtility.getColumnValue("site_code",dom); siteCode = genericUtility.getColumnValue("site_code",dom);
siteCodeInv = genericUtility.getColumnValue("site_code__inv",dom);
custCode = genericUtility.getColumnValue("cust_code",dom); custCode = genericUtility.getColumnValue("cust_code",dom);
exchRateHeader = genericUtility.getColumnValue("exch_rate",dom); exchRateHeader = genericUtility.getColumnValue("exch_rate",dom);
itemSer = genericUtility.getColumnValue("item_ser",dom); itemSer = genericUtility.getColumnValue("item_ser",dom);
chqAmt = genericUtility.getColumnValue("chq_amt",dom); chqAmt = genericUtility.getColumnValue("chq_amt",dom);
currCode = genericUtility.getColumnValue("curr_code",dom); currCode = genericUtility.getColumnValue("curr_code",dom);
advAmt = genericUtility.getColumnValue("adv_amt",dom); advAmt = genericUtility.getColumnValue("adv_amt",dom);
System.out.println("siteCodeInv:"+siteCodeInv);
//added new if condition by swati on 3rd june 2013 to check for outstanding of customer of invoicing site,RID:FI2JALL001
if((siteCodeInv != null) && (siteCodeInv.trim().length()>0))
{
siteCode=siteCodeInv;
}
if (chqAmt.equals("0")) if (chqAmt.equals("0"))
{ {
...@@ -409,6 +421,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca ...@@ -409,6 +421,7 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
{ {
//Added by nisar on 04/01/08 for RID : SY6BAS0059 //Added by nisar on 04/01/08 for RID : SY6BAS0059
String siteCode = null; String siteCode = null;
String siteCodeInv = null;
String custCode = null; String custCode = null;
String custCodeS = null; String custCodeS = null;
String detCnt = null; String detCnt = null;
...@@ -443,23 +456,27 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca ...@@ -443,23 +456,27 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
//if (detCnt.equals("0")) //if (detCnt.equals("0"))
//{ //{
System.out.println("dom1--> "+dom1);
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
siteCode = genericUtility.getColumnValue("site_code",dom1); siteCode = genericUtility.getColumnValue("site_code",dom1);
siteCodeInv = genericUtility.getColumnValue("site_code__inv",dom1);
custCode = genericUtility.getColumnValue("cust_code",dom1); custCode = genericUtility.getColumnValue("cust_code",dom1);
tranSer = genericUtility.getColumnValue("ref_ser",dom); tranSer = genericUtility.getColumnValue("ref_ser",dom);
exchRateHeader = genericUtility.getColumnValue("exch_rate",dom1);//from header exchRateHeader = genericUtility.getColumnValue("exch_rate",dom1);//from header
exchRateD = Double.parseDouble(exchRateHeader==null?"0":exchRateHeader.trim()); exchRateD = Double.parseDouble(exchRateHeader==null?"0":exchRateHeader.trim());
parentNodeList = dom1.getElementsByTagName("Detail1"); parentNodeList = dom1.getElementsByTagName("Detail1");
//parentNode = dom.getElementsByTagName("Detail2")[0]; //parentNode = dom.getElementsByTagName("Detail2")[0];
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
winName=getObjName(parentNode); winName=getObjName(parentNode);
//} //}
//added new if condition by swati on 3rd june 2013 for outstanding of customer of invoicing site, RID:FI2JALL001
if((siteCodeInv != null) && (siteCodeInv.trim().length()>0))
{
siteCode=siteCodeInv;
}
System.out.println("[ReceiptAdvActEJB] siteCode==>"+siteCode); System.out.println("[ReceiptAdvActEJB] siteCode==>"+siteCode);
System.out.println("[ReceiptAdvActEJB] custCode==>"+custCode); System.out.println("[ReceiptAdvActEJB] custCode==>"+custCode);
System.out.println("[ReceiptAdvActEJB] tranSer==>"+tranSer); System.out.println("[ReceiptAdvActEJB] tranSer==>"+tranSer);
...@@ -745,9 +762,6 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca ...@@ -745,9 +762,6 @@ public class ReceiptAdvAct extends ActionHandlerEJB implements ReceiptAdvActLoca
*/ */
return "w_" + objName; return "w_" + objName;
} }
......
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