add ptcn in despatch and mannual shipment

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

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

@@ -690,8 +690,9 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 													pkg2.setHazmatFlag(false);
 													pkg2.setCODReturnAddress(addr);//As per Taro not required
 													comInfo = new CommodityInfo();
-													
-													comInfo.setDescription("");//As per taro Harmonization description
+													//Change according 09-OCT-13 to Ashish/Stepehn for ItemDescription
+													//comInfo.setDescription("");//As per taro Harmonization description
+													comInfo.setDescription(itemDescr);//As per taro Harmonization description
 													comInfo.setQuantity(noArt);
 													comInfo.setHarmonizedCode("");//As per Taro Haromonization code
 													if(unitValue > 0)

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

@@ -58,6 +58,7 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		String tranId = "";
 		String transMode = "";
 		Set ptcn = null;		
+		Set tranCodeSet = null;	
 		int deleteCount = 0;
 		boolean isSameWave = false;
 		ResultSet rs = null;
@@ -66,16 +67,19 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		String tempPtcn = "";
 		Set refSer = new HashSet();//added by sumit on 11/02/13
 		int count = 0;
+		String tranCode = "";
 		
 		HashMap ptcnAndConsingnee = new HashMap();
 		HashMap newPtcnAndNewConsingnee = new HashMap();
 		
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
+		
 		try
 		{			
 			conn.setAutoCommit(false); 
 			GenericUtility genericUtility = GenericUtility.getInstance();
 			ptcn = new HashSet();
+			tranCodeSet = new HashSet();
 			NodeList parentNodeList = null;
 			NodeList childList = null;
 			int parentNodeListLength ;
@@ -93,7 +97,10 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 	        	if(!"D".equalsIgnoreCase(updateFlag))
 	        	{
 	        		tempPtcn = GenericUtility.getInstance().getColumnValueFromNode("ptcn", dom.getElementsByTagName("Detail2").item(row));
-	        		ptcn.add(tempPtcn);	        	
+	        		ptcn.add(tempPtcn);	     
+	        		tranCode = GenericUtility.getInstance().getColumnValueFromNode("tran_code", dom.getElementsByTagName("Detail2").item(row));
+	        		tranCodeSet.add(tranCode);
+	        		
 	        		shipmentId = checkNull(GenericUtility.getInstance().getColumnValueFromNode("shipment_id", dom.getElementsByTagName("Detail2").item(row)));
 	        		//Changed by sumit on 11/02/13 getting ref ser 
 	        		refSer.add(checkNull(GenericUtility.getInstance().getColumnValueFromNode("ref_ser", dom.getElementsByTagName("Detail2").item(row))).trim());
@@ -137,7 +144,7 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 					errString = itmDBAccessEJB.getErrorString("","INVSHIPCON","","",conn);
 					return errString;
 				}
-				
+								
 				isSameWave = isSameWaveId(ptcn, conn);
 				System.out.println(" isSameWave ["+isSameWave+"]");
 				if( isSameWave )
@@ -194,8 +201,13 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 					}
 				}
 			}
-			//errString = getErrorString("PTCN","ALLPTCNNTA","");
-			System.out.println(" errString -->["+errString+"]");
+			
+			if( tranCodeSet != null && tranCodeSet.size() > 1 && refSer.contains("S-DSP") && refSer.size() == 1)
+			{
+				errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn);
+				System.out.println(" errString -->["+errString+"]");
+				return errString;
+			}
 			
 		}
 		catch (SQLException sqe)
@@ -463,7 +475,70 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		}
 		return isAllCngSame;
 	}
-	
+	private boolean isTransporterSameForPTCN(String despID, Connection conn) throws ITMException
+	{
+		String sql = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		boolean isAllTransporterSame = false;
+		int count = 0;
+		StringBuffer buffer = new StringBuffer();
+		
+		
+		try
+		{
+			
+			////Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
+			//sql = "SELECT DISTINCT SHIP_CONS_GRP FROM CUSTOMER WHERE CUST_CODE IN " +
+			sql = "SELECT DISTINCT TRAN_CODE FROM DESPACTCHDET WHERE DESP_ID = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, despID);
+			
+			rs = pstmt.executeQuery();
+			
+			while( rs.next() )
+			{
+				count++;
+			}
+			rs.close(); rs = null;
+			pstmt.close(); pstmt = null;
+			System.out.println(" count ["+count+"]");
+			if( count == 1 )
+			{
+				isAllTransporterSame = true ;
+			}
+			else
+			{
+				isAllTransporterSame = false;
+			}
+			System.out.println(" isisTransporterSameForPTCN ["+isAllTransporterSame+"]");			
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try 
+			{
+				if( rs != null)
+				{
+					rs.close(); rs = null;
+				}
+				if( pstmt != null)
+				{
+					pstmt.close(); pstmt = null;
+				}
+			}
+			catch( Exception es)
+			{
+				es.printStackTrace();
+				throw new ITMException(es);
+			}
+		}
+		return isAllTransporterSame;
+	}
 	private HashMap getConsigneAgainstNewPTCN(Set ptcn, Connection conn) throws ITMException
 	{
 		String sql = "", sql1 = "";
@@ -479,6 +554,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		//Changed By Pragyan to store consignee group and customer code delivery.start
 		String shiptConsiGroup = "";
 		String shipCustCodeDlv = "";
+		String serviceCode = "";
+		String shipmentType = "";
 		
 		try
 		{
@@ -491,6 +568,8 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 			inputString = inputString.substring(0, inputString.length() - 3 );
 			System.out.println(" input *-  string "+inputString);
 			
+			
+			//Chnaged By Pragyan 07-OCT-13 not To validate UPS/FEDEX Shipments in 
 			///sql = "SELECT DISTINCT PTCN FROM WAVE_TASK_DET WHERE WAVE_ID IN ( SELECT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN ? )";
 			
 			//For different ptcn
@@ -499,48 +578,70 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 					" AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN '"+inputString+"' )";*/
 			//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
 			//sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE " +
-			sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
+			/*sql = " SELECT DISTINCT WTD.PTCN FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
 					" AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND WTD.PTCN NOT IN ('"+inputString+"') " +
-					" AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
+					" AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";*/
+			sql = " SELECT DISTINCT WTD.PTCN,T.TRAN_CODE,T.SERVICE_CODE,T.SHIPMENT_TYPE FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD," +
+					" TRANSPORTER T WHERE C.CUST_CODE = D.CUST_CODE__DLV " +
+					" AND T.TRAN_CODE = D.TRAN_CODE AND WTD.WAVE_ID = D.WAVE_ID AND WTD.REF_ID = D.DESP_ID AND " +
+					" WTD.PTCN NOT IN ('"+inputString+"')  AND WTD.WAVE_ID IN ( SELECT DISTINCT WAVE_ID FROM " +
+					" WAVE_TASK_DET WHERE PTCN IN ('"+inputString+"') )";
+			
 			pstmt = conn.prepareStatement(sql);
 			
 			//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
-			sql1 = 	//" SELECT C.SHIP_CONS_GRP FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
+			/*sql1 = 	//" SELECT C.SHIP_CONS_GRP FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
 					//" AND D.WAVE_ID = WTD.WAVE_ID  AND C.CUST_CODE = D.CUST_CODE AND WTD.REF_ID = D.DESP_ID ";
 					"SELECT C.SHIP_CONS_GRP,D.CUST_CODE__DLV FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD WHERE WTD. PTCN = ? " +
-					" AND D.WAVE_ID = WTD.WAVE_ID  AND C.CUST_CODE = D.CUST_CODE__DLV AND WTD.REF_ID = D.DESP_ID ";
+					" AND D.WAVE_ID = WTD.WAVE_ID  AND C.CUST_CODE = D.CUST_CODE__DLV AND WTD.REF_ID = D.DESP_ID ";*/
+			sql1  = " SELECT C.SHIP_CONS_GRP,D.CUST_CODE__DLV FROM CUSTOMER C, DESPATCH D, WAVE_TASK_DET WTD ,"
+					+" TRANSPORTER T  WHERE WTD. PTCN = ?  AND D.WAVE_ID = WTD.WAVE_ID"  
+					+" AND C.CUST_CODE = D.CUST_CODE__DLV AND WTD.REF_ID = D.DESP_ID AND D.TRAN_CODE = T.TRAN_CODE" 
+					+" AND T.SERVICE_CODE IN (SELECT T.SERVICE_CODE AS SERVICE_CODE FROM TRANSPORTER T, DESPATCH D," 
+					+" WAVE_TASK_DET WTD WHERE T.TRAN_CODE = D.TRAN_CODE  AND D.WAVE_ID = WTD.WAVE_ID AND" 
+					+" D.DESP_ID = WTD.REF_ID AND WTD.PTCN IN ('"+inputString+"'))";
+			
 			pstmt1 = conn.prepareStatement(sql1);
 			
 			/*pstmt.setString(1, inputString);
 			pstmt.setString(2, inputString);*/
 			rs = pstmt.executeQuery();
+			
 			while( rs.next() )
 			{
 				stPTCN = rs.getString("PTCN");
+				serviceCode = checkNull(rs.getString("SERVICE_CODE"));
+				shipmentType = checkNull(rs.getString("SHIPMENT_TYPE"));
+				System.out.println(" serviceCode "+serviceCode+"]["+shipmentType+"]");
 				
-				pstmt1.setString(1, stPTCN);
-				rs1 = pstmt1.executeQuery();
-				if( rs1.next())
+				if(serviceCode.trim().length() == 0 && shipmentType.trim().length() == 0)
 				{
-					//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
-					shiptConsiGroup = checkNull(rs1.getString("SHIP_CONS_GRP"));
-					shipCustCodeDlv = checkNull(rs1.getString("CUST_CODE__DLV"));
-					
-					if(shiptConsiGroup.trim().length() > 0)
-					{
-						sipConsignee.put(stPTCN, shiptConsiGroup);
-					}
-					else
-					{
-						sipConsignee.put(stPTCN, shipCustCodeDlv);
-					}
-					//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.end
-					//PTCN, "SHIP_CONS_GRP";
-					//sipConsignee.put(stPTCN, rs1.getString("SHIP_CONS_GRP"));
+						pstmt1.setString(1, stPTCN);
+						rs1 = pstmt1.executeQuery();
+						if( rs1.next())
+						{
+							//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.start
+							shiptConsiGroup = checkNull(rs1.getString("SHIP_CONS_GRP"));
+							shipCustCodeDlv = checkNull(rs1.getString("CUST_CODE__DLV"));
+							
+							
+								if(shiptConsiGroup.trim().length() > 0)
+								{
+									sipConsignee.put(stPTCN, shiptConsiGroup);
+								}
+								else
+								{
+									sipConsignee.put(stPTCN, shipCustCodeDlv);
+								}
+							//}
+							//Changed By Pragyan 25/04/13 to join with cust_code__dlv delivery.end
+							//PTCN, "SHIP_CONS_GRP";
+							//sipConsignee.put(stPTCN, rs1.getString("SHIP_CONS_GRP"));
+						}
+						pstmt1.clearParameters();
+						rs1.close(); rs1 = null;
+						count++;
 				}
-				pstmt1.clearParameters();
-				rs1.close(); rs1 = null;
-				count++;
 			}
 			rs.close(); rs = null;
 			pstmt.close(); pstmt = null;
@@ -694,6 +795,67 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
 		}
 		return attribValue;
 	}
-	
+	//changed by sankara on 10/04/13 for getting service code start.
+	public String getServiceCode(String key, Connection conn) throws ITMException
+	{
+		String sql = "", sql1 = "";
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		String servicceCode = "";
+		String stPTCN = "";
+		try
+		{
+			sql1 =  " SELECT T.SERVICE_CODE AS SERVICE_CODE FROM TRANSPORTER T, DESPATCH D, WAVE_TASK_DET WTD WHERE T.TRAN_CODE = D.TRAN_CODE" +
+					" AND D.WAVE_ID = WTD.WAVE_ID AND D.DESP_ID = WTD.REF_ID AND WTD.PTCN = ? ";
+			pstmt = conn.prepareStatement(sql1);
+			pstmt.setString(1, key);			
+			rs = pstmt.executeQuery();
+		    if( rs.next())
+			{
+			   servicceCode = rs.getString("SERVICE_CODE");
+			}
+			if( pstmt != null )
+			{
+				pstmt.close(); 
+				pstmt = null;
+			}
+			if( rs != null )
+			{
+				rs.close(); 
+				rs = null;
+			}
+
+			System.out.println(" SERVICCECODE:"+servicceCode);
+
+		}
+		catch(Exception e)
+		{
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try 
+			{
+				if( rs != null)
+				{
+					rs.close(); 
+					rs = null;
+				}
+				if( pstmt != null)
+				{
+					pstmt.close(); 
+					pstmt = null;
+				}
+			}
+			catch( Exception es)
+			{
+				es.printStackTrace();
+				throw new ITMException(es);
+			}
+		}
+		return servicceCode;
+	}
+	//changed by sankara on 10/04/13 for getting service code end.
 	
 }

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

@@ -6782,7 +6782,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						if (errString == null || errString.trim().length() == 0)
 						{
 							String dspRefId = updateWaveTaskDet(waveId,4,saleOrder,"","",ptcnID,conn);
-							errString = updateShipment(headerDom, detailDom,waveId,saleOrder,dspRefId,tranCode,transMode, xtraParams, conn);
+							errString = updateShipment(headerDom, detailDom,waveId,ptcnID,saleOrder,dspRefId,tranCode,transMode, xtraParams, conn);
 							
 						}
 						else
@@ -14029,8 +14029,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	}
 	//Changed by sumit sarkar on 28/08/2011 [ WM1ESUN006 ] update pack_hdr & pack_det table end.
 	
+	//Changed by Pragyan To add PTCN 09-OCT-13 
 	//Changed by sumit sarkar on 8/18/2011 [ WM1ESUN006 ] update despatch table start.
-	private String updateShipment(Document headerDom, Document detailDom,String waveID,String saleOrder,String refId,String tranCode,String transMode,String xtraParams,  Connection conn)throws Exception
+	//private String updateShipment(Document headerDom, Document detailDom,String waveID,String saleOrder,String refId,String tranCode,String transMode,String xtraParams,  Connection conn)throws Exception
+	private String updateShipment(Document headerDom, Document detailDom,String waveID,String PTCN,String saleOrder,String refId,String tranCode,String transMode,String xtraParams,  Connection conn)throws Exception
 	{
 			String errString = "";			
 			String insertSql = "";			
@@ -14169,8 +14171,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						+ " CUST_CODE, CUST_CODE__DLV, DLV_ADD1, DLV_ADD2, COUNT_CODE__DLV, "
 						+ " TRANS_MODE, STAN_CODE, CONFIRMED, STATUS, CHG_USER, CHG_DATE, CHG_TERM,"
 						+ " DLV_ADD3, STATE_CODE__DLV, EXCH_RATE, WAVE_ID, EFF_DATE, DLV_CITY, DLV_PIN, TRAN_CODE, "
-						+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO )"
-						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+						/*+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO )"
+						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";*/
+						+ " CURR_CODE__FRT, EXCH_RATE__FRT, FREIGHT, CURR_CODE__INS, EXCH_RATE__INS, INSURANCE, CURR_CODE,GP_NO,PTCN )"
+						+ " VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				//End changes by gulzar on 12/28/2011
 				
 				pstmt = conn.prepareStatement(insertSql);
@@ -14196,6 +14200,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				System.out.println("dlv add3 "+dlvAdd3);
 				System.out.println("state code dlv "+stateCodeDlv);
 				System.out.println("exch rate "+exchRate);
+				System.out.println("PTCN "+PTCN);
 				
 				pstmt.setString(1,refId);
 				pstmt.setTimestamp(2, currDate1);
@@ -14235,6 +14240,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmt.setString(32,currCode);
 				//Changed By Pragyan according to manohran sir as in future it will change .
 				pstmt.setString(33,"G");
+				pstmt.setString(34,PTCN);
 				//End changes by gulzar on 12/28/2011
 				
 				pstmt.executeUpdate();

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

@@ -42585,7 +42585,7 @@ VALUES (
 	NULL,
 	NULL);		
 	
-	CREATE OR REPLACE TRIGGER TRIG_WAVE_STAT_ORG
+CREATE OR REPLACE TRIGGER TRIG_WAVE_STAT_ORG
 AFTER UPDATE OF tran_code ON DESPATCH
 FOR EACH ROW WHEN (new.tran_code <> old.tran_code)
 BEGIN
@@ -44536,4 +44536,34 @@ VALUES (
 	'BASE  ',
 	NULL,
 	NULL);
+//chnged by Pragyan 09-OCT-13 to add ptcn in despatch detail	
+alter table despatch add ptcn char(10);
+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 (
+        'VTDIFFTRAN',
+        'Invalid PTCN',
+        'Cannot club multiple PTCN of different Transporters',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('9-10-2013 06:53:35','DD-MM-YYYY HH24:MI:SS'),
+        'TARO      ',
+        'jbnitashishm   ',
+        NULL,
+        NULL);
 commit;
\ No newline at end of file