Commit 808dc6f9 authored by wansari's avatar wansari

D14IKAT004 line wise tax amount is taken from porddet.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97479 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 451e3e0a
...@@ -1493,7 +1493,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1493,7 +1493,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
String remarks = ""; String remarks = "";
String suppCode = ""; String suppCode = "";
String suppName = ""; String suppName = "";
String taxAmt = ""; String taxAmtHeader = "";
String taxAmtDetail = "";
String itemCode = ""; String itemCode = "";
String totAmt = ""; String totAmt = "";
String quantity = ""; String quantity = "";
...@@ -1515,14 +1516,12 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1515,14 +1516,12 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
purcOrder = checkNullAndTrim(rs.getString("PURC_ORDER")); purcOrder = checkNullAndTrim(rs.getString("PURC_ORDER"));
remarks = checkNullAndTrim(rs.getString("REMARKS")); remarks = checkNullAndTrim(rs.getString("REMARKS"));
suppCode = checkNullAndTrim(rs.getString("SUPP_CODE")); suppCode = checkNullAndTrim(rs.getString("SUPP_CODE"));
taxAmt = checkNullAndTrim(rs.getString("TAX_AMT")); taxAmtHeader = checkNullAndTrim(rs.getString("TAX_AMT"));
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
sql = "SELECT SUPP_NAME FROM SUPPLIER WHERE SUPP_CODE = ?"; sql = "SELECT SUPP_NAME FROM SUPPLIER WHERE SUPP_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,suppCode); pstmt.setString(1,suppCode);
...@@ -1531,8 +1530,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1531,8 +1530,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
while(rs.next()) while(rs.next())
{ {
suppName = checkNullAndTrim(rs.getString("SUPP_NAME")); suppName = checkNullAndTrim(rs.getString("SUPP_NAME"));
} }
rs.close();rs = null; rs.close();rs = null;
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
...@@ -1540,10 +1538,10 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1540,10 +1538,10 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
details.append("<fieldValue><![CDATA[").append(remarks).append("]]></fieldValue>\r\n"); details.append("<fieldValue><![CDATA[").append(remarks).append("]]></fieldValue>\r\n");
details.append("<supp_code><![CDATA[").append(suppCode).append("]]></supp_code>\r\n"); details.append("<supp_code><![CDATA[").append(suppCode).append("]]></supp_code>\r\n");
details.append("<supp_name><![CDATA[").append(suppName).append("]]></supp_name>\r\n"); details.append("<supp_name><![CDATA[").append(suppName).append("]]></supp_name>\r\n");
details.append("<tax_amt><![CDATA[").append(taxAmt).append("]]></tax_amt>\r\n"); details.append("<tax_amt><![CDATA[").append(taxAmtHeader).append("]]></tax_amt>\r\n");
details.append("</finish>"); details.append("</finish>");
sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY FROM PORDDET WHERE PURC_ORDER = ? "; sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY,TAX_AMT FROM PORDDET WHERE PURC_ORDER = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder); pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -1554,6 +1552,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1554,6 +1552,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE")); itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
totAmt = checkNullAndTrim(rs.getString("TOT_AMT")); totAmt = checkNullAndTrim(rs.getString("TOT_AMT"));
quantity = checkNullAndTrim(rs.getString("QUANTITY")); quantity = checkNullAndTrim(rs.getString("QUANTITY"));
taxAmtDetail = checkNullAndTrim(rs.getString("TAX_AMT"));
domID++; domID++;
details.append("<extra>"); details.append("<extra>");
...@@ -1561,7 +1560,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote ...@@ -1561,7 +1560,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
details.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>\r\n"); details.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>\r\n");
details.append("<tot_amt><![CDATA[").append(totAmt).append("]]></tot_amt>\r\n"); details.append("<tot_amt><![CDATA[").append(totAmt).append("]]></tot_amt>\r\n");
details.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n"); details.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
details.append("<tax_amt><![CDATA[").append(taxAmt).append("]]></tax_amt>\r\n"); details.append("<tax_amt><![CDATA[").append(taxAmtDetail).append("]]></tax_amt>\r\n");
details.append("</extra>"); details.append("</extra>");
} }
......
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