updated

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

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

@@ -1079,7 +1079,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 							   +"((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
 							   +"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
 							   +"SORDER.SITE_CODE,SORDITEM.EXP_LEV, "
-							   +"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
+							   +"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
 							   //Chnged by Rohan 0n 22/06/12
 							   //Changed by sumit 20/08/12 getting column data start.
 							   //+",SORDER.ALLOC_FLAG AS ALLOC_FLAG "		   
@@ -1119,7 +1119,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 					 rs = pstmt.executeQuery();
 					 if( rs.next())
 					 {
-						 singleLot = rs.getString("SINGLE_LOT");
+						 singleLot = rs.getString("SINGLE_LOT")==null?"N":rs.getString("SINGLE_LOT");
 						 minSelfLife = rs.getInt("MIN_SHELF_LIFE");
 						 pendingQty = rs.getInt("PENDING_QUANTITY");
 					 }
@@ -1299,7 +1299,6 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 									stockList.add(lotNo+"@"+lotSl+"@"+locCode+"@"+locDescr+"@"+qtyAvail);
 									stockLotDetail.put(lotNo, stockList);
 								}
-									
 							}
 							rs.close(); rs = null;
 							pstmt.close(); pstmt = null;
@@ -1795,7 +1794,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 					   +"((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
 					   +"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
 					   +"SORDER.SITE_CODE,SORDITEM.EXP_LEV, "
-					   +"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
+					   +"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
 					   +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW "		   
 					   +"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE "
 					   //Changed by sumit 20/08/12 getting column data end.
@@ -1831,7 +1830,7 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 			 rs = pstmt.executeQuery();
 			 if( rs.next())
 			 {
-				 singleLot = rs.getString("SINGLE_LOT");
+				 singleLot = rs.getString("SINGLE_LOT")==null?"N":rs.getString("SINGLE_LOT");
 				 minSelfLife = rs.getInt("MIN_SHELF_LIFE");
 				 pendingQty = rs.getInt("PENDING_QUANTITY");
 			 }

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

@@ -62,6 +62,7 @@ public class StockDeAllocConf extends ActionHandlerEJB implements StockDeAllocCo
 		double availQty =0.0;
 		String sqlSorditem = "";
 		PreparedStatement psmtSord = null;
+		boolean isLocal=false;
 		try
 		{	
 			if (conn==null)
@@ -69,6 +70,7 @@ public class StockDeAllocConf extends ActionHandlerEJB implements StockDeAllocCo
 	        	connDriver = new ConnDriver();
 	   	        conn = connDriver.getConnectDB("Driver");
 	   	        conn.setAutoCommit(false);
+	   	        isLocal=true;
         	}
 			itmDBAccessEJB = new ITMDBAccessEJB();
 			
@@ -146,7 +148,7 @@ public class StockDeAllocConf extends ActionHandlerEJB implements StockDeAllocCo
 		{
 			try
 			{
-				if(errString != null && errString.trim().length() > 0)
+				if(errString != null && errString.trim().length() > 0 && isLocal)
 				{
 					if(errString.indexOf("CONFSUCCES") > -1 )
 					{
@@ -156,6 +158,8 @@ public class StockDeAllocConf extends ActionHandlerEJB implements StockDeAllocCo
 					{
 						conn.rollback();
 					}
+					conn.close();
+					conn = null;
 				}
 				if(rs != null)
 				{
@@ -177,8 +181,7 @@ public class StockDeAllocConf extends ActionHandlerEJB implements StockDeAllocCo
 					rs1.close();
 					rs1 = null;
 				}
-				conn.close();
-				conn = null;
+				
 			}
 			catch(Exception e)
 			{