issue tracker 295 & 297

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

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

@@ -879,6 +879,8 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							errFields.add( childNodeName.toLowerCase() );
 							// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
 						}
+						
+						
 					}//End pick_order validation
 					else if ( "pick_type".equalsIgnoreCase( childNodeName ) )
 					{
@@ -1805,7 +1807,24 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						pstmt.close();
 						pstmt = null;
 						
+						String comleteStatus = "";
+						sql = "SELECT STATUS FROM PICK_ORD_HDR WHERE PICK_ORDER = ?";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrdIss );
+						rs = pstmt.executeQuery();
 
+						if( rs.next() )
+						{
+							comleteStatus = rs.getString("STATUS");
+						}
+						rs.close(); rs = null;
+						pstmt.close(); pstmt = null;
+						System.out.println("Current Pick Status ["+comleteStatus+"]["+pickOrdIss+"]");
+						if("C".equalsIgnoreCase(comleteStatus))
+						{
+							errList.add( "VTPICKCOMP" );
+							errFields.add( childNodeName.toLowerCase() );
+						}
 						
 					}	
 					//Changed by Rohan on 29-10-12 to add warinig message in depended repanishment not scan.end

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

@@ -198,6 +198,9 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 						pickOrder = genericUtility.getColumnValueFromNode("pick_order", dom.getElementsByTagName("Detail2").item(0));
 						System.out.println("pick order from header ["+pickOrder+"]");
 						
+						if(locCodeTo != null && locCodeTo.length() > 0)
+						{
+
 								sql = "UPDATE pick_iss_det SET loc_code__to =  ? WHERE  tran_id = ? ";
 								
 								pstmt = conn.prepareStatement(sql);
@@ -408,6 +411,7 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 								/*} */
 						}
 					}
+				}
 				else
 				{
 					System.out.println("called for active pick ");

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

@@ -8867,6 +8867,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		    			//Chnaged by Rohan on 21-08-13 for shipAddrs 3 is blank then set address 2.end
 		    			recipient.setCity(shipCity);//Customer Adress City
 		    			recipient.setState(stateCodeDlv);//Customer Adress State
+		    			//Changed By Pragyan to overcome from postal code error
+		    			shipCountry = shipCountry!=null?shipCountry.trim():"";
 		    			Country country = soap.getCountry("ISO3", shipCountry).getResponseCountry();
 		    			recipient.setCountry(country);//Customer Adress Country
 		    			
@@ -10686,6 +10688,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code
 								comInfo.setUnitValue(unitValue);
 								comInfo.setUnitWeight(caseWeight);
+								originCountry = originCountry!=null?originCountry.trim():"";
 								Country originCountryMfg = soap.getCountry("ISO3", originCountry).getResponseCountry();
 								comInfo.setOriginCountry(originCountryMfg);
 								//change by rekha on 31-05-13 start
@@ -10923,6 +10926,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code
 							comInfo.setUnitValue(unitValue);
 							comInfo.setUnitWeight(itemWeight);
+							originCountry = originCountry!=null?originCountry.trim():"";
 							Country originCountryMfg = soap.getCountry("ISO3", originCountry).getResponseCountry();
 							comInfo.setOriginCountry(originCountryMfg);
 							
@@ -12451,6 +12455,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 								comInfo.setHarmonizedCode(harmonizCode);//As per Taro Haromonization code
 								comInfo.setUnitValue(unitValue);
 								comInfo.setUnitWeight(itemWeight);
+								originCountry = originCountry!=null?originCountry.trim():"";
 								Country originCountryMfg = soap.getCountry("ISO3", originCountry).getResponseCountry();
 								comInfo.setOriginCountry(originCountryMfg);
 								System.out.println("VALUES IN NAFTA VALUES "+nafFlag);