Changes done for WMS component.

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

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

@@ -1363,7 +1363,7 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
 					//Added by AMOL S on 16-11-18 as per KB sir[END]
 					sql = " SELECT DESCR FROM ITEM WHERE ITEM_CODE = ?";
 					System.out.println("columnValue ["+columnValue+" ]");
-					System.out.println("-------<!@#>------------------------<!@#>-----------------");
+					System.out.println("-------<!@#>------------------------<!@#>-----------------"+lotNo);
 					if (lotNo == null)
 					{
 						lotNo = "";

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

@@ -266,7 +266,9 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
 						{
 							//Changed by sankara on 16/12/13 display bol report ptcn wise start.
 							//errString = generateBOLReport(shipmentId, printer, conn, xtraParams);
-							errString = generateBOLReport(shipmentId, "", printer, conn, xtraParams);
+							//Commented by Pankaj R on 25-Dec-18 [START]
+							//errString = generateBOLReport(shipmentId, "", printer, conn, xtraParams);
+							//Commented by Pankaj R on 25-Dec-18 [END]
 							if(errString != null && errString.trim().length() > 0 )
 							{
 								return errString;

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

@@ -2404,34 +2404,34 @@ public class ConsolidatToDoc {
 	private HashMap getItemVoumeMap(String itemCode,String lotNo,Connection con)throws Exception
 	{
 		double shipperSize = 0,itemVolume = 0,caseVolume = 0;
-		PreparedStatement pstmt = null;
-		String sql="";
-		ResultSet rs = null;
+		PreparedStatement pstmt = null, packCodePstmt = null, packingPstmt = null;
+		String sql="", itemPackSizeSql = "", packingMasterSql ="", packCodeSql = "", packCode = "";
+		ResultSet rs = null, packingRs = null, packCodeRs = null;
 		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemGrossWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,caseGrossWeight = 0,itemNetWeight = 0, caseNetWeight = 0;
 		HashMap dataVolumeMap = new HashMap();
 
 		try {
 
-			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
+			/*sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
 				+" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,L.NET_WEIGHT CASE_NET_WEIGHT FROM"
 				+" ITEM I,ITEM_LOT_PACKSIZE L"
 				+" WHERE I.ITEM_CODE = L.ITEM_CODE"
 				+" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
-				+" AND  I.ITEM_CODE = ?";
+				+" AND  I.ITEM_CODE = ?";*/
+			
+			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT "
+					+ "FROM ITEM I WHERE I.ITEM_CODE     = ?";
+			
+			itemPackSizeSql = "SELECT L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,L.NET_WEIGHT CASE_NET_WEIGHT"
+					+ " FROM ITEM_LOT_PACKSIZE L WHERE L.LOT_NO__FROM <= ? AND L.LOT_NO__TO   >= ? AND L.ITEM_CODE     = ?";
+			
+			packingMasterSql = "SELECT LENGTH LITEM_LEN,WIDTH LITEM_WID, HEIGHT LITEM_HEIGHT, CAPACITY SHIPSIZE, GROSS_WEIGHT CASE_GROSS_WEIGHT, NETT_WEIGHT CASE_NET_WEIGHT FROM PACKING WHERE PACK_CODE = ? ";
+			
+			packCodeSql = "SELECT PACK_CODE FROM ITEM WHERE ITEM_CODE = ?";
 
 
 			pstmt = con.prepareStatement(sql);
-			if(lotNo != null && lotNo.length() > 0)
-			{
-				pstmt.setString(1, lotNo);
-				pstmt.setString(2, lotNo);
-			}
-			else
-			{
-				pstmt.setString(1, "00");
-				pstmt.setString(2, "ZZ");
-			}
-			pstmt.setString(3, itemCode);
+			pstmt.setString(1, itemCode);
 			rs = pstmt.executeQuery();
 
 			if(rs.next())
@@ -2440,13 +2440,82 @@ public class ConsolidatToDoc {
 				itmWidth = rs.getDouble("ITEM_WID");
 				itmHeight = rs.getDouble("ITEM_HEIGHT");
 				itemGrossWeight = rs.getDouble("ITEM_GROSS_WEIGHT");
-				lotLen = rs.getDouble("LITEM_LEN");
+				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
+				/*lotLen = rs.getDouble("LITEM_LEN");
 				lotWidth = rs.getDouble("LITEM_WID");
 				lotHeight = rs.getDouble("LITEM_HEIGHT");				
 				shipperSize = rs.getDouble("SHIPSIZE");				
 				caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
-				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
-				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");				
+				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");	*/			
+			}
+			
+			rs.close();
+			pstmt.close();
+			
+			try {
+				pstmt = con.prepareStatement(itemPackSizeSql);
+				if(lotNo != null && lotNo.length() > 0)
+				{
+					pstmt.setString(1, lotNo);
+					pstmt.setString(2, lotNo);
+				}
+				else
+				{
+					pstmt.setString(1, "00");
+					pstmt.setString(2, "ZZ");
+				}
+				pstmt.setString(3, itemCode);
+				
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					lotLen = rs.getDouble("LITEM_LEN");
+					lotWidth = rs.getDouble("LITEM_WID");
+					lotHeight = rs.getDouble("LITEM_HEIGHT");				
+					shipperSize = rs.getDouble("SHIPSIZE");				
+					caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
+					caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");
+				}
+				else
+				{
+				
+					System.out.println("Else of itemLotPackSize");
+					packCodePstmt = con.prepareStatement(packCodeSql);
+					packCodePstmt.setString(1, itemCode);
+					packCodeRs = packCodePstmt.executeQuery();
+					if(packCodeRs.next())
+					{
+						packCode = packCodeRs.getString("PACK_CODE");
+						System.out.println("Pack Code :: "+packCode);
+					}
+					packCodeRs.close();
+					packCodePstmt.close();
+					try 
+					{
+						packingPstmt = con.prepareStatement(packingMasterSql);
+						packingPstmt.setString(1, packCode);
+						packingRs = packingPstmt.executeQuery();
+						if(packingRs.next())
+						{
+							lotLen = packingRs.getDouble("LITEM_LEN");
+							lotWidth = packingRs.getDouble("LITEM_WID");
+							lotHeight = packingRs.getDouble("LITEM_HEIGHT");				
+							shipperSize = packingRs.getDouble("SHIPSIZE");				
+							caseGrossWeight = packingRs.getDouble("CASE_GROSS_WEIGHT");				
+							caseNetWeight = packingRs.getDouble("CASE_NET_WEIGHT");
+							
+						}
+						
+						packingRs.close();
+						packingPstmt.close();
+					}
+					catch (Exception e)
+					{
+						System.out.println("ConsolidateToDoc.getItemVoumeMap() packingPstmt : "+e);
+					}
+				}
+			} catch (Exception e) {
+				System.out.println("ConsolidateToDoc.getItemVoumeMap() final..: "+e);
 			}
 
 			//shipperSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);

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

@@ -1194,18 +1194,32 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
 		ResultSet rs = null;
 		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemGrossWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,caseGrossWeight = 0,itemNetWeight = 0, caseNetWeight = 0;
 		HashMap dataVolumeMap = new HashMap();
+		String sql1="",sql2="";
 		
 		try {
-			
-			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
+			System.out.println("DockTranConf.......................1");
+			/*sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
 				  +" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,L.NET_WEIGHT CASE_NET_WEIGHT FROM"
 				  +" ITEM I,ITEM_LOT_PACKSIZE L"
 				  +" WHERE I.ITEM_CODE = L.ITEM_CODE"
 				  +" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
-				  +" AND  I.ITEM_CODE = ?";
+				  +" AND  I.ITEM_CODE = ?";*/
 				  
+			sql  = "SELECT LENGTH ITEM_LEN,WIDTH ITEM_WID,HEIGHT ITEM_HEIGHT,GROSS_WEIGHT ITEM_GROSS_WEIGHT,NET_WEIGHT ITEM_NET_WEIGHT "
+					+ " FROM ITEM WHERE ITEM_CODE= ?"; 
+			
+		    sql1 = "SELECT LENGTH LITEM_LEN,WIDTH LITEM_WID,HEIGHT LITEM_HEIGHT,SHIPPER_SIZE SHIPSIZE,GROSS_WEIGHT CASE_GROSS_WEIGHT, NET_WEIGHT CASE_NET_WEIGHT FROM ITEM_LOT_PACKSIZE"
+		    		+ " WHERE L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ? AND ITEM_CODE = ?";
+		    
+			sql2 = "SELECT PACK_CODE,LENGTH LITEM_LEN ,WIDTH LITEM_WID,HEIGHT LITEM_HEIGHT,CAPACITY SHIPSIZE,GROSS_WEIGHT CASE_GROSS_WEIGHT,NETT_WEIGHT CASE_NET_WEIGHT "
+					+ " FROM  PACKING WHERE PACK_CODE= (SELECT PACK_CODE from ITEM where ITEM_CODE= ?)";
 			
+
 			pstmt = con.prepareStatement(sql);
+			pstmt.setString(1, itemCode);
+			rs=pstmt.executeQuery();
+			
+			/*pstmt = con.prepareStatement(sql);
 			if(lotNo != null && lotNo.length() > 0)
 			{
 				pstmt.setString(1, lotNo);
@@ -1217,7 +1231,7 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
 				pstmt.setString(2, "ZZ");
 			}
 			pstmt.setString(3, itemCode);
-			rs = pstmt.executeQuery();
+			rs = pstmt.executeQuery();*/
 			
 			if(rs.next())
 			{
@@ -1225,15 +1239,63 @@ public class DockTranConf extends ValidatorEJB implements DockTranConfLocal,Dock
 				itmWidth = rs.getDouble("ITEM_WID");
 				itmHeight = rs.getDouble("ITEM_HEIGHT");
 				itemGrossWeight = rs.getDouble("ITEM_GROSS_WEIGHT");
-				lotLen = rs.getDouble("LITEM_LEN");
+				/*lotLen = rs.getDouble("LITEM_LEN");
 				lotWidth = rs.getDouble("LITEM_WID");
 				lotHeight = rs.getDouble("LITEM_HEIGHT");				
 				shipperSize = rs.getDouble("SHIPSIZE");				
-				caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
+				caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");*/				
 				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
-				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");				
+				//caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");				
+			}
+			pstmt=null;
+			rs=null;
+			System.out.println("DockTranConf.......................2");
+			pstmt=con.prepareStatement(sql1);
+			if(lotNo != null && lotNo.length() > 0)
+			{
+				pstmt.setString(1, lotNo);
+				pstmt.setString(2, lotNo);
+			}
+			else
+			{
+				pstmt.setString(1, "00");
+				pstmt.setString(2, "ZZ");
+			}
+			pstmt.setString(3, itemCode);
+			rs=pstmt.executeQuery();
+			if(rs.next())
+			{
+				lotLen = rs.getDouble("LITEM_LEN");
+				lotWidth = rs.getDouble("LITEM_WID");
+				lotHeight = rs.getDouble("LITEM_HEIGHT");				
+				shipperSize = rs.getDouble("SHIPSIZE");			
+				caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
+				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");	
+			}
+			else
+			{	
+				System.out.println("DockTranConf.......................3");
+				if(pstmt != null)
+				{
+					pstmt.close();
+				}
+				if(rs != null)
+				{
+					rs.close();
+				}
+				pstmt=con.prepareStatement(sql2);
+				pstmt.setString(1, itemCode);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					lotLen = rs.getDouble("LITEM_LEN");
+					lotWidth = rs.getDouble("LITEM_WID");
+					lotHeight = rs.getDouble("LITEM_HEIGHT");				
+					shipperSize = rs.getDouble("SHIPSIZE");			
+					caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
+					caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");
+				}
 			}
-			
 			//shipperSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);
 			itemVolume = (itmLen * itmWidth * itmHeight);
 			caseVolume = (lotHeight * lotWidth * lotLen);

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

@@ -327,7 +327,6 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 
 				if(errString == null || errString.trim().length() == 0 )
 				{
-
 					updateSql = " UPDATE DOCK_TRAN SET CONFIRMED = ?, CONF_DATE = ? WHERE TRAN_ID = ? ";
 					pstmtUpd = conn.prepareStatement(updateSql);
 					pstmtUpd.setString(1, "Y");
@@ -1703,24 +1702,35 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 	private HashMap getItemVoumeMap(String itemCode,String lotNo,Connection con)throws Exception
 	{
 		double packSize = 0,itemSize = 0,lotSize = 0;
-		PreparedStatement pstmt = null;
-		String sql="";
-		ResultSet rs = null;
+		// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[START]
+		PreparedStatement pstmt = null, packCodePstmt = null, packingPstmt = null;
+		String sql="", itemPackSizeSql = "", packingMasterSql ="", packCodeSql = "", packCode = "";
+		ResultSet rs = null, packingRs = null, packCodeRs = null;
 		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,lotWeight = 0;
 		HashMap dataVolumeMap = new HashMap();
 
 		try {
 
-			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,"
+			/*sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,"
 				+" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT FROM"
 				+" ITEM I,ITEM_LOT_PACKSIZE L"
 				+" WHERE I.ITEM_CODE = L.ITEM_CODE"
 				+" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
-				+" AND  I.ITEM_CODE = ?";
+				+" AND  I.ITEM_CODE = ?"*/;
+			
+			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT "
+					+ "FROM ITEM I WHERE I.ITEM_CODE     = ?";
+			
+			itemPackSizeSql = "SELECT L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT"
+					+ " FROM ITEM_LOT_PACKSIZE L WHERE L.LOT_NO__FROM <= ? AND L.LOT_NO__TO   >= ? AND L.ITEM_CODE     = ?";
+			
+			packingMasterSql = "SELECT LENGTH LITEM_LEN, WIDTH LITEM_WID, HEIGHT LITEM_HEIGHT, CAPACITY SHIPSIZE, GROSS_WEIGHT LOT_WEIGHT FROM PACKING WHERE PACK_CODE = ? ";
+			
+			packCodeSql = "SELECT PACK_CODE FROM ITEM WHERE ITEM_CODE = ?";
 
 
 			pstmt = con.prepareStatement(sql);
-			if(lotNo != null && lotNo.length() > 0)
+			/*if(lotNo != null && lotNo.length() > 0)
 			{
 				pstmt.setString(1, lotNo);
 				pstmt.setString(2, lotNo);
@@ -1729,8 +1739,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			{
 				pstmt.setString(1, "00");
 				pstmt.setString(2, "ZZ");
-			}
-			pstmt.setString(3, itemCode);
+			}*/
+			pstmt.setString(1, itemCode);
 			rs = pstmt.executeQuery();
 
 			if(rs.next())
@@ -1739,13 +1749,78 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				itmWidth = rs.getDouble("ITEM_WID");
 				itmHeight = rs.getDouble("ITEM_HEIGHT");
 				itemWeight = rs.getDouble("ITEM_WEIGHT");
-				lotLen = rs.getDouble("LITEM_LEN");
+				/*lotLen = rs.getDouble("LITEM_LEN");
 				lotWidth = rs.getDouble("LITEM_WID");
 				lotHeight = rs.getDouble("LITEM_HEIGHT");				
 				packSize = rs.getDouble("SHIPSIZE");				
-				lotWeight = rs.getDouble("LOT_WEIGHT");				
+				lotWeight = rs.getDouble("LOT_WEIGHT");*/				
 			}
-
+			rs.close();
+			pstmt.close();
+			
+			try {
+				pstmt = con.prepareStatement(itemPackSizeSql);
+				if(lotNo != null && lotNo.length() > 0)
+				{
+					pstmt.setString(1, lotNo);
+					pstmt.setString(2, lotNo);
+				}
+				else
+				{
+					pstmt.setString(1, "00");
+					pstmt.setString(2, "ZZ");
+				}
+				pstmt.setString(3, itemCode);
+				
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					lotLen = rs.getDouble("LITEM_LEN");
+					lotWidth = rs.getDouble("LITEM_WID");
+					lotHeight = rs.getDouble("LITEM_HEIGHT");				
+					packSize = rs.getDouble("SHIPSIZE");				
+					lotWeight = rs.getDouble("LOT_WEIGHT");
+				}
+				else
+				{
+				
+					System.out.println("Else of itemLotPackSize");
+					packCodePstmt = con.prepareStatement(packCodeSql);
+					packCodePstmt.setString(1, itemCode);
+					packCodeRs = packCodePstmt.executeQuery();
+					if(packCodeRs.next())
+					{
+						packCode = packCodeRs.getString("PACK_CODE");
+						System.out.println("Pack Code :: "+packCode);
+					}
+					packCodeRs.close();
+					packCodePstmt.close();
+					try 
+					{
+						packingPstmt = con.prepareStatement(packingMasterSql);
+						packingPstmt.setString(1, packCode);
+						packingRs = packingPstmt.executeQuery();
+						if(packingRs.next())
+						{
+							lotLen = packingRs.getDouble("LITEM_LEN");
+							lotWidth = packingRs.getDouble("LITEM_WID");
+							lotHeight = packingRs.getDouble("LITEM_HEIGHT");				
+							packSize = packingRs.getDouble("SHIPSIZE");				
+							lotWeight = packingRs.getDouble("LOT_WEIGHT");
+						}
+						
+						packingRs.close();
+						packingPstmt.close();
+					}
+					catch (Exception e)
+					{
+						System.out.println("DockTranPos.getItemVoumeMap()packingPstmt : "+e);
+					}
+				}
+			} catch (Exception e) {
+				System.out.println("DockTranPos.getItemVoumeMap() final..: "+e);
+			}
+			// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[END]
 			//packSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);
 			/*itemSize = Math.floor(itmLen * itmWidth * itmHeight);
 				lotSize = Math.floor((lotHeight * lotWidth * lotLen));*/
@@ -1774,7 +1849,6 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 
 
 		} catch (Exception e) {			
-
 			throw e;
 		}
 		finally

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

@@ -1886,34 +1886,36 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 	private HashMap getItemVoumeMap(String itemCode,String lotNo,Connection con)throws Exception
 	{
 		double shipperSize = 0,itemVolume = 0,caseVolume = 0;
-		PreparedStatement pstmt = null;
-		String sql="";
-		ResultSet rs = null;
+		// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[START]
+		PreparedStatement pstmt = null, packCodePstmt = null, packingPstmt = null;
+		String sql="", itemPackSizeSql = "", packingMasterSql ="", packCodeSql = "", packCode = "";
+		ResultSet rs = null, packingRs = null, packCodeRs = null;
 		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemGrossWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,caseGrossWeight = 0,itemNetWeight = 0, caseNetWeight = 0;
 		HashMap dataVolumeMap = new HashMap();
 		
 		try {
 			
-			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
+			/*sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
 				  +" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,L.NET_WEIGHT CASE_NET_WEIGHT FROM"
 				  +" ITEM I,ITEM_LOT_PACKSIZE L"
 				  +" WHERE I.ITEM_CODE = L.ITEM_CODE"
 				  +" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
-				  +" AND  I.ITEM_CODE = ?";
+				  +" AND  I.ITEM_CODE = ?";*/
+			
+			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT "
+					+ "FROM ITEM I WHERE I.ITEM_CODE     = ?";
+			
+			itemPackSizeSql = "SELECT L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,"
+					+ " L.NET_WEIGHT CASE_NET_WEIGHT FROM ITEM_LOT_PACKSIZE L WHERE L.LOT_NO__FROM <= ? AND L.LOT_NO__TO   >= ? AND L.ITEM_CODE     = ?";
+			
+			packingMasterSql = "SELECT LENGTH LITEM_LEN, WIDTH LITEM_WID, HEIGHT LITEM_HEIGHT, CAPACITY SHIPSIZE, GROSS_WEIGHT CASE_GROSS_WEIGHT, NETT_WEIGHT CASE_NET_WEIGHT FROM PACKING WHERE PACK_CODE = ? ";
+			
+			packCodeSql = "SELECT PACK_CODE FROM ITEM WHERE ITEM_CODE = ?";
 				  
 			
 			pstmt = con.prepareStatement(sql);
-			if(lotNo != null && lotNo.length() > 0)
-			{
-				pstmt.setString(1, lotNo);
-				pstmt.setString(2, lotNo);
-			}
-			else
-			{
-				pstmt.setString(1, "00");
-				pstmt.setString(2, "ZZ");
-			}
-			pstmt.setString(3, itemCode);
+			
+			pstmt.setString(1, itemCode);
 			rs = pstmt.executeQuery();
 			
 			if(rs.next())
@@ -1922,15 +1924,82 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 				itmWidth = rs.getDouble("ITEM_WID");
 				itmHeight = rs.getDouble("ITEM_HEIGHT");
 				itemGrossWeight = rs.getDouble("ITEM_GROSS_WEIGHT");
-				lotLen = rs.getDouble("LITEM_LEN");
+				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
+				/*lotLen = rs.getDouble("LITEM_LEN");
 				lotWidth = rs.getDouble("LITEM_WID");
 				lotHeight = rs.getDouble("LITEM_HEIGHT");				
 				shipperSize = rs.getDouble("SHIPSIZE");				
 				caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
-				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
-				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");				
+				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");*/				
 			}
+			rs.close();
+			pstmt.close();
 			
+			try {
+				pstmt = con.prepareStatement(itemPackSizeSql);
+				if(lotNo != null && lotNo.length() > 0)
+				{
+					pstmt.setString(1, lotNo);
+					pstmt.setString(2, lotNo);
+				}
+				else
+				{
+					pstmt.setString(1, "00");
+					pstmt.setString(2, "ZZ");
+				}
+				pstmt.setString(3, itemCode);
+				
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					lotLen = rs.getDouble("LITEM_LEN");
+					lotWidth = rs.getDouble("LITEM_WID");
+					lotHeight = rs.getDouble("LITEM_HEIGHT");				
+					shipperSize = rs.getDouble("SHIPSIZE");				
+					caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
+					caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");
+				}
+				else
+				{
+				
+					System.out.println("Else of itemLotPackSize");
+					packCodePstmt = con.prepareStatement(packCodeSql);
+					packCodePstmt.setString(1, itemCode);
+					packCodeRs = packCodePstmt.executeQuery();
+					if(packCodeRs.next())
+					{
+						packCode = packCodeRs.getString("PACK_CODE");
+						System.out.println("Pack Code :: "+packCode);
+					}
+					packCodeRs.close();
+					packCodePstmt.close();
+					try 
+					{
+						packingPstmt = con.prepareStatement(packingMasterSql);
+						packingPstmt.setString(1, packCode);
+						packingRs = packingPstmt.executeQuery();
+						if(packingRs.next())
+						{
+							lotLen = packingRs.getDouble("LITEM_LEN");
+							lotWidth = packingRs.getDouble("LITEM_WID");
+							lotHeight = packingRs.getDouble("LITEM_HEIGHT");				
+							shipperSize = packingRs.getDouble("SHIPSIZE");				
+							caseGrossWeight = packingRs.getDouble("CASE_GROSS_WEIGHT");				
+							caseNetWeight = packingRs.getDouble("CASE_NET_WEIGHT");
+						}
+						
+						packingRs.close();
+						packingPstmt.close();
+					}
+					catch (Exception e)
+					{
+						System.out.println("PickIssConf.getItemVoumeMap() packingPstmt : "+e);
+					}
+				}
+			} catch (Exception e) {
+				System.out.println("PickIssConf.getItemVoumeMap() final..: "+e);
+			}
+			// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[END]
 			//shipperSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);
 			itemVolume = (itmLen * itmWidth * itmHeight);
 			caseVolume = (lotHeight * lotWidth * lotLen);

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

@@ -724,11 +724,11 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							}
 							rs.close(); rs = null;
 							pstmt.close(); pstmt = null;
-
+							System.out.println("palletNoDom  ::: palletNoDom :"+palletNoDom);
 							//Changed by sumit on 04/04/13 adding validation , user can asign same pallet_no to other pick of same ptcn start.
 							sql = "SELECT DISTINCT PTCN FROM WAVE_TASK_DET WHERE REF_ID IN (SELECT DISTINCT PICK_ORDER FROM PICK_ISS_HDR WHERE PALLET_NO = ?)";
 							pstmt = conn.prepareStatement( sql );
-							pstmt.setString(1, palletNoDom.trim());
+							pstmt.setString(1, palletNoDom);
 							rs = pstmt.executeQuery();
 							while( rs.next())
 							{
@@ -749,7 +749,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							//{
 							sql="select count(1) from pallet_no where pallet_no = ? ";
 							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, palletNoDom.trim());
+							pstmt.setString(1, palletNoDom);
 							//}
 							//else
 							//{
@@ -790,7 +790,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							{
 								sql1="select status from pallet_no where pallet_no =  ? ";//change by Kunal M on 30/07/12 as per S Manoharan Sir intruction
 								pstmt1 = conn.prepareStatement(sql1);
-								pstmt1.setString(1, palletNoDom.trim());
+								pstmt1.setString(1, palletNoDom);
 								rs1 = pstmt1.executeQuery();
 								if(rs1.next())
 								{
@@ -1535,8 +1535,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 								ordNoArt = (int) (quantity / shipperSize);
 								System.out.println(" ordNoArt ->["+ordNoArt+"] noArt ->["+noArt+"] pickType ->["+pickType+"]");
 								//Changed by sumit on 12/03/13 for changing no_art end.
-
-								if (!"A".equals(pickType) && ordNoArt != noArt)
+								// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[START]
+								if (!"A".equals(pickType) && !"C".equals(pickType) && ordNoArt != noArt)
 								{
 									errList.add( "VQUANTI" );
 									errFields.add( childNodeName.toLowerCase() );
@@ -1733,7 +1733,6 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 
 						}	
 					}
-
 					else
 					{
 						if( "lot_no".equalsIgnoreCase( childNodeName ) )
@@ -2416,8 +2415,13 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 								ordNoArt = (int) (quantity / shipperSize);
 								System.out.println(" ordNoArt ->["+ordNoArt+"] noArt ->["+noArt+"] pickType ->["+pickType+"]");
 								//Changed by sumit on 12/03/13 for changing no_art end.
-
-								if (!"A".equals(pickType) && ordNoArt != noArt)
+								// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[START]
+								System.out.println("lotNo: "+lotNo);
+								System.out.println("quantity: "+quantity);
+								System.out.println("itmVolumeMap: "+itmVolumeMap);
+								System.out.println("shipperSize : "+shipperSize);
+								System.out.println("ordNoArt : "+ordNoArt);
+								if (!"C".equals(pickType) && !"A".equals(pickType) && ordNoArt != noArt)
 								{
 									errList.add( "VQUANTI" );
 									errFields.add( childNodeName.toLowerCase() );
@@ -4943,34 +4947,35 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 	private HashMap getItemVoumeMap(String itemCode,String lotNo,Connection con)throws Exception
 	{
 		double shipperSize = 0,itemVolume = 0,caseVolume = 0;
-		PreparedStatement pstmt = null;
-		String sql="";
-		ResultSet rs = null;
+		// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[START]
+		PreparedStatement pstmt = null, packCodePstmt = null, packingPstmt = null;
+		String sql="", itemPackSizeSql = "", packingMasterSql ="", packCodeSql = "", packCode = "";
+		ResultSet rs = null, packingRs = null, packCodeRs = null;
 		double itmLen = 0,itmWidth = 0,itmHeight = 0,itemGrossWeight = 0,lotLen = 0 ,lotHeight = 0,lotWidth = 0,caseGrossWeight = 0,itemNetWeight = 0, caseNetWeight = 0;
 		HashMap dataVolumeMap = new HashMap();
 
 		try {
 
-			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
+			/*sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT,"
 				+" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,L.NET_WEIGHT CASE_NET_WEIGHT FROM"
 				+" ITEM I,ITEM_LOT_PACKSIZE L"
 				+" WHERE I.ITEM_CODE = L.ITEM_CODE"
 				+" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
-				+" AND  I.ITEM_CODE = ?";
-
-
+				+" AND  I.ITEM_CODE = ?";*/
+			
+			sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_GROSS_WEIGHT,I.NET_WEIGHT ITEM_NET_WEIGHT "
+					+"FROM ITEM I WHERE ITEM_CODE = ?";
+			
+			itemPackSizeSql = "SELECT L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT CASE_GROSS_WEIGHT,L.NET_WEIGHT CASE_NET_WEIGHT"
+					+" FROM ITEM_LOT_PACKSIZE L WHERE L.LOT_NO__FROM <= ? AND L.LOT_NO__TO   >= ? AND L.ITEM_CODE     = ? ";
+			
+			packingMasterSql = "SELECT LENGTH LITEM_LEN, WIDTH LITEM_WID, HEIGHT LITEM_HEIGHT, CAPACITY SHIPSIZE, GROSS_WEIGHT CASE_GROSS_WEIGHT, NETT_WEIGHT CASE_NET_WEIGHT FROM PACKING WHERE PACK_CODE = ? ";
+			
+			packCodeSql = "SELECT PACK_CODE FROM ITEM WHERE ITEM_CODE = ?";
+			
+			
 			pstmt = con.prepareStatement(sql);
-			if(lotNo != null && lotNo.length() > 0)
-			{
-				pstmt.setString(1, lotNo);
-				pstmt.setString(2, lotNo);
-			}
-			else
-			{
-				pstmt.setString(1, "00");
-				pstmt.setString(2, "ZZ");
-			}
-			pstmt.setString(3, itemCode);
+			pstmt.setString(1, itemCode);
 			rs = pstmt.executeQuery();
 
 			if(rs.next())
@@ -4979,15 +4984,82 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 				itmWidth = rs.getDouble("ITEM_WID");
 				itmHeight = rs.getDouble("ITEM_HEIGHT");
 				itemGrossWeight = rs.getDouble("ITEM_GROSS_WEIGHT");
-				lotLen = rs.getDouble("LITEM_LEN");
+				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
+				/*lotLen = rs.getDouble("LITEM_LEN");
 				lotWidth = rs.getDouble("LITEM_WID");
 				lotHeight = rs.getDouble("LITEM_HEIGHT");				
 				shipperSize = rs.getDouble("SHIPSIZE");				
 				caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
-				itemNetWeight = rs.getDouble("ITEM_NET_WEIGHT");				
-				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");				
+				caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");*/				
 			}
-
+			rs.close();
+			pstmt.close();
+			
+			try {
+				pstmt = con.prepareStatement(itemPackSizeSql);
+				if(lotNo != null && lotNo.length() > 0)
+				{
+					pstmt.setString(1, lotNo);
+					pstmt.setString(2, lotNo);
+				}
+				else
+				{
+					pstmt.setString(1, "00");
+					pstmt.setString(2, "ZZ");
+				}
+				pstmt.setString(3, itemCode);
+				
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					lotLen = rs.getDouble("LITEM_LEN");
+					lotWidth = rs.getDouble("LITEM_WID");
+					lotHeight = rs.getDouble("LITEM_HEIGHT");				
+					shipperSize = rs.getDouble("SHIPSIZE");				
+					caseGrossWeight = rs.getDouble("CASE_GROSS_WEIGHT");				
+					caseNetWeight = rs.getDouble("CASE_NET_WEIGHT");
+				}
+				else
+				{
+				
+					System.out.println("Else of itemLotPackSize");
+					packCodePstmt = con.prepareStatement(packCodeSql);
+					packCodePstmt.setString(1, itemCode);
+					packCodeRs = packCodePstmt.executeQuery();
+					if(packCodeRs.next())
+					{
+						packCode = packCodeRs.getString("PACK_CODE");
+						System.out.println("Pack Code :: "+packCode);
+					}
+					packCodeRs.close();
+					packCodePstmt.close();
+					try 
+					{
+						packingPstmt = con.prepareStatement(packingMasterSql);
+						packingPstmt.setString(1, packCode);
+						packingRs = packingPstmt.executeQuery();
+						if(packingRs.next())
+						{
+							lotLen = packingRs.getDouble("LITEM_LEN");
+							lotWidth = packingRs.getDouble("LITEM_WID");
+							lotHeight = packingRs.getDouble("LITEM_HEIGHT");				
+							shipperSize = packingRs.getDouble("SHIPSIZE");				
+							caseGrossWeight = packingRs.getDouble("CASE_GROSS_WEIGHT");				
+							caseNetWeight = packingRs.getDouble("CASE_NET_WEIGHT");
+						}
+						
+						packingRs.close();
+						packingPstmt.close();
+					}
+					catch (Exception e)
+					{
+						System.out.println("PickIssIC.getItemVoumeMap() packingPstmt : "+e);
+					}
+				}
+			} catch (Exception e) {
+				System.out.println("PickIssIC.getItemVoumeMap() final..: "+e);
+			}
+			// Commented and Added by Pankj R on 25-Dec-18 to fetch record from packing if no data found in item_lot_packsize[START]
 			//shipperSize = (lotHeight * lotWidth * lotLen)/(itmLen * itmWidth * itmHeight);
 			itemVolume = (itmLen * itmWidth * itmHeight);
 			caseVolume = (lotHeight * lotWidth * lotLen);

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

@@ -2928,7 +2928,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 						{
 							mfgDate=lotMfgDate;
 						}
-						else
+						else if (expDateDb != null)
 						{	
 							mfgDate = distComm.CalcExpiry( expDateDb, ((-1)*selfLife) );
 						}
@@ -3000,6 +3000,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 						{
 
 							domID++;
+							int srNo = i + 1; // Commented and Added by Pankj R on 25-Dec-18 [START]
 							lineNo = "   " + domID;
 							lineNo = lineNo.substring( lineNo.length()-3 );
 							//								extraArtForLastPallet-=nosOfArtPerPallet;

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

@@ -252,6 +252,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 			{
 				retString = itmDBAccess.getErrorString("","VTLCKERR","","",conn);//Changes by mayur on 20-July-2018
 			}
+			rs.close();
+			pstmt.close();
 			if (retString != null && retString.trim().length() > 0)
 			{
 				isError = true;

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

@@ -1318,12 +1318,13 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 							//Changed by Dadaso pawar on 13/07/15 [End] //lot_sl__new should not duplicate
 							System.out.println("Order Type in ReplissIC within if:["+orderType+"]");
 							//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
-							if(!lotSlNew.startsWith("NJ") && !lotSlNew.startsWith("CN") && !lotSlNew.startsWith("DM") && !lotSlNew.startsWith("EX") )
+							//Commented by Pankaj R on 04-JAN-19 to avoid lotSlNew starts with validation [START]
+							/*if(!lotSlNew.startsWith("NJ") && !lotSlNew.startsWith("CN") && !lotSlNew.startsWith("DM") && !lotSlNew.startsWith("EX") )
 							{
 								errList.add( "VTINVLPN" );
 								errFields.add( childNodeName.toLowerCase());
-							}
-	
+							}*/
+							//Commented by Pankaj R on 04-JAN-19 to avoid lotSlNew starts with validation [END]
 							if(lotSlNew.length() != 10)
 							{
 								errList.add( "VTINVLEN" );
@@ -3632,7 +3633,7 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						}
 						//changed by sankara on 08/05/14 for check loc code to and suggestion loc code start.						
 							locCodeTo = checkNull(genericUtility.getColumnValue("loc_code__to", allFormDataDom, "4" ));
-							locCodeSys = checkNull(genericUtility.getColumnValue("loc_code__sys", allFormDataDom, "4" ));
+							locCodeSys = checkNull(genericUtility.getColumnValue("loc_code__sys", allFormDataDom, "3" )); //Changes done by Pankaj R on 04-Jan-19 for Replanishment
 							System.out.println("dom4locCodeTo::::::"+locCodeTo);
 							System.out.println("dom4locCodeSys::::::"+locCodeSys);
 

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

@@ -11,6 +11,7 @@ import ibase.utility.CommonConstants;
 import ibase.webitm.ejb.ActionHandlerEJB;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.ITMDBAccessLocal;
+import ibase.webitm.ejb.dis.DespatchConfirm;
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
@@ -3253,13 +3254,14 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		String compName = "";
 		String retString = "";
 		String serviceCode = "";
+		String compType = ""; // Changes done by Pankaj to call JB comp based on comptype
 		String serviceURI = "";
 		String actionURI = "";
 		String sql = "";
 		//Connection conn = null;
 		PreparedStatement pStmt = null;
 		ResultSet rs = null;
-		System.out.println("confirmShipment");
+		System.out.println("confirmShipment.....");
 		try
 		{
 			//ConnDriver connDriver = new ConnDriver();
@@ -3269,12 +3271,13 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 			actionURI = "http://NvoServiceurl.org/" + methodName;
 			System.out.println(businessObj+"---"+tranIdFr+"---"+xtraParams+"---"+forcedFlag);
 
-			sql = "SELECT SERVICE_CODE,COMP_NAME FROM SYSTEM_EVENTS WHERE OBJ_NAME = ? AND EVENT_CODE = 'pre_confirm' ";
+			sql = "SELECT COMP_TYPE,SERVICE_CODE,COMP_NAME FROM SYSTEM_EVENTS WHERE OBJ_NAME = ? AND EVENT_CODE = 'pre_confirm' ";
 			pStmt = conn.prepareStatement(sql);
 			pStmt.setString(1,businessObj);
 			rs = pStmt.executeQuery();
 			if ( rs.next() )
 			{
+				compType = rs.getString("COMP_TYPE");
 				serviceCode = rs.getString("SERVICE_CODE");
 				compName = rs.getString("COMP_NAME");
 			}
@@ -3312,28 +3315,39 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 				rs.close();
 				rs=null;
 			}
-			// Changed by Manish on 01/04/16 for max cursor issue [end]
-			Service service = new Service();
-			Call call = (Call)service.createCall();
-			call.setTargetEndpointAddress(new java.net.URL(serviceURI));
-			call.setOperationName( new javax.xml.namespace.QName("http://NvoServiceurl.org", methodName ) );
-			call.setUseSOAPAction(true);
-			call.setSOAPActionURI(actionURI);
-			Object[] aobj = new Object[4];
-
-			call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "component_name"), XMLType.XSD_STRING, ParameterMode.IN);
-			call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "tran_id"), XMLType.XSD_STRING, ParameterMode.IN);
-			call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "xtra_params"), XMLType.XSD_STRING, ParameterMode.IN);
-			call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "forced_flag"), XMLType.XSD_STRING, ParameterMode.IN);
-
-			aobj[0] = new String(compName.trim());
-			aobj[1] = new String(tranIdFr.trim());
-			aobj[2] = new String(xtraParams);
-			aobj[3] = new String(forcedFlag);
-
-			call.setReturnType(XMLType.XSD_STRING);
-
-			retString = (String)call.invoke(aobj);
+			System.out.println("ShipmentConf.confirmShipment() compType "+compType);
+			// Commented and Added by Pankaj R on 25-Dec-18 to call component based on comp type[START] 
+			if(compType.equalsIgnoreCase("WSR"))
+			{
+				// Changed by Manish on 01/04/16 for max cursor issue [end]
+				Service service = new Service();
+				Call call = (Call)service.createCall();
+				call.setTargetEndpointAddress(new java.net.URL(serviceURI));
+				call.setOperationName( new javax.xml.namespace.QName("http://NvoServiceurl.org", methodName ) );
+				call.setUseSOAPAction(true);
+				call.setSOAPActionURI(actionURI);
+				Object[] aobj = new Object[4];
+
+				call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "component_name"), XMLType.XSD_STRING, ParameterMode.IN);
+				call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "tran_id"), XMLType.XSD_STRING, ParameterMode.IN);
+				call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "xtra_params"), XMLType.XSD_STRING, ParameterMode.IN);
+				call.addParameter( new javax.xml.namespace.QName("http://NvoServiceurl.org", "forced_flag"), XMLType.XSD_STRING, ParameterMode.IN);
+
+				aobj[0] = new String(compName.trim());
+				aobj[1] = new String(tranIdFr.trim());
+				aobj[2] = new String(xtraParams);
+				aobj[3] = new String(forcedFlag);
+
+				call.setReturnType(XMLType.XSD_STRING);
+
+				retString = (String)call.invoke(aobj);
+			}
+			else
+			{
+				DespatchConfirm despatchConfirm = new DespatchConfirm();
+				retString = despatchConfirm.confirm(tranIdFr, xtraParams, forcedFlag, conn, conn);
+			}
+			// Commented and Added by Pankaj R on 25-Dec-18 to call component based on comp type[END]	
 
 			System.out.println("Return string from NVO is:==>["+retString+"]");
 

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

@@ -1737,8 +1737,12 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 						}
 						else
 						{
-							valueXmlString.append("<item_code><![CDATA[").append(checkNull(itemCode)).append("]]></item_code>\r\n");
-							valueXmlString.append("<item_descr><![CDATA[").append(checkNull(itemDescr)).append("]]></item_descr>\r\n");
+							// Commented and Added by Pankaj R on 25-Dec-18 to set blank itm-code and desc[START]
+							valueXmlString.append("<item_code><![CDATA[").append( "" ).append("]]></item_code>\r\n");
+							valueXmlString.append("<item_descr><![CDATA[").append( "" ).append("]]></item_descr>\r\n");
+							/*valueXmlString.append("<item_code><![CDATA[").append(checkNull(itemCode)).append("]]></item_code>\r\n");
+							valueXmlString.append("<item_descr><![CDATA[").append(checkNull(itemDescr)).append("]]></item_descr>\r\n");*/
+							// Commented and Added by Pankaj R on 25-Dec-18 to set blank itm-code and desc[END]
 							//changed by wasim to scan location code in 2nd screen on 18-05-2015 [START].
 							valueXmlString.append("<loc_code__fr><![CDATA[").append("").append("]]></loc_code__fr>\r\n");
 							//valueXmlString.append("<loc_code__fr><![CDATA[").append(checkNull(locCode)).append("]]></loc_code__fr>\r\n");

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

@@ -27,6 +27,7 @@ public class WavegenWizPos extends ValidatorEJB implements WavegenWizPosLocal, W
 		String retString="";
 		try
 		{
+			System.out.println("WavegenWizPos.postSave()");
 			System.out.println("xmlStringAll["+xmlStringAll+"]");
 			System.out.println("dcrId["+dcrId+"]");
 			System.out.println("editFlag["+editFlag+"]");