Commit ad942c86 authored by pdas's avatar pdas

changes made for reqdate,orddate,dlvdate not null condition


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98804 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1599bdd3
......@@ -3315,12 +3315,18 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
//frtAmtFixed = frtAmtFixed==0?0:frtAmtFixed;
if(ordDateStr != null)
{
ordDateStr = sdf.format(ordDate.getTime());
}
System.out.println("@@@@@ordDateStr"+ordDateStr);
if(ordDateStr != null && ordDateStr.trim().length() > 0)
{
valueXmlString.append("<ord_date>").append("<![CDATA["+ordDateStr+"]]>").append("</ord_date>");
}
else
{
valueXmlString.append("<ord_date>").append("<![CDATA[]]>").append("</ord_date>");
}
valueXmlString.append("<pord_type>").append("<![CDATA["+pordType+"]]>").append("</pord_type>");
valueXmlString.append("<pord_type>").append("<![CDATA["+pordType+"]]>").append("</pord_type>");
valueXmlString.append("<supp_code>").append("<![CDATA["+suppCode+"]]>").append("</supp_code>");
......@@ -3383,11 +3389,19 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
valueXmlString.append("<tax_env>").append("<![CDATA["+taxEnv+"]]>").append("</tax_env>");
valueXmlString.append("<tax_env__o>").append("<![CDATA["+taxEnv+"]]>").append("</tax_env__o>");
valueXmlString.append("<remarks>").append("<![CDATA["+remarks+"]]>").append("</remarks>");
if(taxDateStr != null)
System.out.println("Taxdate>>>"+taxDate);
if(taxDate != null)
{
taxDateStr = sdf.format(taxDate.getTime());
}
taxDateStr = sdf.format(taxDate.getTime());
System.out.println("Taxdate>>>"+taxDateStr);
valueXmlString.append("<tax_date__o>").append("<![CDATA["+taxDateStr+"]]>").append("</tax_date__o>");
}
else
{
valueXmlString.append("<tax_date__o>").append("<![CDATA[]]>").append("</tax_date__o>");
}
valueXmlString.append("<proj_code>").append("<![CDATA["+projCode+"]]>").append("</proj_code>");
valueXmlString.append("<proj_code__o>").append("<![CDATA["+projCode+"]]>").append("</proj_code__o>");
valueXmlString.append("<sales_pers>").append("<![CDATA["+salesPers+"]]>").append("</sales_pers>");
......@@ -3989,20 +4003,39 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
valueXmlString.append("<tax_amt >").append("<![CDATA["+taxAmt+"]]>").append("</tax_amt>");
valueXmlString.append("<tot_amt >").append("<![CDATA["+totAmt+"]]>").append("</tot_amt>");
valueXmlString.append("<loc_code >").append("<![CDATA["+locCode+"]]>").append("</loc_code>");
if(reqDateStr != null)
{
reqDateStr = sdf.format(reqDate.getTime());
}
if(dlvDateStr != null)
{
dlvDateStr = sdf.format(dlvDate.getTime());
}
if(reqDate != null)
{
reqDateStr = sdf.format(reqDate.getTime());
valueXmlString.append("<req_date >").append("<![CDATA["+reqDateStr+"]]>").append("</req_date>");
valueXmlString.append("<req_date__o>").append("<![CDATA["+reqDateStr+"]]>").append("</req_date__o>");
}
else
{
valueXmlString.append("<req_date >").append("<![CDATA[]]>").append("</req_date>");
valueXmlString.append("<req_date__o>").append("<![CDATA[]]>").append("</req_date__o>");
}
if(dlvDate != null)
{
dlvDateStr = sdf.format(dlvDate.getTime());
valueXmlString.append("<dlv_date >").append("<![CDATA["+dlvDateStr+"]]>").append("</dlv_date>");
valueXmlString.append("<dlv_date__o>").append("<![CDATA["+dlvDateStr+"]]>").append("</dlv_date__o>");
}
else
{
valueXmlString.append("<dlv_date >").append("<![CDATA[]]>").append("</dlv_date>");
valueXmlString.append("<dlv_date__o>").append("<![CDATA[]]>").append("</dlv_date__o>");
}
valueXmlString.append("<dlv_qty>").append("<![CDATA["+dlvQty+"]]>").append("</dlv_qty>");
valueXmlString.append("<tax_class__o>").append("<![CDATA["+taxClass+"]]>").append("</tax_class__o>");
valueXmlString.append("<tax_chap__o >").append("<![CDATA["+taxChap+"]]>").append("</tax_chap__o>");
......@@ -4244,13 +4277,18 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
valueXmlString.append("<item_descr >").append("<![CDATA["+itemDescr+"]]>").append("</item_descr>");
valueXmlString.append("<loc_code >").append("<![CDATA["+locCode+"]]>").append("</loc_code>");
valueXmlString.append("<rate__stduom >").append("<![CDATA["+rate+"]]>").append("</rate__stduom>");
if(reqDateStr != null)
{
reqDateStr = sdf.format(reqDate.getTime());
}
if(reqDate != null)
{
reqDateStr = sdf.format(reqDate.getTime());
valueXmlString.append("<req_date >").append("<![CDATA["+reqDateStr+"]]>").append("</req_date>");
valueXmlString.append("<dlv_date >").append("<![CDATA["+reqDateStr+"]]>").append("</dlv_date>");
}
else
{
valueXmlString.append("<req_date >").append("<![CDATA[]]>").append("</req_date>");
valueXmlString.append("<dlv_date >").append("<![CDATA[]]>").append("</dlv_date>");
}
valueXmlString.append("<pack_code >").append("<![CDATA["+packCode+"]]>").append("</pack_code>");
valueXmlString.append("<pack_instr >").append("<![CDATA["+packInstr+"]]>").append("</pack_instr>");
......
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