Skip to content

B
business-java
Commit 4e7b9f4c authored by pjain's avatar pjain
Browse files
Options

changed by dhanraj on 27/08/14 for repl cursor issue 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96092 ce508802-f39f-4f6c-b175-0d175dae99d5
parent af089d20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 333 additions and 22 deletions
webitm-wms/ibase/webitm/ejb/wms/PickIssConf.java
View file @ 4e7b9f4c
...@@ -54,7 +54,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -54,7 +54,8 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
return retString; return retString;
} }
public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException public String confirm( String tranId, String xtraParams,String forcedFlag, Connection conn, boolean connStatus ) throws RemoteException,ITMException
{ {
System.out.println("@@@@@@@@ Call confirm Method of PickIssConf @@@@@@@@");
String replOrder = ""; String replOrder = "";
String confirmed = ""; String confirmed = "";
String retString = ""; String retString = "";
...@@ -187,8 +188,20 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -187,8 +188,20 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
pickOrder = rs.getString( "PICK_ORDER" ); pickOrder = rs.getString( "PICK_ORDER" );
pickType = rs.getString( "PICK_TYPE" ); pickType = rs.getString( "PICK_TYPE" );
} }
rs.close();rs = null; //Start Changed by Dhanraj. 23-Aug-14 Check first rs and pstm stmt close or not then close it.
pstmt.close();pstmt = null; /*rs.close();rs = null;
pstmt.close();pstmt = null;*/
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
//End Changed by Dhanraj. 23-Aug-14 Check first rs and pstm stmt close or not then close it.
if( confirmed.equalsIgnoreCase("Y") ) if( confirmed.equalsIgnoreCase("Y") )
{ {
...@@ -229,6 +242,24 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -229,6 +242,24 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
System.out.println("@@@@ NOT MATCHING ....LINE NUMBER ["+linoNoOrd+" ] AND NO_ART :[ "+noArtOrd +" ] "); System.out.println("@@@@ NOT MATCHING ....LINE NUMBER ["+linoNoOrd+" ] AND NO_ART :[ "+noArtOrd +" ] ");
} }
} }
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open......
if(rsIss != null){
rsIss.close();
rsIss=null;
}
if(pstmtIss !=null){
pstmtIss.close();
pstmtIss=null;
}
if(rs != null){
rs.close();
rs=null;
}
if(pstmt !=null){
pstmt.close();
pstmt=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open......
System.out.println("Current Pick type -->>["+pickType+"]"); System.out.println("Current Pick type -->>["+pickType+"]");
if("M".equalsIgnoreCase(pickType)) if("M".equalsIgnoreCase(pickType))
{ {
...@@ -578,6 +609,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -578,6 +609,11 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
pstmtUpd.setString(8, lotSl); pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpd !=null){
pstmtUpd.close(); pstmtUpd=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
System.out.println("manohar 18/09/12 sordalloc updated updCnt [" + updCnt + "]"); System.out.println("manohar 18/09/12 sordalloc updated updCnt [" + updCnt + "]");
if (expLev == null || expLev.trim().length() == 0) if (expLev == null || expLev.trim().length() == 0)
...@@ -642,6 +678,12 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -642,6 +678,12 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
pstmtUpd.setString(8, lotSl); pstmtUpd.setString(8, lotSl);
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpd !=null){
pstmtUpd.close();
pstmtUpd=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
System.out.println("Pragyan 19/12/12 sordalloc If alrady exist Location Update Inside grater updCnt2nd [" + updCnt + "]"); System.out.println("Pragyan 19/12/12 sordalloc If alrady exist Location Update Inside grater updCnt2nd [" + updCnt + "]");
} }
//Changed By Pragyan 17/12/12.end //Changed By Pragyan 17/12/12.end
...@@ -699,6 +741,12 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -699,6 +741,12 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
pstmtUpd.setString(25, "Y"); pstmtUpd.setString(25, "Y");
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
System.out.println("manohar 18/09/12 sordalloc inserted updCnt [" + updCnt + "]"); System.out.println("manohar 18/09/12 sordalloc inserted updCnt [" + updCnt + "]");
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpd != null){
pstmtUpd.close();
pstmtUpd=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
} }
} }
else else
...@@ -748,6 +796,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -748,6 +796,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
pstmtUpd.setString(7, lotSl); pstmtUpd.setString(7, lotSl);
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
System.out.println("manohar 19/12/12 sordalloc If alrady exist Location Update updCnt1st [" + updCnt + "]"); System.out.println("manohar 19/12/12 sordalloc If alrady exist Location Update updCnt1st [" + updCnt + "]");
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpd !=null)
{
pstmtUpd.close();
pstmtUpd=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
//changed by sankara on 17/10/13 update wave_flag //changed by sankara on 17/10/13 update wave_flag
//updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?" //updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?"
updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?, WAVE_FLAG = 'Y' " updateSql = "UPDATE SORDALLOC SET QTY_ALLOC = QTY_ALLOC + ? ,QUANTITY__STDUOM = QUANTITY__STDUOM + ?, WAVE_FLAG = 'Y' "
...@@ -776,6 +831,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -776,6 +831,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
System.out.println("Pragyan 19/12/12 sordalloc If alrady exist Location Update updCnt2nd [" + updCnt + "]"); System.out.println("Pragyan 19/12/12 sordalloc If alrady exist Location Update updCnt2nd [" + updCnt + "]");
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpd != null)
{
pstmtUpd.close();
pstmtUpd=null;
}
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
} }
else else
{ {
...@@ -805,6 +867,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -805,6 +867,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
pstmtUpd.setString(7, lotSl); pstmtUpd.setString(7, lotSl);
updCnt = pstmtUpd.executeUpdate(); updCnt = pstmtUpd.executeUpdate();
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpd !=null)
{
pstmtUpd.close();
pstmtUpd=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
} }
//Changed By Pragyan19/12/12.end //Changed By Pragyan19/12/12.end
...@@ -838,6 +907,17 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -838,6 +907,17 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
System.out.println("manohar 18/09/12 sordalloc Update updCnt [" + updCnt + "]"); System.out.println("manohar 18/09/12 sordalloc Update updCnt [" + updCnt + "]");
} }
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(rsSord != null)
{
rsSord.close();
rsSord=null;
}if(pstmtSord != null)
{
pstmtSord.close();
pstmtSord=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
/* strAllocate = null; /* strAllocate = null;
// end 16/10/11 manoharan allocation stock for new location // end 16/10/11 manoharan allocation stock for new location
// 16/10/11 manoharan update sordalloc // 16/10/11 manoharan update sordalloc
...@@ -883,6 +963,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -883,6 +963,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
isUpdatehdr = updatePickOrderHeader(replOrder,conn); isUpdatehdr = updatePickOrderHeader(replOrder,conn);
} }
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpdPickOrdDet != null)
{
pstmtUpdPickOrdDet.close();
pstmtUpdPickOrdDet=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
updatePickOrdSql = "UPDATE PICK_ISS_DET SET LOC_CODE = ? " updatePickOrdSql = "UPDATE PICK_ISS_DET SET LOC_CODE = ? "
+ " WHERE TRAN_ID = ? AND LINE_NO = ? "; + " WHERE TRAN_ID = ? AND LINE_NO = ? ";
...@@ -905,11 +992,30 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -905,11 +992,30 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
{ {
isUpdatehdr = updatePickOrderHeader(replOrder,conn); isUpdatehdr = updatePickOrderHeader(replOrder,conn);
} }
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpdPickOrdDet != null)
{
pstmtUpdPickOrdDet.close();
pstmtUpdPickOrdDet=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
} }
rs.close(); //Start Changed by Dhanraj.23-Aug-14 add first check rs and pstm null or not then close.
/*rs.close();
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;//While close.*/
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;//While close.
}
//End Changed by Dhanraj.23-Aug-14 add first check rs and pstm null or not then close.
//Changed by Rohan on 21-06-13 for closing prepared statement.start //Changed by Rohan on 21-06-13 for closing prepared statement.start
if(pstmtStock != null) if(pstmtStock != null)
{ {
...@@ -1057,6 +1163,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1057,6 +1163,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]"); System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
} }
pstmtSord.clearParameters(); pstmtSord.clearParameters();
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtSord != null)
{
pstmtSord.close();
pstmtSord = null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after after start scaning .end //Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after after start scaning .end
...@@ -1282,6 +1395,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1282,6 +1395,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
break; break;
} }
} }
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtPickOrdHdr != null)
{
pstmtPickOrdHdr.close();
pstmtPickOrdHdr=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(isUpdateHdr) if(isUpdateHdr)
{ {
...@@ -1295,6 +1415,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P ...@@ -1295,6 +1415,13 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
updCntPickOrdHdr = pstmtUpdPickOrdHdr.executeUpdate(); updCntPickOrdHdr = pstmtUpdPickOrdHdr.executeUpdate();
//Start Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(pstmtUpdPickOrdHdr !=null)
{
pstmtUpdPickOrdHdr.close();
pstmtUpdPickOrdHdr=null;
}
//End Changed by Dhanraj.23-Aug-14 Close pstm and rs stmt For Maxinum cursor open.
if(updCntPickOrdHdr > 0) if(updCntPickOrdHdr > 0)
{ {
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 4e7b9f4c
...@@ -7047,8 +7047,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -7047,8 +7047,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
tranCode = (String)transPorterInfoMap.get("TRAN_CODE"); tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
transMode = (String)transPorterInfoMap.get("TRANS_MODE"); transMode = (String)transPorterInfoMap.get("TRANS_MODE");
} }
String mShipType = (String)transPorterInfoMap.get("SHIP_TYPE");
if("N".equalsIgnoreCase(frmDomMasterPackAllow) && "N".equalsIgnoreCase(frmDomParcelPackAllow) && ("P".equalsIgnoreCase(mShipType) || "M".equalsIgnoreCase(mShipType)) )
{
return errString = getError(saleOrder,"VTNOTPARCT",conn);
}
} }
else else
{ {
......
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