issue tracker 262,263

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

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

@@ -40,6 +40,7 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
 		String refId = "";
 		String shipmentId = "";
 		String waveId = "";
+		String PTCN = "";
 		int shipupdCnt = 0;
 		int desupdCnt = 0;
 		int waveupdCnt = 0;
@@ -64,30 +65,36 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
 		//  Changed by sankara on 16/08/13 for checking transporter code null	
 			//transporterCode = genericUtility.getColumnValueFromNode("tran_code", dom.getElementsByTagName("Detail1").item(0));
 			transporterCode = checkNull(genericUtility.getColumnValueFromNode("tran_code", dom.getElementsByTagName("Detail1").item(0)));
-			
-			sql = " SELECT D.REF_ID AS REF_ID, P.WAVE_ID AS WAVE_ID  FROM SHIP_DOCS D, SHIPMENT S, DESPATCH P WHERE S.SHIPMENT_ID = D.SHIPMENT_ID" +
-					" AND P.DESP_ID = D.REF_ID AND  S.SHIPMENT_ID = ?  ";
+			//Changed By Pragyan to get PTCN
+			/*sql = " SELECT D.REF_ID AS REF_ID, P.WAVE_ID AS WAVE_ID  FROM SHIP_DOCS D, SHIPMENT S, DESPATCH P WHERE S.SHIPMENT_ID = D.SHIPMENT_ID" +
+					" AND P.DESP_ID = D.REF_ID AND  S.SHIPMENT_ID = ?  ";*/
+			sql = " SELECT D.REF_ID AS REF_ID, P.WAVE_ID AS WAVE_ID,D.PTCN AS PTCN  FROM SHIP_DOCS D, SHIPMENT S, DESPATCH P WHERE S.SHIPMENT_ID = D.SHIPMENT_ID" +
+			" AND P.DESP_ID = D.REF_ID AND  S.SHIPMENT_ID = ?  ";
 
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString( 1, shipmentId);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
-				refId = rs.getString("REF_ID");
-				waveId = rs.getString("WAVE_ID");
+				refId = checkNull(rs.getString("REF_ID"));
+				waveId = checkNull(rs.getString("WAVE_ID"));
+				PTCN = checkNull(rs.getString("PTCN"));
 			}
 			rs.close(); 
 			rs = null;
 			pstmt.close();
 			pstmt = null;
 
-			sql = " SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE WAVE_ID = ? ";
+			//sql = " SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE WAVE_ID = ? ";
+			sql = " SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE PTCN = ? ";
 			pstmt = conn.prepareStatement(sql);
-			pstmt.setString( 1, waveId);
+			//pstmt.setString( 1, waveId);
+			pstmt.setString( 1, PTCN);
 			rs = pstmt.executeQuery();
+			
 			if(rs.next())
 			{
-				waveTranCode = rs.getString("TRAN_CODE");
+				waveTranCode = checkNull(rs.getString("TRAN_CODE"));
 				System.out.println("WAVETRANCODE=="+waveTranCode);
 
 			}
@@ -96,8 +103,8 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
 			pstmt.close();
 			pstmt = null;
 
-			if( ! transporterCode.trim().equalsIgnoreCase( waveTranCode.trim() ) )
-			{
+			/*if( ! transporterCode.trim().equalsIgnoreCase( waveTranCode.trim() ) )
+			{*/
 				sql = " UPDATE SHIP_DOCS SET TRAN_CODE = ? WHERE SHIPMENT_ID IN ( SELECT D.SHIPMENT_ID FROM SHIPMENT S, SHIP_DOCS D " +
 						" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND S.SHIPMENT_ID = ? ) ";		
 				pstmt = conn.prepareStatement(sql);
@@ -115,13 +122,25 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
 				pstmt.close();
 				pstmt = null;
 
-				sql = " UPDATE WAVE_STATUS_ORG SET PRINT_STATUS = 'N' WHERE WAVE_ID = ? ";
+				//Changed By Pragyan 
+				//sql = " UPDATE WAVE_STATUS_ORG SET PRINT_STATUS = 'N' WHERE WAVE_ID = ? ";
+				sql = " UPDATE WAVE_STATUS_ORG SET PRINT_STATUS = ? WHERE PTCN = ? ";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, waveId);
+				//pstmt.setString(1, waveId);
+				if( ! transporterCode.trim().equalsIgnoreCase( waveTranCode.trim() )  || isPacketsChanged(PTCN,conn))
+				{
+					pstmt.setString(1, "N");
+				}
+				else
+				{
+					pstmt.setString(1, "Y");
+				}
+				pstmt.setString(2, PTCN);
 				waveupdCnt = pstmt.executeUpdate();
 				pstmt.close();
 				pstmt = null;
-			}
+			//}
+			
 			if( shipupdCnt > 0 && desupdCnt > 0 && waveupdCnt > 0  )
 			{
 				System.out.println("SHIPUPDCNT=["+shipupdCnt+"] DESUPDCNT=["+desupdCnt+"] WAVEUPDCNT=["+waveupdCnt+"] " );
@@ -189,5 +208,62 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
 	   return input;
 	}
 	//Changed by sankara on 16/08/13 for checking null end.
+	
+	private boolean isPacketsChanged(String PTCN, Connection conn) throws ITMException
+	{
+		String sql = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		double count = 0;
+		boolean isPacketDataChanged = false;
+		
+		try
+		{
+			sql = "SELECT COUNT(*) FROM CARTON_MASTER WHERE PTCN = ? AND CHANGE_STATUS  = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, PTCN);
+			pstmt.setString(2, "Y");
+			
+			rs = pstmt.executeQuery();
+			if( rs.next())
+			{
+				count = rs.getDouble(1);
+			}
+			rs.close(); rs = null;
+			pstmt.close(); pstmt = null;
+			System.out.println(" item count ["+count+"]");
+			
+			if(count > 0)
+			{
+				isPacketDataChanged = true;
+			}
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+				if( rs != null)
+				{
+					rs.close(); rs = null;
+				}
+				if( pstmt != null )
+				{
+					pstmt.close(); pstmt = null;
+				}
+			}
+			catch(Exception es)
+			{
+				es.printStackTrace();
+				throw new ITMException(es);
+			}
+		}
+		
+		return isPacketDataChanged;
+	}
 }
 

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

@@ -226,7 +226,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				System.out.println("XML String :"+xmlString2);
 				detailDom = genericUtility.parseString(xmlString2); 				
 			}
+			long startTime2 = System.currentTimeMillis();
 			rtrStr = getData(headerDom, detailDom, windowName, xtraParams);
+			long endTime2 = System.currentTimeMillis();
+			System.out.println("DIFFERANCE IN TIME FOR GET DATA IN SECONDS:::["+(endTime2-startTime2)/1000+"]");
+			
 		}
 		catch (Exception e)
 		{
@@ -4320,17 +4324,19 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							conn = null;
 						}
 					}
-					// Changed by sankara on 21/08/13 for fixing bug start..		
-					if( isError )
-					{ 
-						System.out.println("throwing new Exception1;;;;;;;;;;;;;;;;.");			  
-						errMessage = printExceptionMessage("VTPRCERR",conn,errString);
-						return errMessage ;
-					}
-					// Changed by sankara on 21/08/13 for fixing bug end..	
+					
 					//Changed by sumit on 01/08/12 putting condition other than process transaction will rollback end.
 				}
 				
+				// Changed by sankara on 21/08/13 for fixing bug start..		
+				if( isError )
+				{ 
+					System.out.println("throwing new Exception1;;;;;;;;;;;;;;;;.");			  
+					errMessage = printExceptionMessage("VTPRCERR",conn,errString);
+					return errMessage ;
+				}
+				// Changed by sankara on 21/08/13 for fixing bug end..	
+				
 			}
 			catch(Exception e)
 			{
@@ -13021,6 +13027,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		
 		try
 		{
+			
 			System.out.println("***********************Chandni:Inside  method****************************");
 			chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
@@ -21061,6 +21068,10 @@ private String printExceptionMessage( String Code, Connection conn, String errSt
 		{
 			endDesc = errString.substring(errString.indexOf("<description>"),errString.indexOf("</description>")+14);
 		}
+		else
+		{
+			endDesc = errMessage.substring(errMessage.indexOf("</description>"));
+		}
 		System.out.println("ENDDESC====="+endDesc);
 	//	String message = errString.substring(107,185);
 		mainStr= begPart+"Exception Data"+"</message>";

webitm-wms/module-resource/sql/update.sql

@@ -42958,3 +42958,32 @@ INSERT INTO messages (
 	NULL,
 	NULL);
 	commit;
+	
+	INSERT INTO messages (
+	msg_no ,
+	msg_str ,
+	msg_descr ,
+	msg_type ,
+	msg_opt ,
+	msg_time ,
+	alarm ,
+	err_source ,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	override_input ,
+	mail_option )
+ VALUES (
+	'NOTHING2PR',
+	'No Change in Shipment',
+	'Packet/Transporter data has not been changed!',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'Base ',
+	'Base ',
+	NULL,
+	NULL);