changedn by sankara on 12/09/14 updated source

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

webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java

@@ -83,6 +83,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			java.sql.Timestamp tranDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateString( currDateStr , applDateFormat, dbDateFormat ) + " 00:00:00.0") ;
 			dom = genericUtility.parseString(domString);
 			chguser = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
+			siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSite");
 			InetAddress ownIP=InetAddress.getLocalHost();
 			chgTerm = ownIP.getHostAddress();
 			currDate = new Timestamp(System.currentTimeMillis());
@@ -114,7 +115,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			pstmt.executeUpdate();
 			pstmt.close(); pstmt = null;
 
-			docktranID = generateTranId( "w_dock_tran",siteCode,conn );
+			docktranID = generateTranId( "w_dock_tran_upd",siteCode,conn );
 
 			System.out.println("generatetranID:"+docktranID);
 

webitm-wms/ibase/webitm/ejb/wms/MasterPackPos.java

@@ -336,7 +336,8 @@ public class MasterPackPos extends ValidatorEJB implements MasterPackPosRemote,
 			
 			if(tranId != null)
 			{		
-				
+				outerCartonNo = GenericUtility.getInstance().getColumnValueFromNode("outer_carton_no", dom.getElementsByTagName("Detail1").item(0));
+				System.out.println("outerCartonNo::"+outerCartonNo);
 				int update = 0;
 				sql = "UPDATE PACK_HDR SET OUTER_CARTON_NO = NULL WHERE TRAN_ID = ?  AND (SELECT COUNT(*) FROM PACK_DET WHERE TRAN_ID= ?) = 0 ";
 				pstmt = conn.prepareStatement(sql);
@@ -346,8 +347,21 @@ public class MasterPackPos extends ValidatorEJB implements MasterPackPosRemote,
 				if( update > 0)
 				{
 					System.out.println(update+" column of PACK_HDR is update successfuly ");
+				}	
+				else
+				{
+					
+					sql = "UPDATE PACK_HDR SET OUTER_CARTON_NO = ? WHERE TRAN_ID = ?  " ;
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, outerCartonNo);
+					pstmt.setString(2, tranId);
+					update = pstmt.executeUpdate();
+					if( update > 0)
+					{
+						System.out.println(update+" column of PACK_HDR is update successfuly ");
+					}
+					pstmt.close(); pstmt = null;	
 				}
-				pstmt.close(); pstmt = null;	
 			}
 			//Changed by sumit on 08/02/13 updating pack_hdr end.
 			//Changed By Pragyan 23-MAY-14 Master Pack remove the master carton no iff record not present pack_det detail.end

webitm-wms/ibase/webitm/ejb/wms/StockTransferGrlIC.java

@@ -2019,7 +2019,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 						+ " SITE_CODE= ? AND INV_STAT IN ("+invStstPars+") " 
 						+ " GROUP BY LOC_CODE " 
 						+ " HAVING SUM (CASE WHEN QUANTITY IS NULL THEN 0 ELSE  QUANTITY END) > 0) " 
-						+ " ORDER BY  ABS(A.LOC_ZONE - ?),A.LOC_CODE ) WHERE  LOC_CHECK_COUNT > 0  AND ROW_NUM < 5" ;
+						+ " ORDER BY  ABS(A.LOC_ZONE - ?),A.LOC_CODE ) WHERE  LOC_CHECK_COUNT > 0  AND ROWNUM < 5" ;
 				  
 			// Changed by sankara on 27/08/13 for optimized the sql end.	
 
@@ -2102,7 +2102,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 		}
 		catch(Exception e)
 		{
-			
+			System.out.println( "Exception :StockTransferGrlIC:default_ItemChanged :==>\n"+e.getMessage());
+			throw new ITMException(e);
 		}
 		finally
 		{