Commit 4980c5e0 authored by ngadkari's avatar ngadkari

ADDED LINE TYPE TAG IN DETAIL

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204727 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 24eb20c1
...@@ -2831,7 +2831,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch ...@@ -2831,7 +2831,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
priceListType= distCommon.getPriceListType(priceList, conn); priceListType= distCommon.getPriceListType(priceList, conn);
if(priceListDisc==null||priceListDisc.trim().length()==0) if(priceListDisc==null||priceListDisc.trim().length()==0)
{ {
if( rate <= 0 && ( "C".equalsIgnoreCase(lineType) || "I".equalsIgnoreCase(lineType)) && "B".equalsIgnoreCase(priceListType)) if( rate <= 0 && ( "C".equalsIgnoreCase(lineType) ) && "B".equalsIgnoreCase(priceListType))
{ {
errCode = "VTRATE1"; errCode = "VTRATE1";
errList.add(errCode); errList.add(errCode);
...@@ -4915,8 +4915,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch ...@@ -4915,8 +4915,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
rs = null; rs = null;
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
// C and P nature added by nandkumar gadkari on 06/08/19
if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature)) if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature) || "P".equalsIgnoreCase(nature) || "C".equalsIgnoreCase(nature))
{ {
valueXmlString.append("<rate__stduom>").append("<![CDATA[0]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[0]]>").append("</rate__stduom>");
valueXmlString.append("<line_type>").append("<![CDATA["+nature+"]]>").append("</line_type>"); valueXmlString.append("<line_type>").append("<![CDATA["+nature+"]]>").append("</line_type>");
...@@ -5283,8 +5283,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch ...@@ -5283,8 +5283,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
rs = null; rs = null;
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
// C and P nature added by nandkumar gadkari on 06/08/19
if ("F".equalsIgnoreCase(ls_nature) || "B".equalsIgnoreCase(ls_nature) || "S".equalsIgnoreCase(ls_nature) || "I".equalsIgnoreCase(ls_nature) || "V".equalsIgnoreCase(ls_nature)) if ("F".equalsIgnoreCase(ls_nature) || "B".equalsIgnoreCase(ls_nature) || "S".equalsIgnoreCase(ls_nature) || "I".equalsIgnoreCase(ls_nature) || "V".equalsIgnoreCase(ls_nature) || "P".equalsIgnoreCase(nature) || "C".equalsIgnoreCase(nature))
{ {
valueXmlString.append("<rate__stduom>").append("<![CDATA[0]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[0]]>").append("</rate__stduom>");
valueXmlString.append("<line_type>").append("<![CDATA["+ls_nature+"]]>").append("</line_type>"); valueXmlString.append("<line_type>").append("<![CDATA["+ls_nature+"]]>").append("</line_type>");
...@@ -6090,8 +6090,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch ...@@ -6090,8 +6090,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
}//End If }//End If
}//end if }//end if
// C and P nature added by nandkumar gadkari on 06/08/19
if ("F".equalsIgnoreCase(ls_nature) || "B".equalsIgnoreCase(ls_nature) || "S".equalsIgnoreCase(ls_nature) || "I".equalsIgnoreCase(ls_nature) || "V".equalsIgnoreCase(ls_nature)) if ("F".equalsIgnoreCase(ls_nature) || "B".equalsIgnoreCase(ls_nature) || "S".equalsIgnoreCase(ls_nature) || "I".equalsIgnoreCase(ls_nature) || "V".equalsIgnoreCase(ls_nature) || "P".equalsIgnoreCase(nature) || "C".equalsIgnoreCase(nature))
{ {
valueXmlString.append("<rate__stduom>").append("<![CDATA[0]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[0]]>").append("</rate__stduom>");
......
...@@ -1441,7 +1441,7 @@ public class PostOrdDespatchGen ...@@ -1441,7 +1441,7 @@ public class PostOrdDespatchGen
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature)) if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature) || "P".equalsIgnoreCase(nature) || "C".equalsIgnoreCase(nature))
{ {
tempMapSord.put("line_type",nature); tempMapSord.put("line_type",nature);
} }
......
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