issue tracking no 194,200

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

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

@@ -69,6 +69,16 @@ public class PalletMergePos extends ValidatorEJB implements PalletMergePosLocal,
 			pstmt.close();
 			pstmt = null;	
 			
+			//Changed by Pragyan on 19/07/13 update new pallet no in master pack hdr start.
+			sSQL = "UPDATE PICK_HDR SET PALLET_NO = ?  WHERE PALLET_NO = ? ";
+			pstmt = conn.prepareStatement(sSQL);
+			pstmt.setString(1, palletNoNew);
+			pstmt.setString(2, palletNo);
+			pstmt.executeUpdate();	
+			pstmt.close();
+			pstmt = null;	
+			
+			
 			//sSQL = "UPDATE CARTON_MASTER SET PALLET_NO = ?  WHERE PALLET_NO = ? ";
 			sSQL = "UPDATE CARTON_MASTER SET PALLET_NO = ?,STATUS = ?  WHERE PALLET_NO = ? ";
 			pstmt = conn.prepareStatement(sSQL);

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

@@ -1550,7 +1550,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 		String invDate = "";
 		String taxRefDate = "";
 		String exciseRefDate = "";
-
+		//Changed by Pragyan as per KB & Manoj sharma
+		String pordType = "";
 		String invoiceNo = "";
 		String tranCode = "";
 		String remarks = "";
@@ -1965,6 +1966,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 								asnDateDb = rs.getDate("ASN_DATE");
 								scacCode = checkNull( rs.getString("SCAC_CODE") );
 								lrNo = checkNull( rs.getString("LR_NO") );
+								
 								asnDate = dateFormat.format(asnDateDb);
 							}
 							rs.close(); rs = null;
@@ -1974,7 +1976,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 								loginSite = siteCode;
 							}
 							
-							sql = "SELECT TRAN_CODE,TRANS_MODE FROM PORDER WHERE PURC_ORDER = ? "; //added by Kunal on 05/09/12 
+							//sql = "SELECT TRAN_CODE,TRANS_MODE FROM PORDER WHERE PURC_ORDER = ? "; //added by Kunal on 05/09/12 
+							sql = "SELECT TRAN_CODE,TRANS_MODE,PORD_TYPE FROM PORDER WHERE PURC_ORDER = ? "; //added by Kunal on 05/09/12
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,purcOrderdb );
 							rs = pstmt.executeQuery();
@@ -1982,6 +1985,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 							{										
 								tranCode = rs.getString("TRAN_CODE");
 								transMode = rs.getString("TRANS_MODE");
+								pordType = rs.getString("PORD_TYPE");
 							}
 							rs.close(); rs = null;
 							pstmt.close(); pstmt = null;
@@ -2087,6 +2091,8 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 							valueXmlString.append( "<tran_id/>" );
 							valueXmlString.append( "<asn_no><![CDATA[" ).append( asnNo ).append( "]]></asn_no>\r\n" );
 							valueXmlString.append( "<purc_order><![CDATA[" ).append(  checkNull(purcOrder) ).append( "]]></purc_order>\r\n" );
+							//Changed Pragyan as per KB & Manoj sharma.start
+							valueXmlString.append( "<tran_type><![CDATA[" ).append(pordType).append( "]]></tran_type>\r\n" );
 							valueXmlString.append( "<site_code><![CDATA[" ).append( checkNull(loginSite) ).append( "]]></site_code>\r\n" );
 							valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull(siteDescr) ).append( "]]></site_descr>\r\n" );
 							valueXmlString.append( "<supp_code><![CDATA[" ).append( checkNull(suppCode) ).append( "]]></supp_code>\r\n" );