Commit a9bddf6a authored by cpatil's avatar cpatil

modify


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100009 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ba6f7484
......@@ -654,6 +654,54 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
}
if( childNodeName.equalsIgnoreCase("curr_code__frt") )
{
currCode="";
currCode = checkNull(genericUtility.getColumnValue("curr_code__frt", dom));
if( currCode != null && currCode.trim().length() > 0 )
{
isExistFlag = isExist("currency", "curr_code", currCode, conn);
if("FALSE".equalsIgnoreCase(isExistFlag))
{
errCode = "VMCURR1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else
{
errCode = "VMCUR2";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
if( childNodeName.equalsIgnoreCase("curr_code__bc") )
{
currCode="";
currCode = checkNull(genericUtility.getColumnValue("curr_code__bc", dom));
if( currCode != null && currCode.trim().length() > 0 )
{
isExistFlag = isExist("currency", "curr_code", currCode, conn);
if("FALSE".equalsIgnoreCase(isExistFlag))
{
errCode = "VMCURR1";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
else
{
errCode = "VMCUR2";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
if( childNodeName.equalsIgnoreCase("tran_code") )
{
......@@ -1709,7 +1757,8 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
stanCodeShip = genericUtility.getColumnValue("stan_code__ship", dom);
System.out.println("@@@@@2 stanCodeShip ["+ stanCodeShip + "]");
stationaDescr = setDescription("descr", "station", "stan_code", stanCodeShip, conn);
valueXmlString.append("<stationa_descr protect = \"1\">").append("<![CDATA["+stationaDescr+"]]>").append("</stationa_descr>");
//valueXmlString.append("<stationa_descr protect = \"1\">").append("<![CDATA["+stationaDescr+"]]>").append("</stationa_descr>");
valueXmlString.append("<descr protect = \"1\">").append("<![CDATA["+stationaDescr+"]]>").append("</descr>");
} //stationa_descr
......@@ -1718,7 +1767,8 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
stanCodeDlv = genericUtility.getColumnValue("stan_code__dlv", dom);
System.out.println("@@@@@2 stanCodeDlv ["+ stanCodeDlv + "]");
stationaDescr = setDescription("descr", "station", "stan_code", stanCodeDlv, conn);
valueXmlString.append("<stationb_descr protect = \"1\">").append("<![CDATA["+stationaDescr+"]]>").append("</stationb_descr>");
//valueXmlString.append("<stationb_descr protect = \"1\">").append("<![CDATA["+stationaDescr+"]]>").append("</stationb_descr>");
valueXmlString.append("<descr_1 protect = \"1\">").append("<![CDATA["+stationaDescr+"]]>").append("</descr_1>");
}
else if( currentColumn.trim().equalsIgnoreCase( "tran_code" ) )
......@@ -1726,7 +1776,8 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
tranCode = genericUtility.getColumnValue("tran_code", dom);
System.out.println("@@@@@2 tranCode ["+ tranCode + "]");
tranCodeDescr = setDescription("TRAN_NAME", "TRANSPORTER", "tran_code", tranCode, conn);
valueXmlString.append("<transporter_tran_name protect = \"1\">").append("<![CDATA["+tranCodeDescr+"]]>").append("</transporter_tran_name>");
//valueXmlString.append("<transporter_tran_name protect = \"1\">").append("<![CDATA["+tranCodeDescr+"]]>").append("</transporter_tran_name>");
valueXmlString.append("<tran_name protect = \"1\">").append("<![CDATA["+tranCodeDescr+"]]>").append("</tran_name>");
}
valueXmlString.append("</Detail3>");
......@@ -1773,6 +1824,7 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
System.out.println("@@@@@@@@ grossWeight["+grossWeight+"]- tareWeight["+tareWeight+"]===netWeight["+netWeight+"]");
valueXmlString.append("<net_weight>").append("<![CDATA["+netWeight+"]]>").append("</net_weight>");
//valueXmlString.append("<descr protect = \"1\">").append("ABCD").append("</descr>");
}
if( currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ) )
......@@ -1790,6 +1842,12 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
System.out.println("@@@@@@@@ grossWeight["+grossWeight+"]- tareWeight["+tareWeight+"]===netWeight["+netWeight+"]");
valueXmlString.append("<net_weight>").append("<![CDATA["+netWeight+"]]>").append("</net_weight>");
//valueXmlString.append("<descr protect = \"1\">").append("ABCD").append("</descr>");
/* currCode = genericUtility.getColumnValue("curr_code", dom);
System.out.println("@@@@@2 currCode ["+ currCode + "]");
currencyDescr = setDescription("descr", "currency", "curr_code", currCode, conn);
valueXmlString.append("<currency_descr protect = \"1\">").append("<![CDATA["+currencyDescr+"]]>").append("</currency_descr>");
*/
}
else if( currentColumn.trim().equalsIgnoreCase( "curr_code" ) )
......@@ -1797,7 +1855,10 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
currCode = genericUtility.getColumnValue("curr_code", dom);
System.out.println("@@@@@2 currCode ["+ currCode + "]");
currencyDescr = setDescription("descr", "currency", "curr_code", currCode, conn);
valueXmlString.append("<currency_descr protect = \"1\">").append("<![CDATA["+currencyDescr+"]]>").append("</currency_descr>");
valueXmlString.append("<currency_a_descr protect = \"1\">").append("<![CDATA["+currencyDescr+"]]>").append("</currency_a_descr>");
//valueXmlString.append("<descr protect = \"1\">").append("<![CDATA["+currencyDescr+"]]>").append("</descr>");
//valueXmlString.append("<currency_descr protect = \"1\">").append("ABC").append("</currency_descr>");
//valueXmlString.append("<descr protect = \"1\">").append("ABCD").append("</descr>");
}
else if( currentColumn.trim().equalsIgnoreCase( "stan_code__ship" ) )
......@@ -1805,25 +1866,27 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
stanCodeShip = genericUtility.getColumnValue("stan_code__ship", dom);
System.out.println("@@@@@2 stanCodeShip ["+ stanCodeShip + "]");
stanCodeDescr = setDescription("descr", "station", "stan_code", stanCodeShip, conn);
valueXmlString.append("<stationa_descr protect = \"1\">").append("<![CDATA["+stanCodeDescr+"]]>").append("</stationa_descr>");
valueXmlString.append("<station_a_descr protect = \"1\">").append("<![CDATA["+stanCodeDescr+"]]>").append("</station_a_descr>");
}
else if( currentColumn.trim().equalsIgnoreCase( "stan_code__dlv" ) )
{
stanCodeDlv = genericUtility.getColumnValue("stan_code__dlv", dom);
System.out.println("@@@@@2 stanCodeDlv ["+ stanCodeDlv + "]");
stanCodeDlvDescr = setDescription("descr", "station", "stan_code", stanCodeDlv, conn);
valueXmlString.append("<stationb_descr protect = \"1\">").append("<![CDATA["+stanCodeDlvDescr+"]]>").append("</stationb_descr>");
valueXmlString.append("<station_b_descr protect = \"1\">").append("<![CDATA["+stanCodeDlvDescr+"]]>").append("</station_b_descr>");
}
else if( currentColumn.trim().equalsIgnoreCase( "curr_code__frt" ) )
{
currCodeFrtDescr="";
currCodeFrt = genericUtility.getColumnValue("curr_code__frt", dom);
System.out.println("@@@@@2 currCodeFrt ["+ currCodeFrt + "]");
currCodeFrtDescr = setDescription("descr", "currency", "curr_code", currCodeFrt, conn);
valueXmlString.append("<currencyb_descr protect = \"1\">").append("<![CDATA["+currCodeFrtDescr+"]]>").append("</currencyb_descr>");
valueXmlString.append("<currency_b_descr protect = \"1\">").append("<![CDATA["+currCodeFrtDescr+"]]>").append("</currency_b_descr>");
}
else if( currentColumn.trim().equalsIgnoreCase( "curr_code__bc" ) )
{
currCodeBcDescr = "";
currCodeBc = genericUtility.getColumnValue("curr_code__bc", dom);
System.out.println("@@@@@2 currCodeBc ["+ currCodeBc + "]");
currCodeBcDescr = setDescription("descr", "currency", "curr_code", currCodeBc, conn);
......@@ -1835,7 +1898,7 @@ public class ShipmentLocIC extends ValidatorEJB implements ShipmentLocICLocal, S
else if( currentColumn.trim().equalsIgnoreCase("tran_code") )
{
transporterTranName= "";
tranCode = genericUtility.getColumnValue("tran_code", dom);
System.out.println("@@@@@2 tranCode ["+ tranCode + "]");
transporterTranName = setDescription("TRAN_NAME", "TRANSPORTER", "tran_code", tranCode, conn);
......
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