Isssue tracker no - 267

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

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

@@ -60,6 +60,7 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 		System.out.println ( "returning from PickAssignIC itemChanged" );
 		return errString;
 	}
+
 	public String itemChanged( Document dom, Document dom1, Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams ) throws RemoteException,ITMException
 	{
 
@@ -77,7 +78,7 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		java.sql.Date dateFrom = null;
 		java.sql.Date dateTo = null;
-		HashMap hm = new HashMap();
+		HashMap dateMap = new HashMap();
 
 		try
 		{
@@ -107,25 +108,52 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 					System.out.println("PICKORDERFROM====="+pickOrderFrom);
 					pickOrderTo = checkNull( genericUtility.getColumnValue("pick_order_to",dom) );
 					System.out.println("PICKORDERTO======="+pickOrderTo);
-					hm = getOrderDate(  pickOrderFrom,pickOrderTo,conn);					
-					dateFrom = ((java.sql.Date)hm.get("MIN_DATE"));
+					dateMap = getOrderDate(  pickOrderFrom,pickOrderTo,conn);					
+					dateFrom = ((java.sql.Date)dateMap.get("MIN_DATE"));
+					System.out.println("dateFrom=="+dateFrom);
+		
+					if( dateFrom == null )
+					{	
+						valueXmlString.append( "<from_date><![CDATA[" ).append("").append( "]]></from_date>\r\n" );
+					}
+					else
+					{
 						orddatFrom = genericUtility.getValidDateString( dateFrom.toString() , dbDateFmt, applDateFmt );	
-					dateTo =(java.sql.Date)hm.get("MAX_DATE");
+					}
+				
+					dateTo =(java.sql.Date)dateMap.get("MAX_DATE");
+					System.out.println("dateTo=="+dateTo);
+					if( dateTo == null )
+					{
+						valueXmlString.append( "<to_date><![CDATA[" ).append("").append( "]]></to_date>\r\n" );
+					}
+					else
+					{
 					    orddatTo = genericUtility.getValidDateString( dateTo.toString() , dbDateFmt, applDateFmt );	 
-					System.out.println("orddatFrom"+dateFrom);
-					System.out.println("orddatTo"+dateTo);
 					}
-				if( dateFrom == null || dateTo == null )
+					
+					System.out.println("orddatFrom"+orddatFrom);
+					System.out.println("orddatTo"+orddatTo);
+					if( pickOrderTo != null && !pickOrderTo.equalsIgnoreCase("ZZ"))
+					{
+						if( dateFrom != null )
+						{	
+							valueXmlString.append( "<from_date><![CDATA[" ).append( orddatFrom ).append( "]]></from_date>\r\n" );
+							valueXmlString.append( "<to_date><![CDATA[" ).append( orddatTo ).append( "]]></to_date>\r\n" );
+						}
+						else
 						{
 							valueXmlString.append( "<from_date><![CDATA[" ).append( "" ).append( "]]></from_date>\r\n" );
 							valueXmlString.append( "<to_date><![CDATA[" ).append( "" ).append( "]]></to_date>\r\n" );
 						}
+					}
 					else
 					{
 						valueXmlString.append( "<from_date><![CDATA[" ).append( orddatFrom ).append( "]]></from_date>\r\n" );
 						valueXmlString.append( "<to_date><![CDATA[" ).append( orddatTo ).append( "]]></to_date>\r\n" );
 					}
 				}
+			}
 			valueXmlString.append( "</Detail1>\r\n" );
 			break;
 			}//switch statement ends here
@@ -173,7 +201,7 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 		ResultSet rs = null;
 		java.sql.Date minOrderDate = null;
 		java.sql.Date maxOrderDate = null;
-		HashMap hm = new HashMap();
+		HashMap dateMap = new HashMap();
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		try
 		{		 
@@ -186,8 +214,8 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 			{
 				minOrderDate = rs.getDate(1);
 				maxOrderDate = rs.getDate(2);
-				hm.put("MIN_DATE",minOrderDate);
-				hm.put("MAX_DATE",maxOrderDate);
+				dateMap.put("MIN_DATE",minOrderDate);
+				dateMap.put("MAX_DATE",maxOrderDate);
 			}
 			if(pstmt != null)
 			{
@@ -230,7 +258,7 @@ public class PickAssignIC extends ValidatorEJB implements PickAssignICRemote,Pic
 				throw new ITMException(e);
 			}
 		}	
-		return hm; 	 	 
+		return dateMap; 	 	 
 	}
 
 	private String checkNull( String input )

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

@@ -343,7 +343,8 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
 					{
 						if ( childNode != null && childNode.getFirstChild() != null )
 						{
-							assignTo = checkNull(childNode.getFirstChild().getNodeValue());
+							assignTo = (childNode.getFirstChild().getNodeValue());
+							System.out.println("assignTo="+assignTo);
 							if ( assignTo != null && assignTo.trim().length() != 0 )
 							{
 								System.out.println("assignTo==="+assignTo);
@@ -367,6 +368,11 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
 								pstmt = null;
 							}						
 						}
+						else
+						{
+							errString = itmDBAccessEJB.getErrorString("","VPBLKUSRCD",userId);
+							return errString; 
+						}	
 					}	
 					else if("status".equalsIgnoreCase(childNodeName))
 					{

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

@@ -44167,6 +44167,35 @@ INSERT INTO obj_itemchange(
 	'1  ',
 	'pick_order_to',
 	NULL);
+	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 (
+	'VPBLKEMPCD',
+	'User Code Blank!',
+	'User Code Should not be Blank',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'Base ',
+	'Base',
+	NULL,
+	NULL);
+commit;	
 commit;	
 
  
\ No newline at end of file