changed by sankara on 12/02/2014 updated...

changed by sankara on 12/02/2014 updated wavegeneprc,shipmentconf,masterpackpos,deallocartconf,shipmentprc and wavegen11 srd metadata


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

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

@@ -645,7 +645,14 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 			}
 			//Changed by sumit on 04/06/13 closing prepared statement end
 			System.out.println("ret string :"+errString);
-			
+			//changed by sankara on 04/02/14 update carton_master status from pick deallocation start.
+			int updatecount =  updateCartonMasterstatus(ptcn, conn);
+			System.out.println("updatecount::::"+updatecount);
+			if( updatecount > 0 )
+			{
+				System.out.println("update status in carton_master sucessfully");
+			}
+			//changed by sankara on 04/02/14 update carton_master status from pick deallocation end.
 		}
 		catch(Exception e)
 		{
@@ -3679,4 +3686,97 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 		}
 		return errString;
 	}
+	//changed by sankara on 04/02/14 update carton_master status from pick deallocation start.
+	private int updateCartonMasterstatus(String ptcn,Connection conn) throws ITMException
+	{
+		String sql = "";
+		String sql1 = "";
+		PreparedStatement pstmt = null,pstmt1 = null;
+		ResultSet rs = null,rs1 = null;
+		String masterCarton = "";
+		String errString = "";
+		int update = 0;
+		int count = 0;
+		System.out.println("hai");
+		try
+		{
+			
+			sql = " SELECT DISTINCT A.MASTER_CARTON FROM CARTON_MASTER A, PACK_HDR P WHERE P.PTCN = A.PTCN AND A.PTCN = ? " +
+				  "	AND A.CARTON_TYPE = 'M' AND P.CONFIRMED = 'Y' AND A.STATUS = 'U' ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, ptcn);
+			rs = pstmt.executeQuery();
+			while(rs.next())
+			{
+				masterCarton = rs.getString(1);		
+				System.out.println("masterCarton:::::"+masterCarton);
+				sql1 = " SELECT COUNT(*) AS COUNT FROM CARTON_MASTER WHERE MASTER_CARTON = ? AND CARTON_TYPE = 'C' AND STATUS = 'U' ";
+				pstmt1 = conn.prepareStatement(sql1);
+				pstmt1.setString(1, masterCarton);
+				rs1 = pstmt1.executeQuery();
+				if(rs1.next())
+				{
+					count = rs1.getInt("COUNT"); 
+					System.out.println("count::::::"+count);
+					if(count == 0 )
+					{
+						System.out.println("inside count block");
+						sql1 = " UPDATE CARTON_MASTER SET STATUS = 'R' WHERE CARTON_NO = ? AND REF_SER = 'M-PACK' ";
+						pstmt1 = conn.prepareStatement(sql1);
+						pstmt1.setString(1,masterCarton);
+						update = pstmt1.executeUpdate();	
+						if( update > 0)
+						{
+							System.out.println(update+" column of carton_master is successfuly ");
+						}		
+					}
+				}
+				rs1.close();
+				rs1 = null;
+				pstmt1.close(); 
+				pstmt1 = null;
+			}
+			rs.close();
+			rs = null;
+			pstmt.close(); 
+			pstmt = null;      
+		}	
+		catch(Exception e)
+		{
+			e.printStackTrace();
+			errString = e.getMessage();
+			throw new ITMException(e);
+
+		}
+		finally
+		{
+			try
+			{
+				if( rs != null )
+				{
+					rs.close(); rs = null;						
+				}
+				if( rs1 != null )
+				{
+					rs1.close(); rs1 = null;						
+				}
+				if( pstmt != null )
+				{					
+					pstmt.close(); pstmt = null;	
+				}
+				if( pstmt1 != null )
+				{					
+					pstmt1.close(); pstmt1 = null;	
+				}
+			}
+			catch( Exception ex)
+			{				
+				ex.printStackTrace();
+				errString = ex.getMessage();
+				throw new ITMException(ex);
+			}
+		}
+		return update;
+	}
+	//changed by sankara on 04/02/14 update carton_master status from pick deallocation end.
 }

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

@@ -57,6 +57,8 @@ public class MasterPackPos extends ValidatorEJB implements MasterPackPosRemote,
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		ITMDBAccessEJB itmDBAccessLocal = new ITMDBAccessEJB();
 		PackingConf packingConf = new PackingConf();
+		//changed by sankara on 04/02/14 for update status in carton_master
+		String status = "";
 		try
 		{
 			dom = genericUtility.parseString(domString);
@@ -257,10 +259,37 @@ public class MasterPackPos extends ValidatorEJB implements MasterPackPosRemote,
 							System.out.println("Outer Carton["+outerCarton+"]");
 							//Changed by sumit on 13/03/13 changing sql adding status condition
 							//sql = "UPDATE CARTON_MASTER SET STATUS = ?,MASTER_CARTON = ? WHERE CARTON_NO = ? ";
-							sql1 = "UPDATE CARTON_MASTER SET STATUS = 'U' WHERE CARTON_NO = ? AND STATUS <> 'R'";
+							//changed by sankara on 04/02/14 update status in carton_master start.
+							/*sql1 = "UPDATE CARTON_MASTER SET STATUS = 'U' WHERE CARTON_NO = ? AND STATUS <> 'R'";
 							pstmt1 = conn.prepareStatement(sql1);
 							pstmt1.setString(1,outerCarton);
+							pstmt1.executeUpdate();	*/
+							sql1 = " SELECT COUNT(*) AS COUNT FROM CARTON_MASTER WHERE MASTER_CARTON = ? AND CARTON_TYPE = 'C' AND STATUS IN ('A','U') ";
+							pstmt1 = conn.prepareStatement(sql1);
+							pstmt1.setString(1, outerCarton);
+							rs1 = pstmt1.executeQuery();
+							if(rs1.next())
+							{
+								count = rs1.getInt("COUNT"); 
+								System.out.println("count::::::"+count);
+							}
+							rs1.close();rs1 = null;
+							pstmt1.close(); pstmt1 = null;
+
+							if(count == 0)
+							{
+								status = "R";
+							}
+							if(count > 0)
+							{
+								status = "U";
+							}
+							sql1 = " UPDATE CARTON_MASTER SET STATUS = ? WHERE CARTON_NO = ? AND STATUS <> 'R' ";
+							pstmt1 = conn.prepareStatement(sql1);
+							pstmt1.setString(1,status);
+							pstmt1.setString(2,outerCarton);
 							pstmt1.executeUpdate();	
+							//changed by sankara on 04/02/14 update status in carton_master end.
 						}
 						rs.close();
 						rs = null;

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

@@ -57,6 +57,7 @@ import sun.misc.BASE64Decoder;
 import com.adsionline.ADSIShippingWS.ADSIShippingLocator;
 import com.adsionline.ADSIShippingWS.ADSIShippingSoap;
 import com.adsionline.ADSIShippingWS.Address;
+import com.adsionline.ADSIShippingWS.Carrier;
 import com.adsionline.ADSIShippingWS.CommodityInfo;
 import com.adsionline.ADSIShippingWS.Country;
 import com.adsionline.ADSIShippingWS.EnumManifestAction;
@@ -783,7 +784,28 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 													double msnNo=0.0;
 													String imagePath =null;
 													imagePath = discommon.getDisparams("999999","SHIP_WITH_PATH",conn);
-													
+													//changed by sankara on 04/02/14 for gwetting carrier symbol and varrier friendly name from adsi start.
+													String carrierFriendlyName = "";
+													String serviceSymbol = objShipResult.getServiceSymbol();
+													System.out.println("serviceSymbol["+serviceSymbol+"]");
+													String carrierSymbol = serviceSymbol.substring(0,serviceSymbol.lastIndexOf(".") );
+													System.out.println("Carrier Symbol ["+carrierSymbol+"]");
+													Carrier[] carr = soap.getCarriers().getCarrierList();
+													for(int j = 0;j<carr.length;j++)
+													{
+														Carrier carr1 = carr[j];
+														System.out.println("Carrier Symbol["+carr1.getSymbol());
+														System.out.println("Friendly Name["+carr1.getFriendlyName());
+														System.out.println("Short Name["+carr1.getShortName());
+
+														if(carr1.getSymbol().equalsIgnoreCase(carrierSymbol))
+														{
+															carrierFriendlyName = carr1.getFriendlyName();
+															break;
+														}								
+													}
+													System.out.println("Carrier friwndley ["+carrierFriendlyName+"]");
+													//changed by sankara on 04/02/14 for gwetting carrier symbol and varrier friendly name from adsi ned.
 													for(int pCtr = 0;pCtr < lenPacakges;pCtr++)
 													{
 														PackageResult2 pkg2frm =  (PackageResult2)objShipResult.getPackageResults2()[pCtr];	
@@ -818,14 +840,21 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
 														{
 															createFolder.mkdirs();
 														}
-														
-														sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ?  , SHIP_LABEL= ? , MSN_NO = ? ,STATUS = 'U' "
-																+ " WHERE CARTON_NO = ?";		
+														//changed by sankara on 04/02/14 for gwetting carrier symbol and varrier friendly name from adsi
+														/*sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ?  , SHIP_LABEL= ? , MSN_NO = ? ,STATUS = 'U' "
+																+ " WHERE CARTON_NO = ?";	*/	
+														sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ?  , SHIP_LABEL= ? , MSN_NO = ? ,STATUS = 'U', CARRIER_SYMBOL = ?, " +
+															  "CARRIER_FRIENDLYNAME = ? WHERE CARTON_NO = ? ";		
 														pstmt = conn.prepareStatement(sql);
 														pstmt.setString(1, trackNo);
 														pstmt.setString(2, path );
 														pstmt.setDouble(3, msnNo);
-														pstmt.setString(4, cartonNo);
+														//changed by sankara on 04/02/14 for gwetting carrier symbol and varrier friendly name from adsi start.
+														//pstmt.setString(4, cartonNo);
+														pstmt.setString(4, carrierSymbol);
+														pstmt.setString(5, carrierFriendlyName);
+														pstmt.setString(6, cartonNo);
+														//changed by sankara on 04/02/14 for gwetting carrier symbol and varrier friendly name from adsi ned.
 														System.out.println("carton number in for loop: "+cartonNo);
 														System.out.println("msn no for pkg result is :" +msnNo);
 														int updateCnt = pstmt.executeUpdate();

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

@@ -303,7 +303,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		String sqlFnManual = "",sqlTotHoldQty = "",sqlManQty = "";
 		PreparedStatement pstmt1 = null,pstmtManul = null,pstmtHold = null,pstmtManQty = null;
 		ResultSet rs2 = null,rsMan = null,rsHld = null,rsM = null;
-
+		//changed by sankara on 04/02/14 getting order type
+	    String saleOrdertype = "";
 		 retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
 		 		                             "<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n");
 		 
@@ -470,6 +471,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			printer = "";
 			printer = checkNull(genericUtility.getColumnValue("printer_name",headerDom));
 			printLabel = genericUtility.getColumnValue("print_label",headerDom);
+			//changed by sankara on 04/02/14 for getting sale order type
+			saleOrdertype = genericUtility.getColumnValue("order_type",headerDom);
+			System.out.println("saleOrdertype:::"+saleOrdertype);
 			
 			getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
 				       +"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
@@ -519,10 +523,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					   +" AND ((FN_GET_CONV_QTY(SORDER.SALE_ORDER, SORDDET.LINE_NO) > 0 ) "
 					   //FN_GET_CONV_QTY(SORDER.SALE_ORDER, SORDDET.LINE_NO)
 					   +" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"				   
-					   +" AND SORDITEM.LINE_TYPE = 'I'"
-					   +" ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD"; 
-
-			
+					   +" AND SORDITEM.LINE_TYPE = 'I'";
+					   //changed by sankara on 04/02/14 for getting sale order type start.
+					   //+" ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD"; 
+					   if( saleOrdertype != null && saleOrdertype.trim().length() > 0 )
+					   {
+						   System.out.println("ordtypeGetData::::::::"+saleOrdertype);
+						   getDataSql = getDataSql + " AND TRIM ( SORDER.ORDER_TYPE ) = ? ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+					   }
+					   else
+					   {
+						   System.out.println("no sale order type");
+						   getDataSql = getDataSql + " ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+					   }
+			          //changed by sankara on 04/02/14 for getting sale order type end.
 				resrvLoc  = discommon.getDisparams("999999","RESERV_LOCATION",conn);         
 				casePickLoc  = discommon.getDisparams("999999","CASE_PICK_INVSTAT",conn);
 				activePickLoc  = discommon.getDisparams("999999","ACTIVE_PICK_INVSTAT",conn);
@@ -547,6 +561,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				pstmt.setString(11,saleOrderTo);
 				pstmt.setTimestamp(12,dateFr);
 				pstmt.setTimestamp(13,dateTo);
+				//changed by sankara on 04/02/14 for getting sale order type start.
+				if( saleOrdertype != null && saleOrdertype.trim().length() > 0 )
+				{
+					System.out.println("ordtypeGetData::::::::"+saleOrdertype);
+					pstmt.setString(14,saleOrdertype);
+				}
+				//changed by sankara on 04/02/14 for getting sale order type end.
 				st = conn.createStatement();
 				rs = pstmt.executeQuery();
 
@@ -6591,11 +6612,31 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					String shipCons = (String)sorderConsigMap.get(sorderKey);
 					ArrayList dataList = (ArrayList)custConsigMap.get(shipCons);
 					int dataListlen = dataList.size();
+					double currentCaseCount = 0.0;
+					double currentCaseWeight = 0.0;
+					double currentActWeight = 0.0;
+					double currentCaseVolume = 0.0;
+					double currentActVolume = 0.0;
+					String tmpSorder = "";
 					
 					for(int cCgt = 0;cCgt < dataListlen;cCgt++)
 					{
 						HashMap sordMap = (HashMap)dataList.get(cCgt);
 						
+						System.out.println("Current Sord Map"+sordMap.toString()+"]sorder["+saleOrder+"]Case Count["+(Double)sordMap.get("no_art_order")+"]");
+						
+						tmpSorder = (String)sordMap.get("sale_order");
+						tmpSorder = tmpSorder.substring(0,tmpSorder.indexOf(":"));
+						System.out.println("Current Temp Order "+tmpSorder+"]");
+						if(saleOrder.equalsIgnoreCase(tmpSorder))
+						{
+							currentCaseCount = (Double)sordMap.get("no_art_order");
+							currentCaseWeight = (Double)sordMap.get("tot_case_weight");
+							currentActWeight = (Double)sordMap.get("tot_act_weight");
+							currentCaseVolume =(Double)sordMap.get("tot_case_volume");
+							currentActVolume = (Double)sordMap.get("tot_act_volume");
+						}
+						
 						System.out.println("totalWeightCurrentshipment BEFORE"+totalWeightCurrentshipment+"]");
 						System.out.println("totCaseVolume BEFORE"+totCaseVolume+"]");
 						System.out.println("totActVolume BEFORE"+totActVolume+"]");
@@ -6703,8 +6744,51 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					
 					if(transPorterInfoMap != null & transPorterInfoMap.size() > 0)
 					{
-						tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
-						transMode = (String)transPorterInfoMap.get("TRANS_MODE");
+						
+						
+						if("M".equalsIgnoreCase((String)transPorterInfoMap.get("SHIP_TYPE")) && currentCaseCount < 2 )
+						{
+							System.out.println("totalWeightCurrentshipment AFTER currentCaseWeight"+(currentCaseWeight + currentActWeight)+"]");
+							System.out.println("currentCaseVolume AFTER"+currentCaseVolume+"]");
+							System.out.println("currentCaseWeight AFTER"+currentCaseWeight+"]");
+							System.out.println("currentActVolume AFTER"+currentActVolume+"]");
+							System.out.println("currentActWeight AFTER"+currentActWeight+"]");
+							System.out.println("currentCaseCount AFTER"+currentCaseCount+"]");			
+							
+							if("M".equalsIgnoreCase(shipType))
+							{
+								shipType = "P";
+							}
+														
+							transPorterInfoMap = getTransporterInfoMap(saleOrder,(currentCaseWeight + currentActWeight),currentCaseCount,"P",shipType, conn);
+							
+							if(transPorterInfoMap != null & transPorterInfoMap.size() > 0)
+							{
+								tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
+								transMode = (String)transPorterInfoMap.get("TRANS_MODE");
+								
+								System.out.println("current transPorter Now AFTER"+tranCode+"]Ship type["+(String)transPorterInfoMap.get("SHIP_TYPE")+"]");	
+								totalWeightCurrentshipment = (currentCaseWeight + currentActWeight);
+								totActVolume = currentActVolume;
+								totCaseVolume = currentCaseVolume;
+								totCaseWeight = currentCaseWeight;
+								totActWeight =currentActWeight;
+								totCaseCount = currentCaseCount;
+								
+							}
+							else
+							{
+								tranCode = "";
+								transMode = "";
+							}
+						}
+						else
+						{
+							tranCode = (String)transPorterInfoMap.get("TRAN_CODE");
+							transMode = (String)transPorterInfoMap.get("TRANS_MODE");
+						}
+
+						
 					}
 					else
 					{
@@ -14600,6 +14684,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			xmlValues = xmlValues +		"<site_code>" + siteCode + "</site_code>";
 			xmlValues = xmlValues +		"<desp_date>" + currDateStr + "</desp_date>"; 
 			xmlValues = xmlValues +		"<tran_date>" + currDateStr + "</tran_date>"; 
+			xmlValues = xmlValues +		"<order_date>" + currDateStr + "</order_date>";
 			xmlValues = xmlValues + "</Detail1></Root>";
 			System.out.println("xmlValues  :["+xmlValues+"]");
 			TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);