consoldation val,bifruc case pick,now to user scan val

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

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

@@ -601,7 +601,7 @@ public class ConsolidatToDoc {
 										else
 										{
 											grossWeight = (grossWtPerArt * noArt);
-											totalGrossWeight = totalGrossWeight + grossWeight;   //added by Kunal on 08/09/12
+											//totalGrossWeight = totalGrossWeight + grossWeight;   //added by Kunal on 08/09/12
 											tareWeight = (tareWtPerArt * noArt);
 											netWeight  = grossWeight -  tareWeight	;
 										}

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

@@ -202,7 +202,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 			//Changes by gulzar on 12/28/2011
 			intrLocInvstat = distCommon.getDisparams( "999999", "INTR_LOCATION", conn );
 			//End changes by gulzar on 12/28/2011
-
+			
 			switch ( currentFormNo )  // Switch Case for form number
 			{
 			case 1:
@@ -235,7 +235,7 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
 						}
 						pickOrder = genericUtility.getColumnValue( "pick_order", currFormDataDom );
-
+						
 						//Changed by sumit on 22/01/13 adding validation where user going to do this task which is already processing by other user start
 						sql = "SELECT CONFIRMED, CHG_USER FROM PICK_ISS_HDR WHERE PICK_ORDER = ? ";
 						pstmt = conn.prepareStatement( sql );
@@ -254,9 +254,9 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 						rs = null;
 						pstmt.close();
 						pstmt = null;						
-						//Changed by sumit on 22/01/13 adding validation where user going to do this task which is already processing by other user start
-						
+						//Changed by sumit on 22/01/13 adding validation where user going to do this task which is already processing by other user END
 						
+
 						// added by cpatil on 11-sept-12 start for pick_id validate
 						sql = "SELECT count(1) FROM PICK_ORD_HDR WHERE PICK_ORDER = ?";
 						pstmt = conn.prepareStatement( sql );
@@ -765,6 +765,26 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 							// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
 						}
 						pickOrder = genericUtility.getColumnValue( "pick_order", currFormDataDom );
+						
+						//Changed by sumit on 22/01/13 adding validation where user going to do this task which is already processing by other user start
+						sql = "SELECT CONFIRMED, CHG_USER FROM PICK_ISS_HDR WHERE PICK_ORDER = ? ";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						rs = pstmt.executeQuery();
+						if( rs.next() )
+						{
+							System.out.println(" confirmed ["+rs.getString("CONFIRMED")+"] userid ["+rs.getString("CHG_USER")+"]");
+							if( "N".equalsIgnoreCase(rs.getString("CONFIRMED")) && !userId.trim().equalsIgnoreCase(rs.getString("CHG_USER").trim()))
+							{
+								errList.add( "VMPICKORDU" );
+								errFields.add( childNodeName.toLowerCase() );
+							}
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;						
+						//Changed by sumit on 22/01/13 adding validation where user going to do this task which is already processing by other user END
 
 						sql = "SELECT COUNT(*) AS COUNT FROM PICK_ORD_HDR WHERE PICK_ORDER = ?";
 						pstmt = conn.prepareStatement( sql );

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

@@ -24,6 +24,8 @@ import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
@@ -101,7 +103,8 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 		String childNodeName = "";
 		Node childNode =null;
 		String userId = "",tranCodeHdr="";
-
+		ArrayList arrayList = null;//Added by sumit on 23/01/13
+		
 		int cnt = 0;
 		int ctr2 = 0;
 		int lineNo = 0;
@@ -480,7 +483,7 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 					noOfChilds = childList.getLength();
 					for (int ctr = 0; ctr < noOfChilds; ctr++)
 					{	
-						childNode = childList.item( ctr );
+						childNode = childList.item( ctr );					
 						childNodeName = childNode.getNodeName();
 						if ( childNode != null && childNode.getFirstChild() != null )
 						{
@@ -552,6 +555,20 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 									}
 								}
 								// end
+								
+								//Changed by sumit on 23/01/13 validating repeat ptcn start
+								arrayList = checkDuplicaterecord(dom2);
+							  Set s = new HashSet(arrayList);
+							  System.out.println("Size of arrayList ["+arrayList.size()+"]");
+							  System.out.println("Size of Set ["+s.size()+"]");								  
+							  if(s.size() < arrayList.size())
+							  {
+								  errList.add( "DUPPTCNNO" );
+								  errFields.add( childNodeName.toLowerCase() );
+							  }
+							  s.clear();
+								//Changed by sumit on 23/01/13 validating repeat ptcn end
+								
 							}
 					
 						}
@@ -611,7 +628,9 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 								pstmt.close();
 								pstmt = null;
 								
-								parentNodeList = dom2.getElementsByTagName("Detail2");
+								
+								//Changed by sumit 22/01/13 this validation is not required ( By Ashish Sir) start.
+								/*parentNodeList = dom2.getElementsByTagName("Detail2");
 								parentNodeListLength = parentNodeList.getLength();
 								System.out.println("PARENT NODE LENGTH [ "+parentNodeListLength+"]");
 								if("S-DSP".equalsIgnoreCase(refSer.trim()))
@@ -644,7 +663,8 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
 											errFields.add( childNodeName.toLowerCase() );		
 										}
 									}
-								}
+								}*/
+								//Changed by sumit 22/01/13 this validation is not required ( By Ashish Sir) end.
 								
 							}
 							else
@@ -2042,5 +2062,96 @@ private String checkNull( String input )
 	
 	}
 	
+	//Changed by sumit on 23/01/13 getting attribute value start.
+	private String getAttribValue(Node detailNode, String nodeName, String attribStr)
+	{
+		String attribValue = "";
+		try
+		{
+			String domStr = GenericUtility.getInstance().serializeDom(detailNode);
+			Document dom = GenericUtility.getInstance().parseString(domStr);
+			if( dom != null /*&& dom.getAttributes() != null*/)
+			{
+				Node attributeNode = dom.getElementsByTagName( nodeName ).item(0);
+				attribValue = getAttribValue(attributeNode, attribStr);
+			}
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception : getAttribValue :" + e.getMessage());
+		}
+		return attribValue;
+	}
+	private String getAttribValue(Node detailNode, String attribStr)
+	{
+		String attribValue = "";
+		try
+		{
+			if( detailNode != null && detailNode.getAttributes() != null)
+			{
+				Node attribNode = detailNode.getAttributes().getNamedItem( attribStr );
+				if( attribNode != null )
+				{
+					attribValue = checkNull( attribNode.getNodeValue() );
+				}
+			}
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception : getAttribValue :" + e.getMessage());
+		}
+		return attribValue;
+	}
+	//Changed by sumit on 23/01/13 getting attribute value end.
+	//Changed by sumit on 23/01/13 checking duplicate PTCN start.
+	private ArrayList checkDuplicaterecord(Document dom) throws ITMException
+	{
+		ArrayList arryList = new ArrayList();
+		
+		NodeList parentNodeList = null, childNodeList  = null;
+		Node parentNode = null, childNode = null;
+	    int parentNodeListLength = 0;
+	    String childNodeName = "";
+		
+		try {
+			parentNodeList = dom.getElementsByTagName("Detail2");
+			parentNodeListLength = parentNodeList.getLength();
+			for (int row = 0; row < parentNodeList.getLength(); row++) 
+			{
+				parentNode = parentNodeList.item(row);				
+				String updateFlag = getAttribValue(parentNode,"attribute", "updateFlag"); //(parentNode, "attribute", "status"));
+				System.out.println(" sumit updateFlag ["+updateFlag+"]");
+				childNodeList = parentNode.getChildNodes();
+				
+				//System.out.println("************* first For loop *************["+ parentNode.getNodeName() + "]");
+				for (int col = 0; col < childNodeList.getLength(); col++) {
+					childNode = childNodeList.item(col);
+					
+					if (childNode.getNodeType() == childNode.ELEMENT_NODE) {
+						childNodeName = childNode.getNodeName();
+						//System.out.println("childNodeNamechildNodeName ** ["+childNodeName+"]");
+						if( !"D".equalsIgnoreCase(updateFlag))
+						{
+							if ("ptcn".equalsIgnoreCase(childNodeName)) 
+							{
+								arryList.add(childNode.getFirstChild().getNodeValue().trim());
+								//arrayList.add(i,childNode.getFirstChild().getNodeValue());
+								//map = sprsCode != null ? sprsCode : "";
+								System.out.println("=====ptcn-->[" + arryList+ "]");
+								
+							}
+						}
+					}
+				}
+			}
+		} 
+		catch (Exception e) 
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		return arryList;
+	}	
+	//Changed by sumit on 23/01/13 checking duplicate PTCN end.
  
 }
\ No newline at end of file

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

+/**
+* PURPOSE : Local Interface
+* Author :Sumit Sarkar
+*/
+
+package ibase.webitm.ejb.wms;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import java.sql.*;
+
+import java.rmi.RemoteException;
+
+// The local interface declares all the utility functions to be used in your EJB component
+@javax.ejb.Local
+public interface ShipmentPrsLocal extends ValidatorLocal
+{
+	public String preSave()throws RemoteException,ITMException;
+	public String preSave(String xmlString, String editFlag, String xtraParams, Connection conn)throws RemoteException,ITMException;
+}

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

+/**
+* PURPOSE : Remote Interface 
+* Author : Sumit Sarkar
+*/
+
+package ibase.webitm.ejb.wms;
+
+import ibase.webitm.ejb.*;
+import ibase.webitm.utility.ITMException;
+import java.sql.*;
+import java.rmi.RemoteException;
+
+// The remote interface declares all the utility functions to be used in your EJB component
+@javax.ejb.Remote
+public interface ShipmentPrsRemote extends ValidatorRemote//, EJBObject
+{
+	public String preSave()throws RemoteException,ITMException;
+	public String preSave(String xmlString, String editFlag, String xtraParams, Connection conn)throws RemoteException,ITMException;
+}

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

@@ -29068,6 +29068,285 @@ INSERT INTO MESSAGES (
 	NULL);
 update messages set msg_descr ='The pallet is already transferred'
 where msg_no = 'VTPLTTRF';
+
+//Changed By Sumit 23/01/12
+
+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 (
+	'INVSHIPCON',
+	'Invalid Pallet Number',
+	'Ship consignee group are not same of entered pallet numbers. ',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('8-05-2012 16:36:55','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE           ',
+	NULL,
+	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 (
+	'ALLPTCNNTA',
+	'Incomplete Shipment',
+	'Please enter all PTCN number''s whose ship consignee group are same on the wave of entered PTCN',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('8-05-2012 16:36:55','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE           ',
+	NULL,
+	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 (
+	'DUPPTCNNO',
+	'Invalid PTCN',
+	'Duplicate PTCN number',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('8-05-2012 16:36:55','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE           ',
+	NULL,
+	NULL);
+
+	INSERT INTO SYSTEM_EVENTS (
+	obj_name ,
+	event_code ,
+	event_context ,
+	service_code ,
+	method_rule ,
+	overwrite_core ,
+	chg_date,
+	chg_user ,
+	chg_term ,
+	result_handle ,
+	comp_type ,
+	comp_name ,
+	comm_format )
+VALUES (
+	'shipment',
+	'pre_save',
+	'1',
+	'prsr_shipment',
+	NULL,
+	'0',
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	'2',
+	'EJB',
+	'ShipmentPrs',
+	NULL);
+
+	
+	INSERT INTO SYSTEM_SERVICE_ARGS (
+	service_code ,
+	line_no ,
+	arg_name ,
+	arg_mode,
+	descr ,
+	arg_type ,
+	arg_xfrm,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	arg_value )
+ VALUES (
+	'prsr_shipment',
+	1,
+	'COMPONENT_TYPE',
+	'I',
+	NULL,
+	'C.String',
+	NULL,
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	'EJB');
+	
+INSERT INTO SYSTEM_SERVICE_ARGS (
+	service_code ,
+	line_no ,
+	arg_name ,
+	arg_mode,
+	descr ,
+	arg_type ,
+	arg_xfrm,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	arg_value )
+ VALUES  (
+	'prsr_shipment',
+	2,
+	'COMPONENT_NAME',
+	'I',
+	NULL,
+	'C.String',
+	NULL,
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	'ShipmentPrs');
+	
+	
+INSERT INTO SYSTEM_SERVICE_ARGS (
+	service_code ,
+	line_no ,
+	arg_name ,
+	arg_mode,
+	descr ,
+	arg_type ,
+	arg_xfrm,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	arg_value )
+ VALUES  (
+	'prsr_shipment',
+	3,
+	'XML_DATA_ALL',
+	'I',
+	NULL,
+	'S',
+	NULL,
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	NULL);
+	
+	
+INSERT INTO SYSTEM_SERVICE_ARGS (
+	service_code ,
+	line_no ,
+	arg_name ,
+	arg_mode,
+	descr ,
+	arg_type ,
+	arg_xfrm,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	arg_value )
+ VALUES  (
+	'prsr_shipment',
+	4,
+	'EDIT_FLAG',
+	'I',
+	NULL,
+	'S',
+	NULL,
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	NULL);
+	
+	
+INSERT INTO SYSTEM_SERVICE_ARGS (
+	service_code ,
+	line_no ,
+	arg_name ,
+	arg_mode,
+	descr ,
+	arg_type ,
+	arg_xfrm,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	arg_value )
+ VALUES  (
+	'prsr_shipment',
+	5,
+	'XTRA_PARAMS',
+	'I',
+	NULL,
+	'S',
+	NULL,
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	NULL);
+	
+	
+INSERT INTO SYSTEM_SERVICE_ARGS (
+	service_code ,
+	line_no ,
+	arg_name ,
+	arg_mode,
+	descr ,
+	arg_type ,
+	arg_xfrm,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	arg_value )
+ VALUES  (
+	'prsr_shipment',
+	6,
+	'DB_CONN',
+	'I',
+	NULL,
+	'S.Connection',
+	NULL,
+	TO_DATE('18-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	NULL);
+
+	
+	COMMIT;
+	
+
 COMMIT;
+