Commit b841dbf3 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@204682 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8fa61ae2
...@@ -2808,7 +2808,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch ...@@ -2808,7 +2808,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
} }
} }
// validation added for not allow zero rate by nandkumar gadkari on 05/09/19---------------start-------------------------- // validation added for not allow zero rate by nandkumar gadkari on 05/08/19---------------start--------------------------
if (childNodeName.equalsIgnoreCase("rate__stduom")) if (childNodeName.equalsIgnoreCase("rate__stduom"))
{ {
rate = Double.parseDouble(checkDoubleNull(genericUtility.getColumnValue("rate__stduom", dom))); rate = Double.parseDouble(checkDoubleNull(genericUtility.getColumnValue("rate__stduom", dom)));
...@@ -2840,7 +2840,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch ...@@ -2840,7 +2840,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
} }
} }
// validation added by nandkumar gadkari on 05/09/19---------------end-------------------------- // validation added by nandkumar gadkari on 05/08/19---------------end--------------------------
} // end for } // end for
break; // case 2 end break; // case 2 end
......
...@@ -142,7 +142,7 @@ public class PostOrdDespatchGen ...@@ -142,7 +142,7 @@ public class PostOrdDespatchGen
int lineNoDet = 0; int lineNoDet = 0;
HashMap invAllocTraceMap = null; HashMap invAllocTraceMap = null;
InvAllocTraceBean invBean = null; InvAllocTraceBean invBean = null;
String sqlSord = ""; String sqlSord = "",lineType="";//lineType ADDED BY NANDKUMAR GADKARI ON 06/08/19
boolean cpFlag = false; boolean cpFlag = false;
try { try {
startTime = System.currentTimeMillis(); startTime = System.currentTimeMillis();
...@@ -1419,6 +1419,38 @@ public class PostOrdDespatchGen ...@@ -1419,6 +1419,38 @@ public class PostOrdDespatchGen
// sordList=new ArrayList(); // sordList=new ArrayList();
tempMapSord.put("sord_no", saleOrder); tempMapSord.put("sord_no", saleOrder);
//ADDED BY NANDKUMAR GADKARI ON 06/08/19------------------START----------------------------------
sql = " select nature,line_type " +
" from sorditem where sale_order = ? " +
" and line_no = ? and exp_lev = ? " +
" and line_type <> 'B' ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, saleOrder);
pstmt1.setString(2, lineNo );
pstmt1.setString(3, expLev );
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
nature = checkNull( rs1.getString("nature"));
lineType = checkNull( rs1.getString("line_type"));
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
if("F".equalsIgnoreCase(nature) || "B".equalsIgnoreCase(nature) || "S".equalsIgnoreCase(nature) || "I".equalsIgnoreCase(nature) || "V".equalsIgnoreCase(nature))
{
tempMapSord.put("line_type",nature);
}
else
{
tempMapSord.put("line_type",lineType);
}
//ADDED BY NANDKUMAR GADKARI ON 06/08/19------------------END----------------------------------
sordList.add(tempMapSord); sordList.add(tempMapSord);
//System.out.println("Sord item list====="+sordList); //System.out.println("Sord item list====="+sordList);
...@@ -2019,7 +2051,9 @@ public class PostOrdDespatchGen ...@@ -2019,7 +2051,9 @@ public class PostOrdDespatchGen
xmlBuff.append("<tax_chap><![CDATA[" + sordDetMap.get("tax_chap").toString() + "]]></tax_chap>"); xmlBuff.append("<tax_chap><![CDATA[" + sordDetMap.get("tax_chap").toString() + "]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA[" + sordDetMap.get("tax_env").toString() + "]]></tax_env>"); xmlBuff.append("<tax_env><![CDATA[" + sordDetMap.get("tax_env").toString() + "]]></tax_env>");
xmlBuff.append("<tax_amt><![CDATA[" + "0" + "]]></tax_amt>"); xmlBuff.append("<tax_amt><![CDATA[" + "0" + "]]></tax_amt>");
//ADDED BY NANDKUMAR GADKARI ON 06/08/19------------------START----------------------------------
xmlBuff.append("<line_type>").append("<![CDATA["+sordDetMap.get("line_type").toString()+"]]>").append("</line_type>");
//ADDED BY NANDKUMAR GADKARI ON 06/08/19------------------END----------------------------------
xmlBuff.append("</Detail2>"); xmlBuff.append("</Detail2>");
isDetailExist = true; isDetailExist = true;
//Pavan R [to deallocate quantity in invalloc_trace for S-ORD] start //Pavan R [to deallocate quantity in invalloc_trace for S-ORD] start
......
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