Commit 83288e27 authored by ngadkari's avatar ngadkari

added issue criteria condition for whole lot

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188705 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cec10502
...@@ -91,7 +91,7 @@ public class CreateDistIssue ...@@ -91,7 +91,7 @@ public class CreateDistIssue
int countDtl=0; int countDtl=0;
String locGroupJwiss=""; String locGroupJwiss="";
String subSQL=""; String subSQL="";
String rateClgStr="",rateFmDistOrd=""; String rateClgStr="",rateFmDistOrd="",issCriteria="";
try try
{ {
...@@ -407,7 +407,7 @@ public class CreateDistIssue ...@@ -407,7 +407,7 @@ public class CreateDistIssue
//availableYn ="Y"; // 28/05/09 manoharan commented taken from distorder table //availableYn ="Y"; // 28/05/09 manoharan commented taken from distorder table
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+"' ";
pstmt1= conn.prepareStatement(sql); pstmt1= conn.prepareStatement(sql);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
...@@ -418,6 +418,9 @@ public class CreateDistIssue ...@@ -418,6 +418,9 @@ public class CreateDistIssue
trackShelfLife = rs1.getString( 3 ); trackShelfLife = rs1.getString( 3 );
suppSour = rs1.getString( 4 ); suppSour = rs1.getString( 4 );
itemDescr = rs1.getString( 5 ); itemDescr = rs1.getString( 5 );
//Added By NANDKUMAR GADKARI 02/08/ 18[START][iss_criteria in item master is W. then system should not allow to issue partial quantity.]
issCriteria = rs1.getString( 6 );
System.out.println("issCriteria :[" + issCriteria+"]");
if( active.equals("N") ) if( active.equals("N") )
{ {
errCode = "VTITEM4"; errCode = "VTITEM4";
...@@ -606,6 +609,28 @@ public class CreateDistIssue ...@@ -606,6 +609,28 @@ public class CreateDistIssue
return errString; return errString;
} }
} }
System.out.println("stockQty before issCriteria[" + stockQty + "] remQuantity :[" + remQuantity+"]");
//Added By NANDKUMAR GADKARI 02/08/18 [START][iss_criteria in item master is W. then system should not allow to issue partial quantity.]
System.out.println("--1--issCriteria stockQty[" + stockQty + "] remQuantity[" + remQuantity+"] minputQty["+minputQty+"]");
if (issCriteria != null && ("W").equalsIgnoreCase(issCriteria))
{
if (stockQty >= remQuantity)
{
minputQty= remQuantity;
remQuantity = 0;
}
else
{
minputQty = stockQty;
remQuantity = remQuantity - stockQty;
}
System.out.println("--3--issCriteria stockQty[" + stockQty + "] remQuantity[" + remQuantity+"] minputQty["+minputQty+"]");
}
else
{
//Added by NANDKUMAR GADKARI 02/08/18 --------------------------------- [END]-----------------------
if (stockQty >= remQuantity) if (stockQty >= remQuantity)
{ {
if (checkIntegralQty.equals("Y")) if (checkIntegralQty.equals("Y"))
...@@ -625,6 +650,8 @@ public class CreateDistIssue ...@@ -625,6 +650,8 @@ public class CreateDistIssue
minputQty = stockQty; minputQty = stockQty;
remQuantity = remQuantity - stockQty; remQuantity = remQuantity - stockQty;
} }
}
System.out.println("--4--issCriteria stockQty[" + stockQty + "] remQuantity[" + remQuantity+"] minputQty["+minputQty+"]");
if (minputQty == 0) if (minputQty == 0)
{ {
continue; continue;
...@@ -1726,7 +1753,7 @@ public class CreateDistIssue ...@@ -1726,7 +1753,7 @@ public class CreateDistIssue
if (!checkIntegralQty.equals("N")) if (!checkIntegralQty.equals("N"))
{ {
//integralQty = getIntegralQty( siteCode, itemCode, lotNo, packCode,conn ); //integralQty = getIntegralQty( siteCode, itemCode, lotNo, packCode,conn );
integralQty = getIntegralQty( siteCode, itemCode, lotNo, packCode, checkIntegralQty ); integralQty = getIntegralQty( siteCode, itemCode, lotNo, packCode, checkIntegralQty);
//System.out.println("integralQty :"+integralQty); //System.out.println("integralQty :"+integralQty);
if (integralQty <= 0) if (integralQty <= 0)
{ {
...@@ -2818,6 +2845,7 @@ public class CreateDistIssue ...@@ -2818,6 +2845,7 @@ public class CreateDistIssue
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
stmt = conn.createStatement(); stmt = conn.createStatement();
char type = checkIntegralQty.charAt(0); char type = checkIntegralQty.charAt(0);
//System.out.println("type==>"+type); //System.out.println("type==>"+type);
...@@ -3016,6 +3044,8 @@ public class CreateDistIssue ...@@ -3016,6 +3044,8 @@ public class CreateDistIssue
try try
{ {
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
stmt = conn.createStatement(); stmt = conn.createStatement();
System.out.println("type :"+type); System.out.println("type :"+type);
switch (type) switch (type)
......
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