Commit cf0e111d authored by prane's avatar prane

iss_criteria in item master is W. then system should not allow to issue partial quantity.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@182817 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 62b6541c
...@@ -1909,7 +1909,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -1909,7 +1909,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
//System.out.println("rate1 :" + rate1); //System.out.println("rate1 :" + rate1);
sql = " SELECT (CASE WHEN ACTIVE IS NULL THEN 'Y' ELSE ACTIVE END) ACT, MIN_SHELF_LIFE, " sql = " SELECT (CASE WHEN ACTIVE IS NULL THEN 'Y' ELSE ACTIVE END) ACT, MIN_SHELF_LIFE, "
+ " (CASE WHEN TRACK_SHELF_LIFE IS NULL THEN 'N' ELSE TRACK_SHELF_LIFE END) TRK_SHELF_LIFE, " + " (CASE WHEN TRACK_SHELF_LIFE IS NULL THEN 'N' ELSE TRACK_SHELF_LIFE END) TRK_SHELF_LIFE, "
+ " (CASE WHEN SUPP_SOUR IS NULL THEN 'M' ELSE SUPP_SOUR END) SUP_SOUR, DESCR " + " (CASE WHEN SUPP_SOUR IS NULL THEN 'M' ELSE SUPP_SOUR END) SUP_SOUR, DESCR, ISS_CRITERIA "
+ " FROM ITEM WHERE ITEM_CODE = '" + itemCode + "'"; + " FROM ITEM WHERE ITEM_CODE = '" + itemCode + "'";
System.out.println( "sql :" + sql ); System.out.println( "sql :" + sql );
rs = stmt.executeQuery(sql); rs = stmt.executeQuery(sql);
...@@ -1924,7 +1924,11 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -1924,7 +1924,11 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
suppSour = rs.getString( 4 ); suppSour = rs.getString( 4 );
itemDescr = rs.getString( 5 ); itemDescr = rs.getString( 5 );
//Added By Pavan Rane on 29MAR2018[START][iss_criteria in item master is W. then system should not allow to issue partial quantity.]
issCriteria = rs.getString( 6 );
System.out.println("issCriteria :[" + issCriteria+"]");
//Added By Pavan Rane on 29MAR2018[END]
/* System.out.println("active : " + active); /* System.out.println("active : " + active);
System.out.println("minShelfLife : " + minShelfLife); System.out.println("minShelfLife : " + minShelfLife);
System.out.println("trackShelfLife : " + trackShelfLife); System.out.println("trackShelfLife : " + trackShelfLife);
...@@ -2187,36 +2191,48 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -2187,36 +2191,48 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
return errString; return errString;
} }
} }
//System.out.println("stockQty :" + stockQty + " \nremQuantity :" + remQuantity); System.out.println("stockQty before issCriteria[" + stockQty + "] remQuantity :[" + remQuantity+"]");
if (stockQty >= remQuantity) //Added By Pavan Rane on 29MAR2018[START][iss_criteria in item master is W. then system should not allow to issue partial quantity.]
if (issCriteria != null && ("W").equalsIgnoreCase(issCriteria))
{ {
if (checkIntegralQty.equals("Y")) if (stockQty >= remQuantity)
{ {
//mod = (remQuantity % integralQty); minputQty = remQuantity;
//System.out.println("mod :"+mod); }
remQuantity = remQuantity - (remQuantity % integralQty); }
//System.out.println("remQuantity :"+remQuantity); else
}
minputQty = remQuantity;
//System.out.println("minputQty :"+minputQty);
remQuantity = 0;
}
else if (stockQty < remQuantity)
{ {
if (checkIntegralQty.equals("Y")) //Added by Pavan Rane on 29MAR2018[END]
if (stockQty >= remQuantity)
{ {
//mod = (stockQty % integralQty); if (checkIntegralQty.equals("Y"))
//System.out.println("mod :"+mod); {
//stockQty = stockQty - mod; //mod = (remQuantity % integralQty);
stockQty = stockQty - (stockQty % integralQty); //System.out.println("mod :"+mod);
//System.out.println("stockQty :"+stockQty); remQuantity = remQuantity - (remQuantity % integralQty);
} //System.out.println("remQuantity :"+remQuantity);
minputQty = stockQty; }
//System.out.println("minputQty :"+minputQty); minputQty = remQuantity;
remQuantity = remQuantity - stockQty; System.out.println("@@ 2214 minputQty :"+minputQty);
//System.out.println("remQuantity :"+remQuantity); remQuantity = 0;
} }
//System.out.println("minputQty :"+minputQty); else if (stockQty < remQuantity)
{
if (checkIntegralQty.equals("Y"))
{
//mod = (stockQty % integralQty);
//System.out.println("mod :"+mod);
//stockQty = stockQty - mod;
stockQty = stockQty - (stockQty % integralQty);
//System.out.println("stockQty :"+stockQty);
}
minputQty = stockQty;
//System.out.println("minputQty :"+minputQty);
remQuantity = remQuantity - stockQty;
//System.out.println("remQuantity :"+remQuantity);
}
}
System.out.println("@@ 2233 minputQty :"+minputQty);
if (minputQty == 0) if (minputQty == 0)
{ {
continue; continue;
...@@ -2578,6 +2594,18 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal, ...@@ -2578,6 +2594,18 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
netWt = 0; netWt = 0;
cnt++; cnt++;
//System.out.println("The cnt :" + ++cnt); //System.out.println("The cnt :" + ++cnt);
//Added By Pavan R on 29MAR2018[START][iss_criteria in item master is W. then system should not allow to issue partial quantity.]
if (issCriteria != null && ("W").equalsIgnoreCase(issCriteria))
{
if (stockQty >= remQuantity)
{
if(minputQty > 0)
{
System.out.println("break executed...");
break;
}
}
}//Added by Pavan R on 29MAR2018[END]
}//while end }//while end
//changed by msalam on 22/09/07 start //changed by msalam on 22/09/07 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