Commit 4ddcd17b authored by manohar's avatar manohar

bug fix if detail record found then only protected the columns


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95148 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c94acd2e
...@@ -74,7 +74,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -74,7 +74,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
return errString; return errString;
} }
public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException { public String wfValData(Document dom, Document dom1, Document dom2, String objContext, String editFlag, String xtraParams) throws RemoteException, ITMException
{
NodeList parentNodeList = null; NodeList parentNodeList = null;
NodeList childNodeList = null; NodeList childNodeList = null;
Node parentNode = null; Node parentNode = null;
...@@ -2271,9 +2272,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2271,9 +2272,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
return errCode; return errCode;
}*/ }*/
public String itemChanged(String xmlString, String xmlString1, String objContext, String currentColumn, String editFlag, String xtraParams) public String itemChanged(String xmlString, String xmlString1, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
throws RemoteException, ITMException {
{
Document dom = null; Document dom = null;
Document dom1 = null; Document dom1 = null;
Document dom2 = null; Document dom2 = null;
...@@ -2290,10 +2290,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2290,10 +2290,9 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
e.getMessage()); e.getMessage());
} }
return valueXmlString; return valueXmlString;
} }
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
throws RemoteException, ITMException {
{
Document dom = null; Document dom = null;
Document dom1 = null; Document dom1 = null;
Document dom2 = null; Document dom2 = null;
...@@ -2317,9 +2316,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2317,9 +2316,8 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
} }
public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) public String itemChanged(Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
throws RemoteException, ITMException {
{
NodeList parentNodeList = null; NodeList parentNodeList = null;
NodeList childNodeList = null; NodeList childNodeList = null;
Node parentNode = null; Node parentNode = null;
...@@ -2527,6 +2525,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2527,6 +2525,15 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{
instrPerSlip = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (instrPerSlip > 0)
{ {
//valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA["+genericUtility.getColumnValue("exch_rate", dom)+"]]>").append("</exch_rate>"); //valueXmlString.append("<exch_rate protect = \"1\">").append("<![CDATA["+genericUtility.getColumnValue("exch_rate", dom)+"]]>").append("</exch_rate>");
valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA["+genericUtility.getColumnValue("site_code", dom)+"]]>").append("</site_code>"); valueXmlString.append("<site_code protect = \"1\">").append("<![CDATA["+genericUtility.getColumnValue("site_code", dom)+"]]>").append("</site_code>");
...@@ -2541,10 +2548,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -2541,10 +2548,6 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
valueXmlString.append("<sale_order protect = \"0\">").append("<![CDATA["+checkNull(genericUtility.getColumnValue("sale_order", dom))+"]]>").append("</sale_order>"); valueXmlString.append("<sale_order protect = \"0\">").append("<![CDATA["+checkNull(genericUtility.getColumnValue("sale_order", dom))+"]]>").append("</sale_order>");
} }
rs.close();
rs = null;
pstmt.close();
pstmt = null;
} }
else if (currentColumn.trim().equalsIgnoreCase("itm_default")) else if (currentColumn.trim().equalsIgnoreCase("itm_default"))
...@@ -3129,7 +3132,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt ...@@ -3129,7 +3132,7 @@ public class ReceiptAdv extends ValidatorEJB implements ReceiptAdvLocal, Receipt
cctrCode = rs.getString(8); cctrCode = rs.getString(8);
dueDate = rs.getDate(9); dueDate = rs.getDate(9);
discount = rs.getDouble(10); discount = rs.getDouble(10);
taxAmt = rs.getDouble(11); //taxAmt = rs.getDouble(11);
totAmt = rs.getDouble(12); totAmt = rs.getDouble(12);
custCode = rs.getString(13); custCode = rs.getString(13);
adjAmt = rs.getDouble(14); adjAmt = rs.getDouble(14);
......
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