changes made at sun for wms

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91514 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>webitm-dis</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

webitm-dis/ibase/webitm/ejb/dis/InvHoldGen.java

@@ -10,6 +10,7 @@ import ibase.utility.*;
 import ibase.system.config.*;
 import ibase.utility.BaseLogger;
 import ibase.webitm.ejb.*;
+import ibase.webitm.ejb.dis.adv.*;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.webitm.utility.ITMException;
@@ -58,7 +59,7 @@ public class InvHoldGen
 			{
 				return "";
 			}
-			conn.setAutoCommit(false);
+			//conn.setAutoCommit(false);
 
 			String holdInsertSql = "INSERT INTO INV_HOLD(TRAN_ID,TRAN_DATE,SITE_CODE,CONFIRMED,REF_ID,REF_SER,CHG_USER,CHG_DATE,CHG_TERM, LOCK_CODE) VALUES(?,?,?,?,?,?,?,?,?,?)";
 
@@ -150,6 +151,16 @@ public class InvHoldGen
 			}
 			pstmtHolddet.executeBatch();
 			pstmtHolddet.clearBatch();
+			InvHoldConf invHoldConf = new InvHoldConf();
+			retString = invHoldConf.confirm( tranId, xtraParams, "" , conn ,false);
+			if (retString.indexOf("VTCNFSUCC") > 0)
+			{
+				retString = "";
+			}
+			else
+			{
+				isError = true;
+			}
 		}
 		catch(BatchUpdateException buex)
         {

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java

@@ -1164,18 +1164,18 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					itemLockList = new ArrayList();
 					sql = "select lock_code from lock_group "
 						+ " where  lock_group = ? " ;
-					pstmt = conn.prepareStatement(sql);
-					pstmt.setString(1, tempLockGroup);
-					rs = pstmt.executeQuery();
-					while ( rs.next() )
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1, tempLockGroup);
+					rs1 = pstmt1.executeQuery();
+					while ( rs1.next() )
 					{
-						lockCode = rs.getString("lock_code");
+						lockCode = rs1.getString("lock_code");
 						itemLockList.add(lockCode);
 					}			
-					pstmt.close();
-					pstmt = null;					
-					rs.close();
-					rs = null;
+					pstmt1.close();
+					pstmt1 = null;					
+					rs1.close();
+					rs1 = null;
 				
 				}
 				else if(suppLockList.size() > 0)