Commit ab4f23ac authored by ngadkari's avatar ngadkari

Added SCHEME_STOCK_CHECK disparm to checking of stock or not

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@207031 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 307b9366
...@@ -749,7 +749,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave ...@@ -749,7 +749,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
int llPlcount=0,minShelfLife=0,lineNos=0,cnt=0,updatedCount=0,schCnt=0; int llPlcount=0,minShelfLife=0,lineNos=0,cnt=0,updatedCount=0,schCnt=0;
String itemFlag="",lineNoSord="",chgUser="",chgTerm="",taxChap="",taxEnv="",taxClass="",unitRate="",itemDesc="",status="",unitStd="",packCode="",itemCode=""; String itemFlag="",lineNoSord="",chgUser="",chgTerm="",taxChap="",taxEnv="",taxClass="",unitRate="",itemDesc="",status="",unitStd="",packCode="",itemCode="";
String itemSer="",itemSerProm="",locType="",holdflag="",nature="",unitSal="",mType=""; String itemSer="",itemSerProm="",locType="",holdflag="",nature="",unitSal="",mType="";
String schemeCode="",countCodeDlv="",stateCodeDlv="",schemeCode1="",SordlineNo=""; String schemeCode="",countCodeDlv="",stateCodeDlv="",schemeCode1="",SordlineNo="",schemeStkChk="";
double offerPoints=0,totalpoints=0,freePoints=0,reqPoints=0,availQty=0,unConfFreeQty=0,unconfreqPoints=0,unConfTotFreePoints=0,quantity=0; double offerPoints=0,totalpoints=0,freePoints=0,reqPoints=0,availQty=0,unConfFreeQty=0,unconfreqPoints=0,unConfTotFreePoints=0,quantity=0;
boolean schemeUsedInDetail=false; boolean schemeUsedInDetail=false;
try { try {
...@@ -954,7 +954,12 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave ...@@ -954,7 +954,12 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
pstmt1 = null; pstmt1 = null;
rs1 = null; rs1 = null;
freePoints= freePoints - unConfTotFreePoints; freePoints= freePoints - unConfTotFreePoints;
//added by nandkumar gadkari on 09/09/19
schemeStkChk = distCommon.getDisparams( "999999", "SCHEME_STOCK_CHECK", conn );
if(schemeStkChk==null || schemeStkChk.trim().length() ==0 || schemeStkChk.equalsIgnoreCase("NULLFOUND"))
{
schemeStkChk="Y";
}
sql = "select item_code, required_points from SCH_OFFER_ITEMS where SCHEME_CODE =? "; sql = "select item_code, required_points from SCH_OFFER_ITEMS where SCHEME_CODE =? ";
pstmt2 = conn.prepareStatement(sql); pstmt2 = conn.prepareStatement(sql);
...@@ -968,7 +973,10 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave ...@@ -968,7 +973,10 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
itemCodeOrd = rs2.getString(1); itemCodeOrd = rs2.getString(1);
reqPoints = rs2.getDouble(2); reqPoints = rs2.getDouble(2);
//if condition added by nandkumar gadkari on 09/09/19
if("Y".equalsIgnoreCase(schemeStkChk.trim()))
{
sql="SELECT SUM(a.QUANTITY - a.ALLOC_QTY - CASE WHEN a.HOLD_QTY IS NULL THEN 0 ELSE a.HOLD_QTY END ) AVAIL_QTY " sql="SELECT SUM(a.QUANTITY - a.ALLOC_QTY - CASE WHEN a.HOLD_QTY IS NULL THEN 0 ELSE a.HOLD_QTY END ) AVAIL_QTY "
+" FROM STOCK A, " +" FROM STOCK A, "
+"LOCATION B, " +"LOCATION B, "
...@@ -997,6 +1005,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave ...@@ -997,6 +1005,7 @@ public class SaleOrderPostSave extends ValidatorEJB implements SaleOrderPostSave
{ {
continue; continue;
} }
}
quantity=integralPartQty(freePoints/reqPoints); quantity=integralPartQty(freePoints/reqPoints);
if(quantity <= 0) if(quantity <= 0)
{ {
......
...@@ -1304,7 +1304,7 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde ...@@ -1304,7 +1304,7 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
Timestamp orderDate=null; Timestamp orderDate=null;
double offerPoints=0,totalpoints=0,freePoints=0,reqPoints=0,availQty=0,unConfFreeQty=0,unconfreqPoints=0,unConfTotFreePoints=0,quantity=0,prvFreePoints=0; double offerPoints=0,totalpoints=0,freePoints=0,reqPoints=0,availQty=0,unConfFreeQty=0,unconfreqPoints=0,unConfTotFreePoints=0,quantity=0,prvFreePoints=0;
int cnt=0,domID=0,len=0,noOfDetails=0; int cnt=0,domID=0,len=0,noOfDetails=0;
String countCodeDlv="",stateCodeDlv="",schemeCodeList="",browItemCode=""; String countCodeDlv="",stateCodeDlv="",schemeCodeList="",browItemCode="",schemeStkChk="";
List<String> getSchemeList = new ArrayList<String>(); List<String> getSchemeList = new ArrayList<String>();
List<String> schemeList = new ArrayList<String>(); List<String> schemeList = new ArrayList<String>();
NodeList detailList = null; NodeList detailList = null;
...@@ -1537,7 +1537,12 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde ...@@ -1537,7 +1537,12 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
} }
} }
freePoints= freePoints - prvFreePoints; freePoints= freePoints - prvFreePoints;
//added by nandkumar gadkari on 09/09/19
schemeStkChk = distCommon.getDisparams( "999999", "SCHEME_STOCK_CHECK", conn );
if(schemeStkChk==null || schemeStkChk.trim().length() ==0 || schemeStkChk.equalsIgnoreCase("NULLFOUND"))
{
schemeStkChk="Y";
}
sql = "select item_code, required_points from SCH_OFFER_ITEMS where SCHEME_CODE =? "; sql = "select item_code, required_points from SCH_OFFER_ITEMS where SCHEME_CODE =? ";
pstmt2 = conn.prepareStatement(sql); pstmt2 = conn.prepareStatement(sql);
pstmt2.setString(1, schemeCode); pstmt2.setString(1, schemeCode);
...@@ -1550,7 +1555,10 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde ...@@ -1550,7 +1555,10 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
itemCodeOrd = rs2.getString(1); itemCodeOrd = rs2.getString(1);
reqPoints = rs2.getDouble(2); reqPoints = rs2.getDouble(2);
//if condition added by nandkumar gadkari on 09/09/19
if("Y".equalsIgnoreCase(schemeStkChk.trim()))
{
sql="SELECT SUM(a.QUANTITY - a.ALLOC_QTY - CASE WHEN a.HOLD_QTY IS NULL THEN 0 ELSE a.HOLD_QTY END ) AVAIL_QTY " sql="SELECT SUM(a.QUANTITY - a.ALLOC_QTY - CASE WHEN a.HOLD_QTY IS NULL THEN 0 ELSE a.HOLD_QTY END ) AVAIL_QTY "
+" FROM STOCK A, " +" FROM STOCK A, "
+"LOCATION B, " +"LOCATION B, "
...@@ -1579,6 +1587,7 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde ...@@ -1579,6 +1587,7 @@ public class SorderAct extends ActionHandlerEJB implements SorderActLocal, Sorde
{ {
continue; continue;
} }
}
quantity=integralPartQty(freePoints/reqPoints); quantity=integralPartQty(freePoints/reqPoints);
if(quantity <= 0) if(quantity <= 0)
{ {
......
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