Commit 9e475555 authored by dpawar's avatar dpawar

added sql for list type of pricelist


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97153 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a9807a2a
...@@ -66,6 +66,11 @@ public class ConsolidatToDoc { ...@@ -66,6 +66,11 @@ public class ConsolidatToDoc {
ResultSet rsItem = null; ResultSet rsItem = null;
ResultSet rsIss = null; ResultSet rsIss = null;
ResultSet rsSord = null; ResultSet rsSord = null;
//added by Dadaso pawar on 21/01/15 [Start]
PreparedStatement pstmtPriceList = null;
ResultSet rsPriceList = null;
String listType = "";
//added by Dadaso pawar on 21/01/15 [End]
int lineNo = 0 , lineNoOrd = 0; int lineNo = 0 , lineNoOrd = 0;
int update = 0, count = 0, totalNoArt = 0; int update = 0, count = 0, totalNoArt = 0;
...@@ -567,11 +572,25 @@ public class ConsolidatToDoc { ...@@ -567,11 +572,25 @@ public class ConsolidatToDoc {
if ( rsSord.next() ) if ( rsSord.next() )
{ {
priceList = checkNull(rsSord.getString("PRICE_LIST")); priceList = checkNull(rsSord.getString("PRICE_LIST"));
} }
rsSord.close(); rsSord = null; rsSord.close(); rsSord = null;
pstmtSord.clearParameters(); pstmtSord.clearParameters();
if ( priceList.trim().length() > 0 )
//added by Dadaso pawar on 21/01/15 [Start]
priceList = priceList == null ? "" : priceList.trim();
sql = "SELECT LIST_TYPE FROM PRICELIST WHERE PRICE_LIST = ?";
pstmtPriceList = conn.prepareStatement(sql);
pstmtPriceList.setString(1, priceList);
rsPriceList = pstmtPriceList.executeQuery();
if(rsPriceList.next())
{
listType = rsPriceList.getString("LIST_TYPE");
}
listType = listType == null ? "" : listType.trim();
if ( priceList.trim().length() > 0 && !("L".equals(listType)) )
{ {
//added by Dadaso pawar on 21/01/15 [End]
//if ( priceList.trim().length() > 0)
rate = disCommon.pickRate( priceList, sysDateStr, itemCode, " ", "L", quantity, conn ); rate = disCommon.pickRate( priceList, sysDateStr, itemCode, " ", "L", quantity, 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