Skip to content

B
business-java
Commit 277cbb0c authored by ngadkari's avatar ngadkari
Browse files
Options

scheme balance changes in validation 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@194389 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ace2bedf
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 277cbb0c
...@@ -2578,19 +2578,20 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -2578,19 +2578,20 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt.setDouble(8, qty); pstmt.setDouble(8, qty);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
lsRefNo = rs.getString("ref_no"); lsRefNo = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, "L", qty, mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, lsListType, qty,
conn); conn);
} }
if (mRate <= 0) { if (mRate <= 0) {
mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, "L", qty, /*mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, "L", qty,
conn); conn);*/
mRate = distCommon.pickRate(lsPriceList, ldtDateStr, itemCodeOrd, "", "L", qty, conn);
} }
} }
...@@ -2704,19 +2705,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -2704,19 +2705,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt.setDouble(8, qty); pstmt.setDouble(8, qty);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
lsRefNo = rs.getString("ref_no"); lsRefNo = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, "L", qty, mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, lsListType, qty,
conn); conn);
} }
if (mRate <= 0) { if (mRate <= 0) {
mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, itemCodeOrd, lsRefNo, "L", qty, mRate = distCommon.pickRate(lsPriceList, ldtDateStr, itemCodeOrd, "", "L", qty, conn);
conn);
} }
} }
else else
...@@ -2732,7 +2732,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -2732,7 +2732,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
value= qty * mRate; value= qty * mRate;
unConfTotFreeQty= unConfTotFreeQty + value; unConfTotFreeQty= unConfTotFreeQty + value;
System.out.println("unConfTotFreeQty separte free" + lsPriceList +ldtPlDate+ qty ); System.out.println("unConfTotFreeQty separte free" + lsPriceList +ldtPlDate+ qty + unConfTotFreeQty + mRate);
} }
...@@ -2831,19 +2831,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -2831,19 +2831,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt.setDouble(8, quantity); pstmt.setDouble(8, quantity);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
lsRefNo = rs.getString("ref_no"); lsRefNo = rs.getString(1);
} }
rs.close(); rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, browItemCode, lsRefNo, "L", quantity, mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, browItemCode, lsRefNo, lsListType, quantity,
conn); conn);
} }
if (mRate <= 0) { if (mRate <= 0) {
mRate = distCommon.pickRateRefnoWise(lsPriceList, ldtDateStr, browItemCode, lsRefNo, "L", quantity, mRate = distCommon.pickRate(lsPriceList, ldtDateStr, itemCodeOrd, "", "L", qty, conn);
conn);
} }
} }
else else
...@@ -2865,7 +2864,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -2865,7 +2864,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
} }
System.out.println(
"valueAmount insdie V[" + valueAmount+ "]"+unConfTotFreeQty + prvFreeQty);
if ((valueAmount +unConfTotFreeQty + prvFreeQty ) > freeQty) { if ((valueAmount +unConfTotFreeQty + prvFreeQty ) > freeQty) {
errCode = "VTFREEQTY1";// Entered free quantity is errCode = "VTFREEQTY1";// Entered free quantity is
// greater than scheme's free // greater than scheme's free
......
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