Skip to content

B
business-java
Commit 46e5bf33 authored by kmandhre's avatar kmandhre
Browse files
Options

change in packList set isSrvCallOnChg='0' 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92554 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ef2b00df
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 29 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/DistIssueAct.java
View file @ 46e5bf33
...@@ -736,8 +736,9 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -736,8 +736,9 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
while (rs.next()) while (rs.next())
{ {
valueXmlString.append("<Detail>\r\n"); valueXmlString.append("<Detail>\r\n");
valueXmlString.append("<dist_order>").append("<![CDATA[").append(distOrder.trim()).append("]]>").append("</dist_order>\r\n"); //change done by kunal on 24/01/13 set isSrvCallOnChg='0'
valueXmlString.append("<line_no_dist_order>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</line_no_dist_order>\r\n"); valueXmlString.append("<dist_order isSrvCallOnChg='0' >").append("<![CDATA[").append(distOrder.trim()).append("]]>").append("</dist_order>\r\n");
valueXmlString.append("<line_no_dist_order isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</line_no_dist_order>\r\n");
sql = "SELECT TAX_CLASS, TAX_CHAP, TAX_ENV, CASE WHEN RATE IS NULL THEN 0 ELSE RATE END " sql = "SELECT TAX_CLASS, TAX_CHAP, TAX_ENV, CASE WHEN RATE IS NULL THEN 0 ELSE RATE END "
+"FROM DISTORDER_DET WHERE DIST_ORDER = ? AND LINE_NO = ? "; +"FROM DISTORDER_DET WHERE DIST_ORDER = ? AND LINE_NO = ? ";
...@@ -757,10 +758,10 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -757,10 +758,10 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
valueXmlString.append("<item_code>").append("<![CDATA[").append(rs.getString(2).trim()).append("]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(2).trim()).append("]]>").append("</item_code>\r\n");
valueXmlString.append("<quantity isSrvCallOnChg='1'>").append("<![CDATA[").append(rs.getString(5).trim()).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(5).trim()).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString(6).trim()).append("]]>").append("</unit>\r\n"); valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(6).trim()).append("]]>").append("</unit>\r\n");
valueXmlString.append("<loc_code>").append("<![CDATA[").append(rs.getString(9).trim()).append("]]>").append("</loc_code>\r\n"); valueXmlString.append("<loc_code isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(9).trim()).append("]]>").append("</loc_code>\r\n");
if (rate == 0) if (rate == 0)
{ {
...@@ -780,25 +781,25 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -780,25 +781,25 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
rate = pickRate(priceList, tranDate, rs.getString("ITEM_CODE"), rs.getString("LOT_NO"),'D'); rate = pickRate(priceList, tranDate, rs.getString("ITEM_CODE"), rs.getString("LOT_NO"),'D');
} }
valueXmlString.append("<rate>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n"); valueXmlString.append("<rate isSrvCallOnChg='0'>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(3).trim()).append("]]>").append("</lot_no>\r\n"); valueXmlString.append("<lot_no isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(3).trim()).append("]]>").append("</lot_no>\r\n");
valueXmlString.append("<lot_sl>").append("<![CDATA[").append(rs.getString(4).trim()).append("]]>").append("</lot_sl>\r\n"); valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(4).trim()).append("]]>").append("</lot_sl>\r\n");
valueXmlString.append("<pack_code>").append("<![CDATA[").append(rs.getString(7).trim()).append("]]>").append("</pack_code>\r\n"); valueXmlString.append("<pack_code isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(7).trim()).append("]]>").append("</pack_code>\r\n");
valueXmlString.append("<pack_instr>").append("<![CDATA[").append(rs.getString(8)).append("]]>").append("</pack_instr>\r\n"); valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(8)).append("]]>").append("</pack_instr>\r\n");
valueXmlString.append("<gross_weight>").append("<![CDATA[").append(rs.getString(10)).append("]]>").append("</gross_weight>\r\n"); valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(10)).append("]]>").append("</gross_weight>\r\n");
valueXmlString.append("<tare_weight>").append("<![CDATA[").append(rs.getString(11)).append("]]>").append("</tare_weight>\r\n"); valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(11)).append("]]>").append("</tare_weight>\r\n");
valueXmlString.append("<net_weight>").append("<![CDATA[").append(rs.getString(12)).append("]]>").append("</net_weight>\r\n"); valueXmlString.append("<net_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(12)).append("]]>").append("</net_weight>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(13)).append("]]>").append("</dimension>\r\n"); valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(13)).append("]]>").append("</dimension>\r\n");
valueXmlString.append("<quantity isSrvCallOnChg='1'>").append("<![CDATA[").append(rs.getString(5)).append("]]>").append("</quantity>\r\n"); valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(5)).append("]]>").append("</quantity>\r\n");
valueXmlString.append("<tax_class>").append("<![CDATA[").append(taxClass == null ? "": taxClass).append("]]>").append("</tax_class>\r\n"); valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append(taxClass == null ? "": taxClass).append("]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_chap>").append("<![CDATA[").append(taxChap == null ? "": taxChap).append("]]>").append("</tax_chap>\r\n"); valueXmlString.append("<tax_chap isSrvCallOnChg='0'>").append("<![CDATA[").append(taxChap == null ? "": taxChap).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_env>").append("<![CDATA[").append(taxEnv == null ? "": taxEnv).append("]]>").append("</tax_env>\r\n"); valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append(taxEnv == null ? "": taxEnv).append("]]>").append("</tax_env>\r\n");
taxAmt = 0; taxAmt = 0;
valueXmlString.append("<tax_amt>").append("<![CDATA[").append(taxAmt).append("]]>").append("</tax_amt>\r\n"); valueXmlString.append("<tax_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(taxAmt).append("]]>").append("</tax_amt>\r\n");
amount = rate * 0; amount = rate * 0;
valueXmlString.append("<amount>").append("<![CDATA[").append(amount).append("]]>").append("</amount>\r\n"); valueXmlString.append("<amount isSrvCallOnChg='0'>").append("<![CDATA[").append(amount).append("]]>").append("</amount>\r\n");
netAmt = amount + taxAmt; netAmt = amount + taxAmt;
valueXmlString.append("<net_amt>").append("<![CDATA[").append(netAmt).append("]]>").append("</net_amt>\r\n"); valueXmlString.append("<net_amt isSrvCallOnChg='0'>").append("<![CDATA[").append(netAmt).append("]]>").append("</net_amt>\r\n");
sql = "SELECT SITE_CODE__MFG,MFG_DATE,EXP_DATE,POTENCY_PERC, " sql = "SELECT SITE_CODE__MFG,MFG_DATE,EXP_DATE,POTENCY_PERC, "
+"BATCH_NO, GRADE,RETEST_DATE " +"BATCH_NO, GRADE,RETEST_DATE "
...@@ -842,13 +843,13 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -842,13 +843,13 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
{ {
retestDate1 = sdf.format(retestDate); retestDate1 = sdf.format(retestDate);
} }
valueXmlString.append("<site_code__mfg>").append("<![CDATA[").append(siteCodeMfg).append("]]>").append("</site_code__mfg>\r\n"); valueXmlString.append("<site_code__mfg isSrvCallOnChg='0'>").append("<![CDATA[").append(siteCodeMfg).append("]]>").append("</site_code__mfg>\r\n");
valueXmlString.append("<mfg_date>").append("<![CDATA[").append(mfgDate1).append("]]>").append("</mfg_date>\r\n"); valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append(mfgDate1).append("]]>").append("</mfg_date>\r\n");
valueXmlString.append("<exp_date>").append("<![CDATA[").append(expDate1).append("]]>").append("</exp_date>\r\n"); valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[").append(expDate1).append("]]>").append("</exp_date>\r\n");
valueXmlString.append("<potency_perc>").append("<![CDATA[").append(potencyPerc).append("]]>").append("</potency_perc>\r\n"); valueXmlString.append("<potency_perc isSrvCallOnChg='0'>").append("<![CDATA[").append(potencyPerc).append("]]>").append("</potency_perc>\r\n");
valueXmlString.append("<batch_no>").append("<![CDATA[").append(batchNo == null ? "" : batchNo).append("]]>").append("</batch_no>\r\n"); valueXmlString.append("<batch_no isSrvCallOnChg='0'>").append("<![CDATA[").append(batchNo == null ? "" : batchNo).append("]]>").append("</batch_no>\r\n");
valueXmlString.append("<grade>").append("<![CDATA[").append(grade).append("]]>").append("</grade>\r\n"); valueXmlString.append("<grade isSrvCallOnChg='0'>").append("<![CDATA[").append(grade).append("]]>").append("</grade>\r\n");
valueXmlString.append("<retest_date>").append("<![CDATA[").append(retestDate1).append("]]>").append("</retest_date>\r\n"); valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[").append(retestDate1).append("]]>").append("</retest_date>\r\n");
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
cnt++; cnt++;
}//end while }//end while
......
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