Skip to content

B
business-java
Commit a43fe0b6 authored by prane's avatar prane
Browse files
Options

Proper message should displayed if processing fails. 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@205476 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a2de0267
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 29 deletions
webitm-wms/src/ibase/webitm/ejb/wms/NearExpiryPrc.java
View file @ a43fe0b6
......@@ -15,6 +15,7 @@ import ibase.system.config.*;
import ibase.utility.CommonConstants;
//import ibase.webitm.ejb.dis.adv.InvHoldRelConf;
import ibase.webitm.ejb.dis.adv.InvHoldRelConf;
import ibase.webitm.ejb.fin.FinCommon;
import java.rmi.RemoteException;
import java.sql.*;
import java.util.Date;
......@@ -215,25 +216,40 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
//SQL For expiry process
System.out.println(" Calling expiry process *******************************");
selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
//Pavan R 19aug19 start [changed as per suggested by SM sir to get qty - alloc qty]
selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, C.ITEM_SER,";
//"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
if("T".equalsIgnoreCase(lockORTransfer)) //Pavan Rane aug19
{
selectSql = selectSql + " A.QUANTITY - A.ALLOC_QTY as QUANTITY, ";
}else
{
selectSql = selectSql + "A.QUANTITY, ";
}
selectSql = selectSql + "A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
"A.REMARKS, D.INV_STAT, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE," +
"A.SITE_CODE__MFG, A.POTENCY_PERC, A.RATE, A.GROSS_RATE, A.RETEST_DATE,"+
"A.CONV__QTY_STDUOM, A.UNIT__ALT, A.BATCH_NO, A.ACCT_CODE__INV,A.CCTR_CODE__INV "+
"FROM STOCK A, INVSTAT B, ITEM C, LOCATION D "+
"WHERE A.LOC_CODE = D.LOC_CODE AND D.INV_STAT = B.INV_STAT "+
"AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = 'Y' "+
"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " ;
//"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+ //Commented by gulzar on 1/12/2012
"AND (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) > 0 "+//Changed by gulzar on 1/12/2012
if("T".equalsIgnoreCase(lockORTransfer)) //Pavan Rane aug19
{
selectSql = selectSql + " AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 ";
}else
{
selectSql = selectSql + " AND (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) > 0 ";//Changed by gulzar on 1/12/2012
}
//Changed by sumit sarkar on 24/06/12 putting condition of dStoreInvstat (DSO, pso, active pick, case pick)
//"AND D.INV_STAT = ? AND A.EXP_DATE IS NOT NULL "+
" AND D.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL "+
selectSql = selectSql + " AND D.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL "+
" AND A.EXP_DATE IS NOT NULL "+
//Changed by sumit sarkar on 03/07/12
" AND nvl(CHECK_PHYSCAN_VALUE(A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, ? , ?),0) <> 1 " +
" AND A.EXP_DATE <= SYSDATE ";
//Pavan R 19aug19 end [changed as per suggested by SM sir to get qty - alloc qty]
if( "YES".equalsIgnoreCase(siteCodeFromDisPa))
{
//taking site as a login site code
......@@ -415,23 +431,38 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
//Changed by sumit sarkar on 03/06/12 SQL For near expiry process start.
System.out.println(" Calling near expiry *******************************");
selectSql = "";
selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, " +
"C.ITEM_SER, A.QUANTITY, A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
//Pavan R 19aug19 start [changed as per suggested by SM sir to get qty - alloc qty]
selectSql = "SELECT A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, A.NO_ART, C.ITEM_SER, ";
if("T".equalsIgnoreCase(lockORTransfer)) //Pavan Rane aug19
{
selectSql = selectSql + " A.QUANTITY - A.ALLOC_QTY as QUANTITY, ";
}else
{
selectSql = selectSql + "A.QUANTITY, ";
}
selectSql = selectSql +"A.UNIT, A.GRADE, A.EXP_DATE, A.LTRAN_DATE,"+
"A.REMARKS, D.INV_STAT, A.PACK_CODE, A.ALLOC_QTY, A.MFG_DATE," +
"A.SITE_CODE__MFG, A.POTENCY_PERC, A.RATE, A.GROSS_RATE, A.RETEST_DATE,"+
"A.CONV__QTY_STDUOM, A.UNIT__ALT, A.BATCH_NO, A.ACCT_CODE__INV,A.CCTR_CODE__INV "+
"FROM STOCK A, INVSTAT B, ITEM C, LOCATION D "+
"WHERE A.LOC_CODE = D.LOC_CODE AND D.INV_STAT = B.INV_STAT "+
"AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = 'Y' "+
"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " ;
//"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+ //Commented by gulzar on 1/12/2012
"AND (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) > 0 "+//Changed by gulzar on 1/12/2012
if("T".equalsIgnoreCase(lockORTransfer)) //Pavan Rane aug19
{
selectSql = selectSql + " AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 ";
}else
{
selectSql = selectSql + " AND (CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) > 0 ";//Changed by gulzar on 1/12/2012
}
//Changed by sumit sarkar on 24/06/12 putting condition of dStoreInvstat (DSO, pso, active pick, case pick)
//"AND D.INV_STAT = ? AND A.EXP_DATE IS NOT NULL "+
" AND D.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL AND A.EXP_DATE > SYSDATE"+
selectSql = selectSql + " AND D.INV_STAT IN "+stringBuffer.toString()+" AND A.EXP_DATE IS NOT NULL AND A.EXP_DATE > SYSDATE"+
//Changed by sumit sarkar on 03/07/12 start
" AND nvl(CHECK_PHYSCAN_VALUE(A.ITEM_CODE, A.SITE_CODE, A.LOC_CODE, A.LOT_NO, A.LOT_SL, ? , ?),0) <> 1 " +
" AND A.EXP_DATE <= ADD_MONTHS(SYSDATE,C.MIN_SHELF_LIFE) ";
//Pavan R 19aug19 end[changed as per suggested by SM sir to get qty - alloc qty]
if( "YES".equalsIgnoreCase(siteCodeFromDisPa))
{
//taking site as a login site code
......@@ -535,20 +566,30 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
{
System.out.println("going to insert in inv_hold__Rel ");
retString=genInvRelTrans(lockRelList, xtraParams, conn);
System.out.println("retString" +retString);
System.out.println("retString 569::[" +retString+"]");
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
//Pavan R 19aug19 start [changed to display proper error message]
//if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
if ( retString != null && retString.trim().length() > 0 && retString.indexOf("Error") > -1 )
{
isError = true;
return retString;
//Pavan R 19aug19 end [changed to display proper error message]
}
System.out.println("going to insert in inv_hold EXPIRED");
retString = holdGen.generateHoldTrans( dataVal1, "EXPIRED","EXP", siteCode, stockExpList, xtraParams, conn );
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
//Pavan R 19aug19 start [changed to display proper error message]
System.out.println("retString 586::: [" + retString+"]");
//if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
if ( retString != null && retString.trim().length() > 0 && retString.indexOf("Error") > -1)
{
isError = true;
return retString;
//Pavan R 19aug19 end [changed to display proper error message]
}
/*else
{
......@@ -570,9 +611,14 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
System.out.println("going to insert in inv_hold for NEAREXPIRY ");
retString = holdGen.generateHoldTrans( dataVal2, "NEAREXPIRY","NEXP", siteCode, stockNexpList, xtraParams, conn );
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
//Pavan R 19aug19 start [changed to display proper error message]
System.out.println("retString 615::: [" + retString+"]");
//if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
if ( retString != null && retString.trim().length() > 0 && retString.indexOf("Error") > -1 )
{
isError = true;
return retString;
//Pavan R 19aug19 end[changed to display proper error message]
}
}
......@@ -597,9 +643,15 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
retString = inventoryTransfer(currSiteCode, stockExpList, "w_stock_transfer", xtraParams, conn );
System.out.println("retString......1["+retString+"]isError["+isError);
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
//Pavan R 19aug19 start[changed to display proper error message]
System.out.println("retString 547::: [" + retString+"]");
//if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
if ( retString != null && retString.trim().length() > 0 && retString.indexOf("Error") > -1)
{
isError = true;
return retString;
//Pavan R 19aug19 end[changed to display proper error message]
}
}
setSite.clear();
......@@ -624,9 +676,14 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
retString = inventoryTransfer(currSiteCode, stockNexpList, "w_stock_transfer", xtraParams, conn );
System.out.println("retString......2["+retString+"]isError["+isError);
}
if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
//Pavan R 19aug19 start[changed to display proper error message]
System.out.println("retString 680::: [" + retString+"]");
//if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
if ( retString != null && retString.trim().length() > 0 && retString.indexOf("Error") > -1)
{
isError = true;
return retString;
//Pavan R 19aug19 end[changed to display proper error message]
}
}
}
......@@ -676,7 +733,8 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
{
System.out.println("ROLLBACK the changes......");
conn.rollback();
retString = itmDBAccess.getErrorString("","PRCFAILED","","",conn);//Changes by mayur on 20-July-2018
//commented by Pavan Rane 19aug19[to return specific error]
//retString = itmDBAccess.getErrorString("","PRCFAILED","","",conn);//Changes by mayur on 20-July-2018
}
System.out.println("Closing Database Connection......");
if (rsItem != null)
......@@ -762,7 +820,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
{
DistCommon distComm = new DistCommon();
defReasCode = distComm.getDisparams("999999","DEFAULT_REAS_CODE",conn);
FinCommon fncomon = new FinCommon();
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
......@@ -905,9 +963,18 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
if (retString != null && retString.trim().length() > 0 )
{
isError = true;
retString = "ERROR";
//Pavan R 19aug19 start[to get error while updating stock]
if(retString.equals("VTLCKERR")) {
retString = itmDBAccess.getErrorString("","VTLCKERR","","",conn);
return retString;
}else {
retString = fncomon.getErrorXML("", "", "VTLCKERR", retString);
return retString;
}
//retString = "ERROR";
//return retString;
//Pavan R 19aug19 end[to get error while updating stock]
}
}
pstmtDet.executeBatch();
pstmtDet.clearBatch();
......@@ -915,7 +982,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
catch(BatchUpdateException buex)
{
isError = true;
retString = "ERROR";
//retString = "ERROR"; //Pavan R 19aug19 [to display proper error message]
int [] updateCounts = buex.getUpdateCounts();
for (int i = 0; i < updateCounts.length; i++)
{
......@@ -937,7 +1004,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
catch(SQLException se)
{
isError = true;
retString = "ERROR";
//retString = "ERROR"; //Pavan R 19aug19 [to display proper error message]
System.out.println("Exception : NearExpiryPrc : process()" +se.getMessage());
try
{
......@@ -949,7 +1016,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
catch(Exception e)
{
isError = true;
retString = "ERROR";
//retString = "ERROR"; //Pavan R 19aug19 [to display proper error message]
System.out.println("Exception :NearExpiryPrc :process():"+e.getMessage());
try
{
......@@ -968,7 +1035,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
{
System.out.println("ROLLBACK the changes......");
conn.rollback();
retString = "ERROR";
//retString = "ERROR"; //Pavan R 19aug19 [to display proper error message]
}
System.out.println("Closing Database Connection......");
if (rsItem != null)
......@@ -1218,7 +1285,7 @@ public class NearExpiryPrc extends ProcessEJB implements NearExpiryPrcLocal,Near
{
errString = "";
}
System.out.println("retString invHoldRelConf.confirm()::: [" + errString+"]");
}catch(Exception e)
{
e.printStackTrace();
......
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