changed by sankara on 10/04/13 updated source and sql of ExpsttktransferPos and ShipmentConf

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

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

@@ -16,6 +16,7 @@ import ibase.webitm.ejb.dis.adv.InvHoldRelConf;
 import ibase.webitm.ejb.dis.InvAllocTraceBean;
 import ibase.webitm.ejb.dis.DistStkUpdLocal;
 //Changed by sumit on 10/09/12 import  StockTransferPos to call stock_allocation.
+import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.dis.StockTransferPos;
 import ibase.webitm.ejb.dis.InvHoldGen;
 import ibase.webitm.ejb.dis.StockUpdate;
@@ -55,8 +56,10 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 		String tranIdHold = "";
 		String lineNoHold = "";
 		String lockCode = "";
-		
+		String trfNexpLock = "",trfExprLock = "",nearExpInv = "",expInv = "";
+		String locCodeTo = "",invStatLoc = "",sqlInv = "";
 		ArrayList stockList = new ArrayList();
+		ArrayList stockNormList = new ArrayList();
 		//ArrayList<String> tranIdRel = new ArrayList<String>();
 		String tranIdRel = "";
 		
@@ -76,6 +79,9 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
         StockTransferConf stkTrnsConf = new StockTransferConf();
         StockTransferPos stockTransferPos = new StockTransferPos();
         InvHoldGen holdGen =  new InvHoldGen();
+        DistCommon distCommon = new DistCommon();
+        Exception unChkException = null;
+        
 		try
 		{
 			//conn.setAutoCommit(false);
@@ -96,6 +102,10 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 			int parentNodeListLength ;
 			int detLine = 0;
 			
+			trfNexpLock = checkNull(distCommon.getDisparams("999999","TRANSFERED_NEXP_LOCK",conn));
+			trfExprLock = checkNull(distCommon.getDisparams("999999","TRANSFERED_EXPR_LOCK",conn));
+			nearExpInv = checkNull(distCommon.getDisparams("999999","NEXPR_INVSTAT",conn));
+			expInv = checkNull(distCommon.getDisparams("999999","EXPR_INVSTAT",conn));
 			
 			parentNodeList = dom.getElementsByTagName("Detail1");
 			parentNodeListLength = parentNodeList.getLength();
@@ -146,14 +156,44 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 				lotNo = "";
 				lotSl = "";*/
 	        	//Changed by sumit in 01/10/12 getting detail start
+	        	locCodeTo = GenericUtility.getInstance().getColumnValueFromNode("loc_code__to", dom.getElementsByTagName("Detail3").item(row));
+	        	sqlInv = "SELECT INV_STAT FROM LOCATION WHERE LOC_CODE = ?";
+				pstmt = conn.prepareStatement( sqlInv );
+				pstmt.setString( 1, locCodeTo );
+				rs = pstmt.executeQuery();
+				
+				if( rs.next() )       
+				{
+					invStatLoc = checkNull(rs.getString("INV_STAT"));	
+				}
+				
+				if(pstmt != null)
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+				
+				if(rs != null)
+				{
+					rs.close();
+					rs = null;
+				}
 				
 	        	HashMap dataMap = new HashMap();
 	        	dataMap.put("item_code",GenericUtility.getInstance().getColumnValueFromNode("item_code", dom.getElementsByTagName("Detail3").item(row)));
 	        	dataMap.put("site_code",siteCode);
-	        	dataMap.put("loc_code",GenericUtility.getInstance().getColumnValueFromNode("loc_code__to", dom.getElementsByTagName("Detail3").item(row)));
+	        	dataMap.put("loc_code",locCodeTo);
 	        	dataMap.put("lot_sl",GenericUtility.getInstance().getColumnValueFromNode("lot_sl__to", dom.getElementsByTagName("Detail3").item(row)));
 	        	dataMap.put("lot_no",GenericUtility.getInstance().getColumnValueFromNode("lot_no__to", dom.getElementsByTagName("Detail3").item(row)));
+	        	
+	        	if(nearExpInv.trim().equalsIgnoreCase(invStatLoc.trim()) || expInv.trim().equalsIgnoreCase(invStatLoc.trim()))
+	        	{
 	        		stockList.add(dataMap);
+	        	}
+	        	else
+	        	{
+	        		stockNormList.add(dataMap);
+	        	}
 	        	//Changed by sumit in 08/09/12 getting detail end
 	        	
 	        	pstmtDet = conn.prepareStatement(sqlDet);
@@ -199,6 +239,16 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 		        {*/        
 		        	errString = stkTrnsConf.confirm(tranId,xtraParams,"F",conn,false );
 		       // }       
+		        //Changed by Sankar on 04/10/13 insert new hold start.
+	        	if( "NEXP_LOCK".equalsIgnoreCase(lockCode) && stockNormList.size() > 0 )
+				{
+					holdGen.generateHoldTrans( trfNexpLock, tranIdHold,"NEXP", siteCode, stockNormList, xtraParams, conn );
+				}
+				else if( "EXP_LOCK".equalsIgnoreCase(lockCode) && stockNormList.size() > 0 )
+				{
+					holdGen.generateHoldTrans( trfExprLock, tranIdHold,"EXP", siteCode, stockNormList, xtraParams, conn );
+				}
+	        	//Changed by Sankar on 04/10/13 insert new hold end.
 	        	
 		        //Changed by sumit on 01/10/12 insert new hold start.
 	        	if( "NEXP_LOCK".equalsIgnoreCase(lockCode) && stockList.size() > 0 )
@@ -225,7 +275,8 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 			}
 			catch (Exception e1)
 			{
-				
+				unChkException = e;
+				throw new ITMException(e);
 			}
 		}
 		finally
@@ -249,6 +300,12 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 					pstmt = null;
 				}
 				
+				if(isError)
+				{
+					
+					throw new ITMException(unChkException);
+				}
+				
 			}
 			catch(Exception e)
 			{
@@ -632,5 +689,13 @@ public class ExpStkTransferPos extends ValidatorEJB implements ExpStkTransferPos
 		}
         return tranId;
      }//generateTranTd()	
+	private String checkNull( String inputVal )
+	{
+		if ( inputVal == null )
+		{
+			inputVal = "";
+		}
+		return inputVal;
+	}
 }
 

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

@@ -156,7 +156,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 		ResultSet rs2 = null,rsSet = null;
 		ResultSet rs3 = null;
 		boolean isAllDespConfirmed = false;
-		
+		//changed by sumitp on 10/03/13 for declare varibles start.
+		String taroShipName= "";
+		String shipTypeName= "";
+		//changed by sumitp on 10/03/13 for declare varibles end.
 		try
 		{
 			conn = connDriver.getConnectDB( "DriverITM" );
@@ -440,6 +443,10 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 										System.out.println("Enetr in manual Shipment whit shipment ID"+tranId);
 										adsiShippingURL = discommon.getDisparams("999999","WMS_ADSI_SOAP_URL",conn);
 										defPh = discommon.getDisparams("999999","SHIPPER_DEFAULT_PH",conn);
+										//changed by sumitp shipment type getting from Dispram Table on 10/03/2013 start.
+										taroShipName = discommon.getDisparams("999999","TARO_SHIPPER_NAME",conn);
+										System.out.println("TARO_SHIPPER_NAME" + taroShipName);
+										//changed by sumitp shipment type getting from Dispram Table on 10/03/2013 end.
 										com.adsionline.ADSIShippingWS.Service service = new com.adsionline.ADSIShippingWS.Service();
 										NameValuePair[] additionalFields = new NameValuePair[1];
 										Package2[] packgeList = null;
@@ -510,8 +517,11 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 								    			}
 								    			
 								    			recipient.setCity(shipCity);//Customer Adress City
-								    			sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T  WHERE  T.TRAN_CODE = S.TRAN_CODE AND" 
-								    				 +" S.SHIPMENT_ID = ? ";	
+								    			//changed by sumitp getting shipment type from transporter on 10/03/13
+								    			/*sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T  WHERE  T.TRAN_CODE = S.TRAN_CODE AND" 
+								    				 +" S.SHIPMENT_ID = ? ";	*/
+								    			sql = " SELECT T.SERVICE_CODE, S.PACK_SIZE, T.SHIPMENT_TYPE FROM SHIPMENT S, TRANSPORTER T  WHERE " +
+									    			  " T.TRAN_CODE = S.TRAN_CODE AND S.SHIPMENT_ID = ? ";	
 								    			pstmt = conn.prepareStatement(sql);
 												pstmt.setString(1, tranId);
 												rs = pstmt.executeQuery();
@@ -519,6 +529,8 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 												{
 													serviceCode = checkNull(rs.getString("SERVICE_CODE"));
 													dimensionDouble = rs.getDouble("PACK_SIZE");
+													//changed by sumitp getting shipment type from transporter on 10/03/13
+													shipTypeName = checkNull(rs.getString("SHIPMENT_TYPE"));
 												}
 														
 												pstmt.close();
@@ -579,10 +591,25 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 								        		shipment2.setShipperReference(tranId);
 								        		//shipment2.setConsigneeReference(custPord);//As per Taro it is sorder.cust_pord
 								        		shipment2.setConsigneeReference(refId);//As per Taro it is sorder.cust_pord
-								        		shipment2.setShipperName("Taro Fulfillment");//Needs to change after clarity
+								        		//changed by sumitp on 03/10/13 getting value from disparm
+								        		//shipment2.setShipperName("Taro Fulfillment");//Needs to change after clarity
 								        		shipment2.setTimeInTransit(EnumTimeInTransit.tntFOREVER);//As per taro its tntFOREVER
 								        		shipment2.setSaturdayDeliveryFlag(false);//Need to discuss with Taro
-								        		
+								        		//chnaged by sumitp on 10/03/13 for checking shipment type start. 
+								        		System.out.println("taroShipNamefromdisparm:"+taroShipName);
+								        		System.out.println("shipTypeName:"+shipTypeName);
+								        		//changed by sankara on 10/04/13 shipment type compare using equalsIgnore case 
+								        		//if(taroShipName != null && shipTypeName != null && taroShipName == shipTypeName)
+								        		if( taroShipName != null && shipTypeName != null && taroShipName.trim().equalsIgnoreCase( shipTypeName.trim() ) ) 
+								        		{
+													shipment2.setShipperName(taroShipName);
+												}
+												else
+												{
+													errString = itmDBAccessLocal.getErrorString("","VTINVSHTYN","");
+													return errString;
+												}
+								        		//chnaged by sumitp on 10/03/13 for checking shipment type end. 
 								        		sqlNoPkg = "SELECT COUNT(*) AS NO_OF_PKG FROM SHIPMENT_CONTENT WHERE SHIPMENT_ID = ? ";
 								        		pstmt2 = conn.prepareStatement(sqlNoPkg);
 								        		pstmt2.setString(1, tranId);

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

@@ -44444,3 +44444,96 @@ VALUES (
 	NULL,
 	NULL);
 commit;
+--changed by sankara on 04/10/13 update disparm and messages sql of shipment type
+INSERT INTO disparm(
+	prd_code ,
+	var_name ,
+	var_type ,
+	var_value ,
+	descr ,
+	var_subs ,
+	chg_date ,
+	chg_user ,
+	chg_term )
+ VALUES (
+     '999999',
+     'TRANSFERED_NEXP_LOCK',
+     'S',
+     'NE_LOCK',
+     'Transfered Short Expiry Items ',
+     NULL,
+     fn_sysdate(),
+     'TARO ',
+     'jbnitashishm');
+	 
+INSERT INTO disparm(
+	prd_code ,
+	var_name ,
+	var_type ,
+	var_value ,
+	descr ,
+	var_subs ,
+	chg_date ,
+	chg_user ,
+	chg_term )
+ VALUES (
+    '999999',
+    'TRANSFERED_EXPR_LOCK',
+    'S',
+    'EX_LOCK',
+    'Transfered Locks for Expired Items',
+    NULL,
+    fn_sysdate(),
+    'TARO ',
+    'jbnitashishm ');
+
+INSERT INTO disparm(
+	prd_code ,
+	var_name ,
+	var_type ,
+	var_value ,
+	descr ,
+	var_subs ,
+	chg_date ,
+	chg_user ,
+	chg_term )
+ VALUES (
+	'999999',
+	'TARO_SHIPPER_NAME',
+	'S',
+	'Taro Commercial',
+	'Shipment Type',
+	NULL,
+	fn_sysdate(),
+	'Base',
+	'Base');
+
+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 (
+	'VTINVSHTYN',
+	'Shipment Type Mismatch',
+	'Shipment Type Mismatched Please Check Shipment Type',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'BASE  ',
+	'BASE  ',
+	NULL,
+	NULL);
+commit;
\ No newline at end of file