Skip to content

B
business-java
Commit 5d0d3c6a authored by ssalve's avatar ssalve
Browse files
Options

Sarita : Done changes by sarita on 12 SEP 2018 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190701 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7ff7f041
Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 28 deletions
webitm-dis/ibase/webitm/ejb/dis/AdjReceiptIC.java
View file @ 5d0d3c6a
......@@ -1397,7 +1397,10 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][Start].
//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);//done
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [START]
//String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,dom1,dom,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [END]
valueXmlString.append(valAcct);
//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
......@@ -1411,7 +1414,11 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//protectRate(dom,valueXmlString,conn);//done
//ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
ArrayList<String> tempList= protectRate(dom,valueXmlString,conn);
//Changes by sarita on 12 SEP 18 [START]
//ArrayList<String> tempList= protectRate(dom,valueXmlString,conn);
ArrayList<String> tempList= protectRate(dom,dom1,valueXmlString,conn);
//Changes by sarita on 12 SEP 18 [START]
//rate = tempList.get(0);
valueXmlString.append(tempList.get(1));
......@@ -1529,7 +1536,10 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);//done
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [START]
//String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,dom1,dom,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [END]
valueXmlString.append(valAcct);
//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
......@@ -1873,12 +1883,20 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [START]
//String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,dom1,dom,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [END]
valueXmlString.append(valAcct);
//protectRate(dom,valueXmlString,conn);
//ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
ArrayList<String> tempList= protectRate(dom,valueXmlString,conn);
//Changes by sarita on 12 SEP 18 [START]
//ArrayList<String> tempList= protectRate(dom,valueXmlString,conn);
ArrayList<String> tempList= protectRate(dom,dom1,valueXmlString,conn);
//Changes by sarita on 12 SEP 18 [END]
//rate = tempList.get(0);
valueXmlString.append(tempList.get(1));
......@@ -1952,12 +1970,18 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [START]
//String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,dom1,dom,conn);
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [END]
valueXmlString.append(valAcct);
//rate=protectRate(dom2,valueXmlString,conn);
ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
//Changes by sarita on 12 SEP 18 [START]
//ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
ArrayList<String> tempList= protectRate(dom,dom1,valueXmlString,conn);
//Changes by sarita on 12 SEP 18 [END]
rate = tempList.get(0);
valueXmlString.append(tempList.get(1));
......@@ -2278,7 +2302,10 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//private String protectRate(Document dom,StringBuffer valueXmlString,Connection conn) throws RemoteException, ITMException
//private ArrayList<String> protectRate(Document dom,StringBuffer valueXmlString,Connection conn) throws RemoteException, ITMException
//Modified by Rupesh on [02/11/2017][As Instructed by Piyush Sir].
private ArrayList<String> protectRate(Document dom,StringBuffer sb,Connection conn) throws RemoteException, ITMException
//Changes by sarita on 12 SEP 2018 [START]
//private ArrayList<String> protectRate(Document dom,StringBuffer sb,Connection conn) throws RemoteException, ITMException
private ArrayList<String> protectRate(Document dom,Document dom1,StringBuffer sb,Connection conn) throws RemoteException, ITMException
//Changes by sarita on 12 SEP 2018 [END]
{
PreparedStatement pstmt1 = null;
PreparedStatement pstmt2 = null;
......@@ -2293,8 +2320,11 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
try
{
System.out.println("DOM SARITA::5555" +genericUtility.serializeDom(dom));
System.out.println("DOM 1 SARITA::5555" +genericUtility.serializeDom(dom1));
itemCodeDom=checkNull(genericUtility.getColumnValue("item_code",dom));
siteCodeDom=checkNull(genericUtility.getColumnValue("site_code",dom));
//siteCodeDom=checkNull(genericUtility.getColumnValue("site_code",dom));
siteCodeDom=checkNull(genericUtility.getColumnValue("site_code",dom1));
lotNo=checkNull(genericUtility.getColumnValue("lot_no",dom));
lotSl=checkNull(genericUtility.getColumnValue("lot_sl",dom));
locCode=checkNull(genericUtility.getColumnValue("loc_code",dom));
......@@ -2410,7 +2440,10 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
//private Void valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer valueXmlString ,Document dom,Connection conn) throws ITMException
//private String valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer valueXmlString ,Document dom,Connection conn) throws ITMException
//Modified by Rupesh on [02/11/2017][As Instructed by Piyush Sir].
private String valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer sb ,Document dom,Connection conn) throws ITMException
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [START]
//private String valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer sb ,Document dom,Connection conn) throws ITMException
private String valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer sb ,Document dom,Document header,Document detail,Connection conn)throws ITMException
//Commented by sarita to added dom1[to get pricelist value from header] & dom [to get detail value of rate] on 10 SEP 2018 [END]
{
//Connection conn = null;
PreparedStatement pstmt1 = null,pstmt2 = null;
......@@ -2437,6 +2470,10 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
SimpleDateFormat sdf;
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
StringBuffer valueXmlString = new StringBuffer();//added by Rupesh on[02/11/2017]
//Added by sarita on 11 SEP 18 [START]
String priceList = "", rateVal = "";
double currentRate = 0.0;
//Added by sarita on 11 SEP 18 [END]
try
{
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
......@@ -2641,27 +2678,70 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
valueXmlString.append("<acct_code__cr ><![CDATA[").append(acctCodeArCr).append("]]></acct_code__cr>\r\n");
valueXmlString.append("<cctr_code__cr ><![CDATA[").append(cctrCodeArCr).append("]]></cctr_code__cr>\r\n");
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [START]
setNodeValue(dom, "acct_code__dr", acctCodeAr);
setNodeValue(dom, "cctr_code__dr", cctrCodeAr);
setNodeValue(detail, "acct_code__dr", acctCodeAr);
setNodeValue(detail, "cctr_code__dr", cctrCodeAr);
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
setNodeValue(detail, "acct_code__cr", acctCodeArCr);
setNodeValue(detail, "cctr_code__cr", cctrCodeArCr);
//Added by sarita to store acct_code__cr and cctr_code__cr values in dom on 03 SEP 2018 [START]
valueXmlString.append("<conv__qty_stduom ><![CDATA[").append("1").append("]]></conv__qty_stduom>\r\n");
valueXmlString.append("<unit__alt ><![CDATA[").append(unit).append("]]></unit__alt>\r\n");
valueXmlString.append("<potency_perc ><![CDATA[").append("0").append("]]></potency_perc>\r\n");
stock=0;
//Added by sarita on 11 SEP 18 [START]
rate = 0;
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
setNodeValue( detail, "rate", String.valueOf(rate));
//Added by sarita on 11 SEP 18 [END]
}
else
//Added above commented code for cnt is 0 on 03 SEP 2018 [END]
{
stock = 1;
if(rate<=0)
//Added by sarita to set value of rate on 10 SEP 2018 [START]
priceList=checkNull(genericUtility.getColumnValue("price_list",header));
rateVal = checkNull(genericUtility.getColumnValue("rate",detail));
System.out.println("Header PriceList is ["+priceList+"] && Detail Rate Value is ["+rateVal+"]");
if(priceList != null && priceList.trim().length() > 0)
{
try
{
currentRate = Double.valueOf(rateVal);
System.out.println("currentRate" +currentRate);
}
catch(Exception e)
{
currentRate = 0;
}
if(currentRate <=0)
{
System.out.println("cnt000 is == ["+cnt+"] \t rate is ["+rate+"]]");
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
setNodeValue( detail, "rate", String.valueOf(rate));
valueXmlString.append("<gross_rate ><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
}
}
else
{
System.out.println("cnt is == ["+cnt+"] \t rate is ["+rate+"]]");
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
setNodeValue( detail, "rate", String.valueOf(rate));
valueXmlString.append("<gross_rate ><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
}
/*if(rate<=0)
{
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
//Added by sarita to set rate in dom [START]
setNodeValue( dom, "rate", String.valueOf(rate));
//Added by sarita to set rate in dom [END]
valueXmlString.append("<gross_rate ><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
}
}*/
//Added by sarita to set value of rate on 10 SEP 2018 [END]
valueXmlString.append("<grade ><![CDATA[").append(grade).append("]]></grade>\r\n");
valueXmlString.append("<dimension ><![CDATA[").append(dimension).append("]]></dimension>\r\n");
......@@ -2698,9 +2778,14 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
valueXmlString.append("<pack_code ><![CDATA[").append(packCode).append("]]></pack_code>\r\n");
}
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [START]
setNodeValue(dom, "acct_code__dr", acctCodeAr);
setNodeValue(dom, "cctr_code__dr", cctrCodeAr);
setNodeValue(detail, "acct_code__dr", acctCodeAr);
setNodeValue(detail, "cctr_code__dr", cctrCodeAr);
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
setNodeValue(detail, "acct_code__cr", acctCodeCr);
setNodeValue(detail, "cctr_code__cr", cctrCodeCr);
//Added by sarita to store acct_code__cr and cctr_code__cr values in dom on 03 SEP 2018 [START]
}
}
else
......@@ -2883,22 +2968,67 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
valueXmlString.append("<potency_perc ><![CDATA[").append("0").append("]]></potency_perc>\r\n");
stock=0;
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [START]
setNodeValue(dom, "acct_code__dr", acctCodeAr);
setNodeValue(dom, "cctr_code__dr", cctrCodeAr);
setNodeValue(detail, "acct_code__dr", acctCodeAr);
setNodeValue(detail, "cctr_code__dr", cctrCodeAr);
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
//Added by sarita on 11 SEP 18 [START]
rate = 0;
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
setNodeValue( detail, "rate", String.valueOf(rate));
//Added by sarita on 11 SEP 18 [END]
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
setNodeValue(detail, "acct_code__cr", acctCodeArCr);
setNodeValue(detail, "cctr_code__cr", cctrCodeArCr);
//Added by sarita to store acct_code__cr and cctr_code__cr values in dom on 03 SEP 2018 [START]
}
else
{
//Added above commented code for cnt is 0 on 03 SEP 2018 [END]
stock = 1;
if(rate<=0)
//Added by sarita to set value of rate on 10 SEP 2018 [START]
priceList=checkNull(genericUtility.getColumnValue("price_list",header));
rateVal = checkNull(genericUtility.getColumnValue("rate",detail));
System.out.println("Header PriceList is ["+priceList+"] && Detail Rate Value is ["+rateVal+"]");
if(priceList != null && priceList.trim().length() > 0)
{
try
{
currentRate = Double.valueOf(rateVal);
System.out.println("currentRate" +currentRate);
}
catch(Exception e)
{
currentRate = 0;
}
if(currentRate <=0)
{
System.out.println("cnt000 is == ["+cnt+"] \t rate is ["+rate+"]]");
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
//Added by sarita to set rate in dom [START]
setNodeValue(dom, "rate", String.valueOf(rate));
//Added by sarita to set rate in dom [START]
setNodeValue( detail, "rate", String.valueOf(rate));
valueXmlString.append("<gross_rate ><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
}
}
else
{
System.out.println("cnt is == ["+cnt+"] \t rate is ["+rate+"]]");
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
setNodeValue( detail, "rate", String.valueOf(rate));
valueXmlString.append("<gross_rate ><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
}
/*if(rate<=0)
{
valueXmlString.append("<rate ><![CDATA[").append(rate).append("]]></rate>\r\n");
//Added by sarita to set rate in dom [START]
setNodeValue( dom, "rate", String.valueOf(rate));
//Added by sarita to set rate in dom [END]
valueXmlString.append("<gross_rate ><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
}*/
//Added by sarita to set value of rate on 10 SEP 2018 [END]
valueXmlString.append("<grade ><![CDATA[").append(grade).append("]]></grade>\r\n");
valueXmlString.append("<dimension ><![CDATA[").append(dimension).append("]]></dimension>\r\n");
......@@ -2935,12 +3065,18 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
valueXmlString.append("<pack_code ><![CDATA[").append(packCode).append("]]></pack_code>\r\n");
}
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [START]
setNodeValue(dom, "acct_code__dr", acctCodeAr);
setNodeValue(dom, "cctr_code__dr", cctrCodeAr);
setNodeValue(detail, "acct_code__dr", acctCodeAr);
setNodeValue(detail, "cctr_code__dr", cctrCodeAr);
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
//Added by sarita to store acct_code__dr and cctr_code__dr values in dom on 03 SEP 2018 [END]
setNodeValue(detail, "acct_code__cr", acctCodeCr);
setNodeValue(detail, "cctr_code__cr", cctrCodeCr);
//Added by sarita to store acct_code__cr and cctr_code__cr values in dom on 03 SEP 2018 [START]
}
}
rateStr=checkNull(genericUtility.getColumnValue("rate",dom));
rateStr=checkNull(genericUtility.getColumnValue("rate",detail));
System.out.println("rateStr ["+rateStr+"]");
if(rateStr != null && rateStr.trim().length() > 0)
{
try
......
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