changes related to firmplan in PalletOutPos and new stock button required in PhysicalCountAct

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

changes related to firmplan in PalletOutPos and new stock button required in PhysicalCountAct
git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104357 ce508802-f39f-4f6c-b175-0d175dae99d5
64822e13 · tmahadi · 855b88b0 · 64822e13 · 64822e13 · 64822e13
Commit 64822e13 authored Jan 10, 2017 by tmahadi
4 changed files
--- a/webitm-wms/ibase/webitm/ejb/wms/PalletOutPos.java
+++ b/webitm-wms/ibase/webitm/ejb/wms/PalletOutPos.java
@@ -9,26 +9,21 @@ package ibase.webitm.ejb.wms;
 import ibase.system.config.AppConnectParm;
 import ibase.system.config.ConnDriver;
 import ibase.utility.CommonConstants;
+import ibase.utility.E12GenericUtility;
+import ibase.utility.UserInfoBean;
+import ibase.webitm.ejb.EventManagerLocal;
 import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.MasterStatefulLocal;
 import ibase.webitm.ejb.ValidatorEJB;
 import ibase.webitm.ejb.dis.CreateDistOrder;
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.dis.DistStkUpdLocal;
-import ibase.webitm.ejb.dis.adv.InvHoldConf;
 import ibase.webitm.ejb.dis.adv.StockTransferConf;
-import ibase.utility.E12GenericUtility;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.TransIDGenerator;
-import ibase.webitm.utility.wms.CommonWmsUtil;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.rmi.RemoteException;
 import java.sql.Connection;
-import java.util.Date;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -39,13 +34,9 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.logging.FileHandler;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
 import javax.naming.InitialContext;
@@ -64,18 +55,16 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 	{
 		return "";
 	}
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public String postSave( String domString, String tranId, String editFlag, String xtraParams, Connection conn1 ) throws RemoteException, ITMException
 	{
-		ResultSet rs = null,rsInf = null,rsBay = null;
+		ResultSet rs = null,rsBay = null;
-		PreparedStatement pstmt = null, interfacePstmt = null,pstmtUpdate = null,pstmtBay = null;	
+		PreparedStatement pstmt = null, pstmtUpdate = null,pstmtBay = null;	
-		String errString = "", sql = "",inOut = "",refSer = "",refId = "",palletRej = "",sqlInf = "",sqlUpdate = "";
+		String errString = "", sql = "",inOut = "",refSer = "",refId = "";
 		boolean isScheduleReq = true,isError = false;
-		int flag,countError;
+		String locCodeInput = "",locCodeSugg = "",siteCode = "",palleNoInterface = "",bayNo = "";
-		String lineNo = "",palletNo = "",locCodeInput = "",locCodeSugg = "",siteCode = "",palleNoInterface = "",bayNo = "";
-		int caseCount = 0;
 		Connection conn = null;
-		//Commented by Santosh on 14-06-2016
+		ConnDriver connDriver = new ConnDriver(); 
-		//ConnDriver connDriver = new ConnDriver(); 
 		Document dom = null;
 		try
@@ -85,11 +74,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			System.out.println("XML String="+domString);
 			System.out.println("Connection not found from Framework so creating new");
-			//Changed and Commented By Santosh on 14-06-2016 :[START]
+			conn = connDriver.getConnectDB("DriverITM");
-			//conn = connDriver.getConnectDB("DriverITM");
+			connDriver = null;
-			conn = getConnection();
-			//connDriver = null;
-			//Changed and Commented By Santosh on 14-06-2016 :[END]
 			conn.setAutoCommit(false);
 			siteCode = checkNullAndTrim((genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode")));
@@ -219,23 +205,23 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		return errString;
 	}	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private String stockTransfer(HashMap interfaceMap,String xtraParams,Connection conn) throws SQLException, ITMException
 	{
-		PreparedStatement pstmt=null, pstmtHdr = null, pstmtDet = null,pstmtInterface = null,pstmtUpdate = null,pstmtDso = null,pstmtQc = null;
+		PreparedStatement pstmt=null, pstmtHdr = null, pstmtDet = null,pstmtInterface = null,pstmtUpdate = null,pstmtDso = null;
-		ResultSet rs = null,rsInterface = null,rsDso = null,rsQc = null;
+		ResultSet rs = null,rsInterface = null,rsDso = null;
-		String sql = "",insertSql = "",tranID = "",loginSiteCode = "",userId = "",errString = "",sqlInterface = "",sqlUpdate = "",sqlDso = "",
+		String sql = "",insertSql = "",tranID = "",userId = "",errString = "",sqlInterface = "",sqlUpdate = "",sqlDso = "",
-				sqlQc = "",locCodeQuarnt = "",chgTerm = "",bayNo = "";
+				chgTerm = "",bayNo = "", lotSlPallet = "", lotNoPallet = "";
-		String refSer = "",refId = "",itemCode = "",lotNo = "",lotSl = "",acctCodeInv = "",cctrCodeInv = "",noArt = "",
+		String refSer = "",refId = "",itemCode = "",lotNo = "",lotSl = "",acctCodeInv = "",cctrCodeInv = "",noArt = "",lineNoNew = "",
-				palletNo = "",locCodeTo = "",locCodeFrom = "",siteCode = "",lineNoInterface = "",qcOrderStatus = "",locCodeReturn = "";
+				palletNo = "",locCodeTo = "",locCodeFrom = "",siteCode = "",lineNoInterface = "", lotNoFirst = "", lotSlFirst = "";
 		double quantity = 0,allocQty = 0,distOrderAlloc = 0,sordAllocQty = 0;
 		int updCnt = 0,lineNo = 0,countDso = 0;
 		//HashMap hashMap = new HashMap(); 
-		loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
 		userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 		chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
@@ -243,10 +229,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		DistStkUpdLocal distStkUpd = null;
 		ArrayList lineNoList = new ArrayList();
-		ArrayList tranIdList = new ArrayList();
 		ArrayList allocList = new ArrayList();
 		ArrayList locationList = new ArrayList();
-		ArrayList tranIdIssList = new ArrayList();
 		ArrayList DistStkList = new ArrayList();
 		ArrayList DespatchStkList = new ArrayList();
 		boolean isRecordExist = false;
@@ -267,6 +251,69 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			bayNo = (String) interfaceMap.get("BAY_NO");
 			//locCodeFrom = (String) interfaceMap.get("PALLET_NO");
+			System.out.println("bay no ::::" + bayNo);
+			sql = "select tran_id from distord_iss where dist_order = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, refId);
+			rs = pstmt.executeQuery();
+			if(rs.next()){
+				tranID = rs.getString("tran_id");
+			}
+			tranID = tranID == null ? "" : tranID.trim();
+			System.out.println("tran id::::" + tranID);
+			pstmt.close();
+			pstmt = null;
+			rs.close();
+			rs = null;
+			if(tranID.length() > 0){
+				sql = "SELECT DISTINCT (LINE_NO),PALLET_NO,lot_no,lot_sl FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT != 'P' AND BAY_NO = ?"
+					      +" AND PALLET_NO IN (SELECT PALLET_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')";
+			pstmtInterface = conn.prepareStatement(sql);
+			pstmtInterface.setString(1, refId);
+			pstmtInterface.setString(2, bayNo);
+			pstmtInterface.setString(3, refId);
+			rsInterface = pstmtInterface.executeQuery();
+			while(rsInterface.next())
+			{	
+				lineNoNew = checkNullAndTrim(rsInterface.getString("LINE_NO"));
+				palletNo = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
+				lotNoPallet = checkNullAndTrim(rsInterface.getString("lot_no"));
+				lotSlPallet = checkNullAndTrim(rsInterface.getString("lot_sl"));
+			}
+			pstmtInterface.close();
+			pstmtInterface = null;
+			rsInterface.close();
+			rsInterface = null;
+			System.out.println(" data when tran id is  present::line no [" + lineNoNew + "] pallet not ::: [" + palletNo + "] :: lot no [" +lotNoPallet + "] ::: lot sl Pallet::[" + lotSlPallet +"]");
+				sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ? AND PALLET_NO = ? and lot_no = ? and lot_sl = ?";
+				pstmtUpdate = conn.prepareStatement(sqlUpdate);
+				pstmtUpdate.setString(1, refId);
+				pstmtUpdate.setString(2, lineNoNew);
+				pstmtUpdate.setString(3, palletNo);
+				pstmtUpdate.setString(4, lotNoPallet);
+				pstmtUpdate.setString(5, lotSlPallet);
+				int caseCount = pstmtUpdate.executeUpdate();
+				System.out.println("Updated ="+caseCount);
+				pstmtUpdate.close();
+				pstmtUpdate = null;
+				errString = "Success";
+				return errString;
+			}
 			if("D-SO".equalsIgnoreCase(refSer))
 			{
 				sqlDso = "SELECT COUNT(*) AS COUNT FROM DISTORDER_ALLOC WHERE DIST_ORDER = ?";
@@ -281,6 +328,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				if(rsDso != null){rsDso.close();rsDso = null;}
 				System.out.println("Count DSO ="+countDso);
 				if(countDso == 0)
 				{
@@ -297,13 +346,14 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 							//+" H.SITE_CODE,H.TRAN_TYPE,DT.TAX_CLASS,DT.TAX_CHAP,DT.TAX_ENV,"//Changed site code ship on 15-07-2016
 							+" H.SITE_CODE__SHIP AS SITE_CODE,H.TRAN_TYPE,DT.TAX_CLASS,DT.TAX_CHAP,DT.TAX_ENV,"
 							+" S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.QUANTITY,S.ALLOC_QTY,S.EXP_DATE, S.UNIT,S.UNIT__ALT,S.ITEM_SER, S.MFG_DATE,S.NO_ART,"
-							+" S.POTENCY_PERC, S.PACK_CODE, S.LOC_CODE, S.BATCH_NO, S.GRADE , S.GROSS_WEIGHT, S.TARE_WEIGHT, "
+							+" S.POTENCY_PERC, S.PACK_CODE, S.LOC_CODE, S.BATCH_NO, S.GRADE , S.QTY_PER_ART,S.GROSS_WEIGHT, S.TARE_WEIGHT, "
 							+" S.NET_WEIGHT, S.DIMENSION, S.RETEST_DATE, S.SUPP_CODE__MFG, S.PACK_INSTR,S.RATE,"
 							+" S.ACCT_CODE__INV,S.CCTR_CODE__INV,DT.RATE__CLG,DT.QTY_CONFIRM,DT.QTY_SHIPPED "
 							+" FROM DISTORDER_ALLOC D,DISTORDER H,DISTORDER_DET DT,STOCK S "
 							//+" WHERE D.DIST_ORDER = ? AND D.LINE_NO = ? AND S.QUANTITY > 0 "
-							+" WHERE D.DIST_ORDER = ? AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0 "
+							+" WHERE D.DIST_ORDER = ? " 
-							+" AND D.DIST_ORDER = H.DIST_ORDER AND H.DIST_ORDER = DT.DIST_ORDER AND D.LINE_NO = DT.LINE_NO AND"
+							//"AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0  "
+							+ "AND D.DIST_ORDER = H.DIST_ORDER AND H.DIST_ORDER = DT.DIST_ORDER AND D.LINE_NO = DT.LINE_NO AND" 
 							+" D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE"
 							+" AND S.SITE_CODE = H.SITE_CODE__SHIP ";
 				}
@@ -350,7 +400,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			/*sqlInterface = "SELECT DISTINCT (LINE_NO),PALLET_NO FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT != 'P' AND PALLET_NO = ?"
 					+ " AND PALLET_NO IN (SELECT PALLET_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')";
 			*/
-			sqlInterface = "SELECT DISTINCT (LINE_NO),PALLET_NO FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT != 'P' AND BAY_NO = ?"
+			sqlInterface = "SELECT DISTINCT (LINE_NO),PALLET_NO,lot_no,lot_sl FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT != 'P' AND BAY_NO = ?"
 					      +" AND PALLET_NO IN (SELECT PALLET_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')";
 			pstmtInterface = conn.prepareStatement(sqlInterface);
 			pstmtInterface.setString(1, refId);
@@ -364,6 +414,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				locCodeFrom = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
 				palletNo = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
+				lotNoFirst = checkNullAndTrim(rsInterface.getString("lot_no"));
+				lotSlFirst = checkNullAndTrim(rsInterface.getString("lot_sl"));
 				if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no
 				{
@@ -375,7 +427,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				{
 					lineNoInterface = checkNullAndTrim(rsInterface.getString("LINE_NO"));
 				}
-				System.out.println("Line number is ["+lineNoInterface+"]Loc Code From ["+locCodeFrom+"]");
+				System.out.println("Line number first is ["+lineNoInterface+"]Loc Code From ["+locCodeFrom+"]::lot no [" + lotNoFirst +"]::lot sl ::[" + lotSlFirst + "]");
 				/*if(headerFlag)
 				{	
@@ -405,15 +457,16 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, refId);
 				//pstmt.setString(2, lineNoInterface);
-				if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
+				/*if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
 				{
 					pstmt.setString(2, locCodeFrom);
 					pstmt.setString(3, locCodeFrom+"X");
 					pstmt.setString(4, locCodeFrom+"B");
 					pstmt.setString(5, locCodeFrom+"P");
 					pstmt.setString(6, lineNoInterface);
-				}
+				}*/
-				else if("S-ORD".equalsIgnoreCase(refSer))
+				//else
+					if("S-ORD".equalsIgnoreCase(refSer))
 				{
 					pstmt.setString(2, locCodeFrom);
 					pstmt.setString(3, locCodeFrom+"X");
@@ -434,10 +487,10 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					pstmt.setString(9, locCodeFrom+"S");
 					pstmt.setString(10,locCodeFrom+"R");//Changed by wasim on 19-04-2016 to consider rejected location from QC 
 				}
-				else
+				/*else
 				{
 					pstmt.setString(2, lineNoInterface);
-				}
+				}*/
 				rs = pstmt.executeQuery();
 				while(rs.next())
@@ -565,7 +618,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 						hashMap1.put("tax_chap", rs.getString("TAX_CHAP"));
 						hashMap1.put("tax_env", rs.getString("TAX_ENV"));
 						hashMap1.put("loc_code__to", locCodeTo);
+						hashMap1.put("no_art", rs.getString("NO_ART"));
+						hashMap1.put("qty_per_art", rs.getDouble("QTY_PER_ART"));
 						hashMap1.put("rate__clg", rs.getDouble("RATE__CLG" ));//added rate clg on 15-07-2016
 						hashMap1.put("qty_shipped", rs.getDouble("QTY_SHIPPED" ));//added rate by wasim on 15-07-2016
 						hashMap1.put("qty_confirm", rs.getDouble("QTY_CONFIRM"));//added rate by wasim on 15-07-2016
@@ -630,11 +684,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					}
 					//sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ?";
-					sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ? AND PALLET_NO = ?";
+					sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ? AND PALLET_NO = ? and lot_no = ? and lot_sl = ?";
 					pstmtUpdate = conn.prepareStatement(sqlUpdate);
 					pstmtUpdate.setString(1, refId);
 					pstmtUpdate.setString(2, lineNoInterface.trim());//this trim is for in case of S-ORD
 					pstmtUpdate.setString(3, palletNo);
+					pstmtUpdate.setString(4, lotNoFirst);
+					pstmtUpdate.setString(5, lotSlFirst);
 					int caseCount = pstmtUpdate.executeUpdate();
 					System.out.println("Updated ="+caseCount);
 					pstmtUpdate.close();pstmtUpdate = null;
@@ -697,14 +753,14 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				if( errString != null &&  errString.indexOf( "CONFSUCC" ) > -1)
 				{
-					errString = allocStockLocCodeTo(allocList,false,conn);
+					//errString = allocStockLocCodeTo(allocList,false,conn);//commented by azhar on 29-NOV-2016 as in post save DI it is getting allocated
 					System.out.println("Return from alloc To="+errString);
 						if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
 						{
 							updateLocation(locationList,conn);
-							errString = allocStockLocCodeTo(allocList,true,conn);
+							//errString = allocStockLocCodeTo(allocList,true,conn);//commented by azhar for firmplan
 							System.out.println("For D-SO after stock transfer connection need to be committed....so connection committed");
 							conn.commit();
@@ -803,6 +859,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		return errString;
 	}
+	@SuppressWarnings("static-access")
 	private String generateTranTd(String windowName,String tranDate,String siteCode, Connection  conn )throws ITMException
 	{		
 		System.out.println("inside generateTranTd@@.........");
@@ -810,7 +867,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		ResultSet rs = null;
 		String sql = "";
 		String tranId = "";
-		String newKeystring = "",tranSer1 = "",keyString = "",keyCol = "";
+		String tranSer1 = "",keyString = "",keyCol = "";
 		CommonConstants commonConstants = new CommonConstants();
 		try
 		{		 	
@@ -840,33 +897,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					keyCol = rs.getString(2);
 					tranSer1 = rs.getString(3);
 				}
-				// Changed by Sneha on 01-09-2016, for Closing the Open Cursor [Start]
-				if( pstmt != null )
-				{
-					pstmt.close();
-					pstmt = null;
-				}
-				if ( rs != null )
-				{
-					rs.close();
-					rs = null;
-				}
-				// Changed by Sneha on 01-09-2016, for Closing the Open Cursor [End]
 			}
-			/*rs.close();
+			rs.close();
 			rs = null;
 			pstmt.close();
-			pstmt = null;*/
+			pstmt = null;
-			if( pstmt != null )
-			{
-				pstmt.close();
-				pstmt = null;
-			}
-			if ( rs != null )
-			{
-				rs.close();
-				rs = null;
-			}
 			System.out.println("keyString :"+keyString);
 			System.out.println("keyCol :"+keyCol);
@@ -901,14 +936,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		return tranId;
 	}
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private ArrayList checkStockAllocation(String siteCode,String itemCode,String lotNo,String lotSl,String locCodeFrom,String locCodeTo,Connection conn)  throws ITMException, Exception
 	{
-		String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "",tranId = "";
+		String tranId = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		String sql = "",scheduleStatus = "",tableName = "",lineNo = "",refSer = "",id = "",expLev = "";
+		String sql = "",tableName = "",lineNo = "",refSer = "",id = "",expLev = "";
-		double quantity = 0;
-		boolean flag = false;
 		ArrayList allocLocList = new ArrayList();
 		try
 		{
@@ -926,8 +960,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			while(rs.next())
 			{
 				tranId = checkNullAndTrim(rs.getString("SALE_ORDER"));
-				locCodeReturn = checkNullAndTrim(rs.getString("LOC_CODE"));
-				quantity = rs.getDouble("QUANTITY");
 				//lineNo = checkNullAndTrim(rs.getString("LINE_NO"));//Changed by wasim on 11-01-2015 as sordalloc has char(3) line no
 				lineNo = rs.getString("LINE_NO");
 				expLev = rs.getString("EXP_LEV");
@@ -935,8 +967,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				tableName = "SORDALLOC";
 				refSer = "S-ORD";
 				id = "SALE_ORDER";
-				flag = true;
 				HashMap hm = new HashMap();
 				hm.put("LOC_CODE_NEW", locCodeTo);
 				hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
@@ -970,14 +1000,10 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			while(rs.next())
 			{
 				tranId = checkNullAndTrim(rs.getString("DIST_ORDER"));
-				locCodeReturn = checkNullAndTrim(rs.getString("LOC_CODE"));
-				quantity = rs.getDouble("QUANTITY");
 				lineNo = checkNullAndTrim(rs.getString("LINE_NO"));
 				tableName = "DISTORDER_ALLOC";
 				refSer = "D-SO";
 				id = "DIST_ORDER";
-				flag = true;
 				HashMap hm = new HashMap();
 				hm.put("LOC_CODE_NEW", locCodeTo);
 				hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
@@ -1009,14 +1035,10 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			while(rs.next())
 			{
 				tranId = checkNullAndTrim(rs.getString("TRAN_ID"));
-				locCodeReturn = checkNullAndTrim(rs.getString("LOC_CODE"));
-				quantity = rs.getDouble("QUANTITY");
 				lineNo = checkNullAndTrim(rs.getString("LINE_NO"));
 				tableName = "DISTORD_ISSDET";
 				refSer = "D-SO";
 				id = "TRAN_ID";
-				flag = true;
 				HashMap hm = new HashMap();
 				hm.put("LOC_CODE_NEW", locCodeTo);
 				hm.put("LOC_CODE_OLD", locCodeFrom);//Added by wasim on 20-01-2016
@@ -1062,16 +1084,14 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		}
 		return allocLocList;
 	}
+	@SuppressWarnings("rawtypes")
 	private String updateLocation(ArrayList locList,Connection conn)  throws ITMException, Exception
 	{
-		String sqlSordAlloc = "",sqlDisorderAlloc = "",sqlDistIss = "",locCodeReturn = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
-		String sql = "",scheduleStatus = "",tableName = "",locCode = "",refSer = "",tranId = "",id = "",lineNo = "",locCodeOld = "";
+		String sql = "",tableName = "",locCode = "",tranId = "",id = "",lineNo = "",locCodeOld = "";
-		double quantity = 0;
+		String retString = "",lotNo = "",lotSl = "",itemCode = "",expLev = "";
-		boolean flag = false;
-		HashMap hm = new HashMap();
-		String retString = "",lotNo = "",lotSl = "",siteCode = "",itemCode = "",expLev = "";
 		int updCount = 0;
 		try
 		{
@@ -1101,11 +1121,9 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 						lotNo = (String) detail.get("LOT_NO");//Changed by wasim on 20-1-2016
 						lotSl = (String) detail.get("LOT_SL");//Changed by wasim on 20-1-2016
-						siteCode = (String) detail.get("SITE_CODE");//Changed by wasim on 20-1-2016
 						itemCode = (String) detail.get("ITEM_CODE");//Changed by wasim on 20-1-2016
 						lineNo = (String) detail.get("LINE_NO");
-						refSer = (String) detail.get("REF_SER");
 						tranId = (String) detail.get("TRAN_ID");
 						id = (String) detail.get("ID");
@@ -1169,6 +1187,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 	}
 	//public String createDistIssue(String siteCode, String distOrderNo, ArrayList DistStkList, String tranId, boolean headerFlag, String xtraParams, Connection conn) throws RemoteException, ITMException
+	@SuppressWarnings("rawtypes")
 	public String createDistIssue(String siteCode, String distOrderNo, ArrayList DistStkList, String xtraParams, Connection conn) throws RemoteException, ITMException									
 	{
 		StringBuffer xmlBuff = new StringBuffer();
@@ -1178,36 +1197,34 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		StringBuffer xmldetail2ftr = new StringBuffer();
 		xmldetail2ftr.append("</Detail2>");
 		//String distOrderNo = null;
-		String sql = null,tranDate = null,locCode = null,retString = "",lsPackCode = null,mLotNo = null,tranType = "";
+		String sql = null,tranDate = null,locCode = null,retString = "",tranType = "";
 		PreparedStatement pstmt = null; PreparedStatement pstmt1 = null; PreparedStatement pstmt2 = null,distIssDetPstmt = null,pstmtHdr = null;
 		ResultSet rs = null; ResultSet rs1 = null; ResultSet rs2 = null; ResultSet rs3 = null;
 		Statement stmt1 = null;
 		int count = 0,linenoCtr = 0;
-		double mod = 0.0D; double minputQty = 0.0D; double remQuantity = 0.0D; double stockQty = 0.0D; double integralQty = 0.0D;
+		double minputQty = 0.0D; double integralQty = 0.0D;
 		double grossPer = 0.0D; double netPer = 0.0D; double tarePer = 0.0D; double grossWt = 0.0D; double netWt = 0.0D; double tareWt = 0.0D; double rateClgVal = 0.0D; double rate2 = 0.0D;
-		double disAmount = 0.0D; double amount = 0.0D; double shipperQty = 0.0D; double discount = 0.0D;
+		double disAmount = 0.0D; double amount = 0.0D; double shipperQty = 0.0D; double discount = 0.0D,qtyPerArtStock = 0.0D;
-		double qtyConfirm = 0.0D; double qtyShipped = 0.0D; double lcQtyOrderAlt = 0.0D; double lcFact = 0.0D;
+		double lcQtyOrderAlt = 0.0D; double lcFact = 0.0D;
-		String suppSour = ""; String trackShelfLife = ""; String siteCodeMfg = ""; String sundryCode = ""; double potencyPerc = 0;
+		String siteCodeMfg = ""; String sundryCode = ""; double potencyPerc = 0;
-		String priceList = ""; String tabValue = ""; String priceListClg = ""; String chkDate = ""; String disCountPer = "";
+		String priceList = ""; String tabValue = ""; String priceListClg = "";  
-		String tranTypePparent = null; String rate = ""; String lsTranTypeParent = "";
+		String rate = ""; 
-		double qtyOrdAlt = 0d,totalGrossWeight = 0, totalTareWeight = 0, totalNetWeight = 0,allocQty = 0;
+		String itemCode = ""; 
-		String convQtyAlt = "",res = ""; String locCodeDamaged = ""; String itemCode = ""; String availableYn = "";
+		String checkIntegralQty = ""; String rate1 = ""; double quantity = 0d;
-		String checkIntegralQty = ""; String rate1 = ""; String tranTypeParent = ""; double quantity = 0d;
 		String active = ""; String itemDescr = ""; String errCode = ""; String sql2 = ""; int noArt = 0;
-		String detail2stock = ""; String errString = ""; String taxChap = ""; String siteCodeShip = "",sqlHdr = "",sqlDist = "";
+		String detail2stock = ""; String errString = ""; String taxChap = ""; 
 		String lotNo = ""; String lotSl = ""; String packCode = ""; String rateClg = ""; String taxEnv = ""; String taxClass = "";
-		java.util.Date expDate = null; java.util.Date mfgDate = null; java.util.Date chkDate1 = null;
+		java.util.Date expDate = null; java.util.Date mfgDate = null; 
-		boolean isDetFound = false,isError = false;
-		String prvDeptCode = null; String deptCode = ""; String ratefromStock = "";
 		StringBuffer xmldetail2stock = null;
-		int MAXLINESALLOWED = 0,countDtl = 0, lineNoIssDet = 0,distCount = 0,totalNoArt = 0,minShelfLife = 0; int noArt1 = 0; int cnt = 0,mLineNoDist = 0;
+		int countDtl = 0;
-		String locGroupJwiss = "",subSQL = "",rateFmDistOrd = "",lineNoInterface = "",sqlDistIssDet = "",lineNoDistOrder = "",itemSer = "",batchNo = "",grade = "",
+		int noArt1 = 0; int mLineNoDist = 0;
-				dimension = "",suppCodeMfg = "",packInstr = "",descr = "",xmlString = "",unitAlt = "",unit = "";
+		String batchNo = "",grade = "",dimension = "",suppCodeMfg = "",packInstr = "",descr = "",xmlString = "",unitAlt = "",unit = "",tranID = "",processXml = "";
-		Timestamp today = new Timestamp(System.currentTimeMillis()),retestDate = null;
+		Timestamp retestDate = null;
+		int lineNoDet = 0, noArtStock = 0;
 		CreateDistOrder distOrder = new CreateDistOrder();
+		String tLocCode = "", tLotSl = "";
 		try
 		{
@@ -1222,7 +1239,82 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			Iterator itr = DistStkList.iterator();
 			System.out.println("Array Total size="+DistStkList.size());
+			System.out.println("List for DI::::" + DistStkList.toString());
+			/*result = mfgc.getEnvMfg("999999", "IS_CREATE_DI", conn);
+			System.out.println("result from disparm:::" + result);
+			sql = "select tran_id from distord_iss where dist_order = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, distOrderNo);
+			rs = pstmt.executeQuery();
+			if(rs.next()){
+				tranID = rs.getString("tran_id");
+			}
+			tranID = tranID == null ? "" : tranID.trim();
+			System.out.println("tran id::::" + tranID);
+			pstmt.close();
+			pstmt = null;
+			rs.close();
+			rs = null;
+			if(tranID.length()>0){
+			sql = "select max(line_no) as line_no from distord_issdet where dist_order = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, distOrderNo);
+			rs = pstmt.executeQuery();
+			if(rs.next()){
+				 lineNoDet = rs.getInt("line_no");
+			}
+			System.out.println("line no in detail::::" + lineNoDet);
+			pstmt.close();
+			pstmt = null;
+			rs.close();
+			rs = null;
+			}*/
+			sql = "select tran_id from distord_iss where dist_order = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, distOrderNo);
+			rs = pstmt.executeQuery();
+			if(rs.next()){
+				tranID = rs.getString("tran_id");
+			}
+			tranID = tranID == null ? "" : tranID.trim();
+			System.out.println("tran id::::" + tranID);
+			pstmt.close();
+			pstmt = null;
+			rs.close();
+			rs = null;
+			if(tranID.length() > 0){
+				retString = "Success";
+				return retString;
+			}
+			if(tranID.length()>0){
+			sql = "select max(line_no) as line_no from distord_issdet where dist_order = ?";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, distOrderNo);
+			rs = pstmt.executeQuery();
+			if(rs.next()){
+				 lineNoDet = rs.getInt("line_no");
+			}
+			System.out.println("line no in detail::::" + lineNoDet);
+			pstmt.close();
+			pstmt = null;
+			rs.close();
+			rs = null;
+			}
 			while(itr.hasNext())
 			{ 
 				HashMap stkMap = new HashMap();
@@ -1237,13 +1329,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				//siteCode = (String) stkMap.get("loc_code");
 				quantity = (Double) stkMap.get("quantity");
 				expDate = (Date) stkMap.get("exp_date");
+				System.out.println("::exp date::" + expDate);
 				unit = checkNullAndTrim((String) stkMap.get("unit"));
 				unitAlt = checkNullAndTrim((String) stkMap.get("unit__alt"));
-				itemSer = checkNullAndTrim((String) stkMap.get("item_ser"));
 				siteCodeMfg = checkNullAndTrim((String) stkMap.get("site_code__mfg"));
 				mfgDate = (Date) stkMap.get("mfg_date");
+				System.out.println("::mfg date::" + mfgDate);
 				potencyPerc = (Double) stkMap.get("potency_perc");
-				allocQty = (Double) stkMap.get("qty_alloc");
 				packCode = checkNullAndTrim((String) stkMap.get("pack_code"));
 				packInstr = checkNullAndTrim((String) stkMap.get("pack_instr"));
 				batchNo = checkNullAndTrim((String) stkMap.get("batch_no"));
@@ -1259,15 +1351,22 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				taxChap = checkNullAndTrim((String) stkMap.get("tax_chap"));
 				taxEnv = checkNullAndTrim((String) stkMap.get("tax_env"));
 				locCode = checkNullAndTrim((String) stkMap.get("loc_code__to"));
+				noArtStock =  Integer.parseInt((String) stkMap.get("no_art"));
+				qtyPerArtStock = (Double) stkMap.get("qty_per_art"); 
+				System.out.println("item code ::[" +itemCode+"]:::sitecode:::[" +siteCode+"]:::no of articles:::["+noArtStock+"]::qty per art::[" +qtyPerArtStock + "]");
 				rateClg = Double.toString((Double) stkMap.get("rate__clg"));//added by wasim to get rate clg from distorder det
-				qtyConfirm = (Double) stkMap.get("qty_confirm");//added by wasim
-				qtyShipped = (Double) stkMap.get("qty_shipped");//added by wasim
-				remQuantity = qtyConfirm - qtyShipped;
 				StringBuffer xmldetail2hdr = new StringBuffer();
 				xmldetail2hdr.append("<Detail2 dbID=\"\" domID=\"1\" objName=\"dist_order_post\" objContext=\"2\">");
 				xmldetail2hdr.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
+				if(tranID.length() > 0){
+					xmldetail2hdr.append("<tran_id><![CDATA[" + tranID + "]]></tran_id>");;
+				}else{
+					xmldetail2hdr.append("<tran_id/>");	
+				}
 				xmldetail2hdr.append("<tran_id/>");
 				xmldetail2hdr.append("<dist_order><![CDATA[" + distOrderNo + "]]></dist_order>");
 				xmldetail2hdr.append("<line_no_dist_order><![CDATA[" + mLineNoDist + "]]></line_no_dist_order>");
@@ -1285,9 +1384,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				if (rs1.next())
 				{
 					active = rs1.getString(1);
-					minShelfLife = rs1.getInt(2);
-					trackShelfLife = rs1.getString(3);
-					suppSour = rs1.getString(4);
 					itemDescr = rs1.getString(5);
 					if (active.equals("N"))
 					{
@@ -1308,7 +1404,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					sundryCode = rs1.getString("SUNDRY_CODE");
 					priceList = rs1.getString("PRICE_LIST");
 					priceListClg = rs1.getString("PRICE_LIST__CLG");
-					siteCodeShip = rs1.getString("SITE_CODE__SHIP");
 				}
 				rs1.close();rs1 = null;
 				pstmt1.close();pstmt1 = null;
@@ -1325,7 +1420,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 						if (rs1.next())
 						{
 							checkIntegralQty = rs1.getString( 1 );
-							tranTypeParent = rs1.getString( 2 );
 							if (checkIntegralQty == null || checkIntegralQty.trim().length() == 0)
 							{
 								checkIntegralQty = "Y";
@@ -1427,6 +1521,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				disAmount = amount * (discount / 100.0D);
 				 noArt1 = 0;
+				 System.out.println("First time:::sitecode:: [" + siteCode + "]::sundryCode::[" + sundryCode + "]::itemcode::["+ itemCode +"]:::" +
+				 		"packcode::["+packCode+"]::minput qty::["+minputQty+"]::shipper qty::["+shipperQty+"]::integral qty::[" +integralQty+"]:::");
 				    noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, minputQty, 'B', shipperQty, integralQty);
 				  //noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, quantity, 'B', shipperQty, integralQty);
@@ -1514,7 +1610,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					//noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, quantity, 'B', acShipperQty, acIntegralQty);
 					noArt = noArt1;
 				}
+				if(quantity <= qtyPerArtStock){
+					noArtStock = 1;
+				}
+				System.out.println("Second time:::sitecode:: [" + siteCode + "]::sundryCode::[" + sundryCode + "]::itemcode::["+ itemCode +"]:::" +
+				 		"packcode::["+packCode+"]::minput qty::["+minputQty+"]::shipper qty::["+shipperQty+"]::integral qty::[" +integralQty+"]:::");
 				lcFact = 0.0D;
 				ArrayList QtyFactorList = new ArrayList();
@@ -1527,27 +1629,46 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				xmldetail2stock = new StringBuffer();
-				isDetFound = true;
+				lineNoDet++;
 				linenoCtr++;
 				countDtl++;
 				System.out.println("Line number issue= "+linenoCtr);
-				xmldetail2stock.append("<line_no><![CDATA[" + linenoCtr + "]]></line_no>");
+				System.out.println("Line number in manual DI= "+lineNoDet);
+				/*if(tranID.length() > 0){
+				xmldetail2stock.append("<line_no><![CDATA[" + lineNoDet + "]]></line_no>");
+				}else{
+					xmldetail2stock.append("<line_no><![CDATA[" + linenoCtr + "]]></line_no>");	
+				}
+				if(result.equalsIgnoreCase("YES")){
+					xmldetail2stock.append("<remarks><![CDATA[" + remarksTobeSet + "]]></remarks>");
+				}*/
+				 if(tranID.length() > 0){
+					xmldetail2stock.append("<line_no><![CDATA[" + lineNoDet + "]]></line_no>");
+					}else{
+						xmldetail2stock.append("<line_no><![CDATA[" + linenoCtr + "]]></line_no>");	
+					}
+				//xmldetail2stock.append("<line_no><![CDATA[" + linenoCtr + "]]></line_no>");
 				xmldetail2stock.append("<item_descr>").append("<![CDATA[").append(itemDescr == null ? "" : itemDescr).append("]]>").append("</item_descr>\r\n");
 				xmldetail2stock.append("<location_descr>").append("<![CDATA[").append(descr).append("]]>").append("</location_descr>\r\n");
 				xmldetail2stock.append("<unit>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
 				xmldetail2stock.append("<unit__alt>").append("<![CDATA[").append(unitAlt).append("]]>").append("</unit__alt>\r\n");
 				xmldetail2stock.append("<conv__qty__alt>").append("<![CDATA[").append(lcFact).append("]]>").append("</conv__qty__alt>\r\n");
 				xmldetail2stock.append("<qty_order__alt>").append("<![CDATA[").append(lcQtyOrderAlt).append("]]>").append("</qty_order__alt>\r\n");
-				String tLocCode = null;
+				 //tLocCode = "";
 				tLocCode = locCode;
+				tLocCode = tLocCode == null ? "" : tLocCode.trim();
 				xmldetail2stock.append("<loc_code>").append("<![CDATA[").append(tLocCode == null ? "" : tLocCode.trim()).append("]]>").append("</loc_code>\r\n");
 				xmldetail2stock.append("<rate>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
 				xmldetail2stock.append("<rate__clg>").append("<![CDATA[").append(rateClgVal).append("]]>").append("</rate__clg>\r\n");
 				xmldetail2stock.append("<quantity>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
 				xmldetail2stock.append("<amount>").append("<![CDATA[").append(quantity * Double.parseDouble(rate1)).append("]]>").append("</amount>\r\n");
-				String tLotSl = null;
+				 //tLotSl = null;
 				tLotSl = lotSl;
+				tLotSl = tLotSl == null ? "" : tLotSl.trim();
 				xmldetail2stock.append("<lot_sl>").append("<![CDATA[").append(tLotSl == null ? "    " : tLotSl).append("]]>").append("</lot_sl>\r\n");
 				xmldetail2stock.append("<pack_code>").append("<![CDATA[").append(packCode == null ? "" : packCode).append("]]>").append("</pack_code>\r\n");
 				xmldetail2stock.append("<disc_amt>").append("<![CDATA[").append(disAmount).append("]]>").append("</disc_amt>\r\n");
@@ -1569,7 +1690,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				xmldetail2stock.append("<mfg_date>").append("<![CDATA[").append(mfgDate == null ? "" : sdf.format(mfgDate)).append("]]>").append("</mfg_date>\r\n");
 				xmldetail2stock.append("<exp_date>").append("<![CDATA[").append(expDate == null ? "" : sdf.format(expDate)).append("]]>").append("</exp_date>\r\n");
 				xmldetail2stock.append("<potency_perc>").append("<![CDATA[").append(potencyPerc).append("]]>").append("</potency_perc>\r\n");
-				xmldetail2stock.append("<no_art>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
+				//xmldetail2stock.append("<no_art>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n"); commented by azhar as told by manoj sir after discussion with manoharan sir[26-dec-2016]
+				xmldetail2stock.append("<no_art>").append("<![CDATA[").append(noArtStock).append("]]>").append("</no_art>\r\n");
 				xmldetail2stock.append("<batch_no>").append("<![CDATA[").append(batchNo == null ? "" : batchNo).append("]]>").append("</batch_no>\r\n");
 				xmldetail2stock.append("<grade>").append("<![CDATA[").append(grade == null ? "" : grade).append("]]>").append("</grade>\r\n");
 				xmldetail2stock.append("<lot_no>").append("<![CDATA[").append(lotNo == null ? "               " : lotNo).append("]]>").append("</lot_no>\r\n");
@@ -1587,7 +1709,70 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				netWt = 0.0D;
 			}//End iterator
-			xmlBuff = null;
+			//added by azhar [START][W16HSUN001]
+			/*System.out.println("value in mfgparm::: " + result);
+			if(!result.equalsIgnoreCase("YES") && tranID.length() > 0){
+				sql = "select inv_stat from location where loc_code in (select loc_code from distord_issdet where dist_order = ?)";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, distOrderNo);
+				rs = pstmt.executeQuery();
+				while(rs.next()){
+					invStat = rs.getString("inv_stat");
+					invStat = invStat == null ? "" : invStat.trim();
+					System.out.println("::inv stat from DI:: " + invStat);
+					invMap = new HashMap();
+					invMap.put("inv_stat" , invStat);
+				}
+			System.out.println(":::::inv stat in map:: " + invMap.toString());
+			if(!invMap.containsValue("AWMS") || !invMap.containsValue("AWMSQ")){
+				 processXml = getXmlInEditMode(tranID,xtraParams,conn, "dist_order_post");
+				 System.out.println("Process xml in edit mode::" +processXml);//TODO append process xml to detail2xml
+				 String tempXml = processXml.substring(0, processXml.lastIndexOf("</Detail2>") + 10).concat(detail2xml.toString()).concat(processXml.substring(processXml.lastIndexOf("</Detail2>")+10));
+				 xmlBuff = new StringBuffer();
+				 xmlBuff.append(tempXml.substring(0, tempXml.indexOf("<Header0>") + 9));
+			        xmlBuff.append("<objName><![CDATA[").append("dist_order_post").append("]]></objName>");
+			        xmlBuff.append("<pageContext><![CDATA[").append("1").append("]]></pageContext>");
+			        xmlBuff.append("<objContext><![CDATA[").append("1").append("]]></objContext>");
+			        xmlBuff.append("<editFlag><![CDATA[").append("E").append("]]></editFlag>");
+			        xmlBuff.append("<focusedColumn><![CDATA[").append("").append("]]></focusedColumn>");
+			        xmlBuff.append("<action><![CDATA[").append("SAVE").append("]]></action>");
+			        xmlBuff.append("<elementName><![CDATA[").append("").append("]]></elementName>");
+			        xmlBuff.append("<keyValue><![CDATA[").append("1").append("]]></keyValue>");
+			        xmlBuff.append("<taxKeyValue><![CDATA[").append("").append("]]></taxKeyValue>");
+			        xmlBuff.append("<saveLevel><![CDATA[").append("1").append("]]></saveLevel>");
+			        xmlBuff.append("<forcedSave><![CDATA[").append(true).append("]]></forcedSave>");
+			        xmlBuff.append("<taxInFocus><![CDATA[").append(false).append("]]></taxInFocus>");
+			        xmlBuff.append(tempXml.substring(tempXml.indexOf("<Header0>") + 9, tempXml.indexOf("</Header0>")));
+			        //xmlBuff.append(detail2xml);
+			        xmlBuff.append(tempXml.substring(tempXml.indexOf("</Header0>")));
+			        System.out.println("xmlBuff::::"+xmlBuff.toString());
+			        xmlString = xmlBuff.toString().trim();
+					xmlBuff = null;
+					System.out.println(":::xmlString:::"+xmlString);
+					System.out.println("::::::::::xmlString for MasterStatefulEJB for Processing::::::::::" + xmlString.trim());
+					if (xmlString.contains("Detail2"))
+					{
+						retString = distOrder.saveData(siteCode, xmlString, conn);
+						System.out.println("After save data distribution issue"+retString);
+						if (retString.indexOf("Success") > -1)
+						{
+							System.out.println("Successfully saved");
+							//retString = "VTCONPARM";
+						}
+					} //TODO  call save data
+			} 
+			else{
+				xmlBuff = null;
 			xmlBuff = new StringBuffer();
 			xmldetail1 = createHeader(siteCode, distOrderNo,xtraParams, conn);
 			xmlBuff.append(xmldetail1.toString());
@@ -1597,7 +1782,148 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			xmlBuff.append("</DocumentRoot>");
 			xmlString = xmlBuff.toString();
 			System.out.println("xmlString------" + xmlString);
+			}
+			}else if(!result.equalsIgnoreCase("YES") && tranID.length() == 0){
+				xmlBuff = null;
+				xmlBuff = new StringBuffer();
+				xmldetail1 = createHeader(siteCode, distOrderNo,xtraParams, conn);
+				xmlBuff.append(xmldetail1.toString());
+				xmlBuff.append(detail2xml.toString());
+				xmlBuff.append("</Header0>");
+				xmlBuff.append("</group0>");
+				xmlBuff.append("</DocumentRoot>");
+				xmlString = xmlBuff.toString();
+				System.out.println("xmlString------" + xmlString);
+			}
+			if(result.equalsIgnoreCase("YES") && tranID.length() == 0){
+				xmlBuff = null;
+				xmlBuff = new StringBuffer();
+				xmldetail1 = createHeader(siteCode, distOrderNo,xtraParams, conn);
+				xmlBuff.append(xmldetail1.toString());
+				xmlBuff.append(detail2xml.toString());
+				xmlBuff.append("</Header0>");
+				xmlBuff.append("</group0>");
+				xmlBuff.append("</DocumentRoot>");
+				xmlString = xmlBuff.toString();
+				System.out.println("xmlString------" + xmlString);
+			}*/
+			//added by  azhar[END][W16HSUN001]
+			if(tranID.length() > 0){
+				/*processXml = getXmlInEditMode(tranID,xtraParams,conn, "dist_order_post");
+				 System.out.println("Process xml in edit mode::" +processXml);//TODO append process xml to detail2xml
+				 String tempXml = processXml.substring(0, processXml.lastIndexOf("</Detail2>") + 10).concat(detail2xml.toString()).concat(processXml.substring(processXml.lastIndexOf("</Detail2>")+10));
+				 xmlBuff = new StringBuffer();
+				  xmlBuff.append(tempXml.substring(0, tempXml.indexOf("<Header0>") + 9));
+			      xmlBuff.append("<objName><![CDATA[").append("dist_order_post").append("]]></objName>");
+			      xmlBuff.append("<pageContext><![CDATA[").append("2").append("]]></pageContext>");
+			      xmlBuff.append("<objContext><![CDATA[").append("1").append("]]></objContext>");
+			      xmlBuff.append("<editFlag><![CDATA[").append("E").append("]]></editFlag>");
+			      xmlBuff.append("<focusedColumn><![CDATA[").append("").append("]]></focusedColumn>");
+			      xmlBuff.append("<action><![CDATA[").append("EDIT").append("]]></action>");
+			      xmlBuff.append("<elementName><![CDATA[").append("").append("]]></elementName>");
+			      xmlBuff.append("<keyValue><![CDATA[").append("1").append("]]></keyValue>");
+			      xmlBuff.append("<taxKeyValue><![CDATA[").append("").append("]]></taxKeyValue>");
+			      xmlBuff.append("<saveLevel><![CDATA[").append("1").append("]]></saveLevel>");
+			      xmlBuff.append("<forcedSave><![CDATA[").append(true).append("]]></forcedSave>");
+			      xmlBuff.append("<taxInFocus><![CDATA[").append(false).append("]]></taxInFocus>");
+			      xmlBuff.append("<pkValues><![CDATA[").append(tranID).append("]]></pkValues>");
+			      xmlBuff.append(tempXml.substring(tempXml.indexOf("<Header0>") + 9, tempXml.indexOf("</Header0>")));
+			        //xmlBuff.append(detail2xml);
+			      xmlBuff.append(tempXml.substring(tempXml.indexOf("</Header0>")));
+			        System.out.println("xmlBuff::::"+xmlBuff.toString());
+			        xmlString = xmlBuff.toString().trim();
+					xmlBuff = null;
+					System.out.println(":::xmlString:::"+xmlString);
+					System.out.println("::::::::::xmlString for MasterStatefulEJB for Processing::::::::::" + xmlString.trim());*/
+				packCode = packCode == null ? "" : packCode.trim();
+				siteCodeMfg = siteCodeMfg == null ? "" : siteCodeMfg.trim();
+				//String mfgDateNew = dbf.format(mfgDate);
+				Timestamp mfgTimeStamp = Timestamp.valueOf(dbf.format(mfgDate).toString() + " 00:00:00.0");
+				//System.out.println("mfg date:: " + mfgDate);
+				Timestamp expTimeStamp = Timestamp.valueOf(dbf.format(expDate).toString() + " 00:00:00.0");
+				//String expDateNew = dbf.format(expDate);
+				System.out.println("exp date:: " + expDate);
+				double amt = quantity * Double.parseDouble(rate1);
+				sql = "Insert into DISTORD_ISSDET (TRAN_ID, LINE_NO, DIST_ORDER, LINE_NO_DIST_ORDER, ITEM_CODE, QUANTITY, UNIT, LOC_CODE, LOT_NO, LOT_SL," +
+						" PACK_CODE, RATE, AMOUNT,SITE_CODE__MFG, MFG_DATE, EXP_DATE, POTENCY_PERC, NO_ART, GROSS_WEIGHT, TARE_WEIGHT, " +
+						"NET_WEIGHT, RATE__CLG, DISC_AMT, UNIT__ALT, CONV__QTY__ALT, QTY_ORDER__ALT) " +
+						"values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, tranID);
+				pstmt.setInt(2, lineNoDet);
+				pstmt.setString(3, distOrderNo);
+				pstmt.setInt(4, mLineNoDist);
+				pstmt.setString(5, itemCode);
+				pstmt.setDouble(6, quantity);
+				pstmt.setString(7, unit);
+				pstmt.setString(8, tLocCode);
+				pstmt.setString(9, lotNo);
+				pstmt.setString(10, tLotSl);
+				pstmt.setString(11, packCode);
+				pstmt.setString(12, rate);
+				pstmt.setDouble(13, amt);
+				pstmt.setString(14, siteCodeMfg);
+				pstmt.setTimestamp(15, mfgTimeStamp);
+				pstmt.setTimestamp(16, expTimeStamp);
+				pstmt.setDouble(17, potencyPerc);
+				pstmt.setDouble(18, noArt);
+				pstmt.setDouble(19, grossWt);
+				pstmt.setDouble(20, tareWt);
+				pstmt.setDouble(21, netWt);
+				pstmt.setDouble(22, rateClgVal);
+				pstmt.setDouble(23, disAmount);
+				pstmt.setString(24, unitAlt);
+				pstmt.setDouble(25, lcFact);
+				pstmt.setDouble(26, lcQtyOrderAlt);
+				int updCnt = pstmt.executeUpdate();
+				if(updCnt > 0){
+					conn.commit();
+					processXml = getXmlInEditMode(tranID,xtraParams,conn, "dist_order_post");
+					System.out.println("xml in edit mode::::" + processXml);
+				    String currDomID = String.valueOf(lineNoDet);
+				    System.out.println("Curr dom id::" + currDomID);
+					executeSystemEvent("post_save_rec_2", processXml, xtraParams,currDomID,conn);
+					executeSystemEvent("post_save", processXml, xtraParams,currDomID,conn);
+					retString = "Success";
+				/*	String transString = "<?xml version='1.0' encoding='" + CommonConstants.ENCODING + "'?><Root>" + 
+			                   "<header><objName><![CDATA[dist_order_post]]></objName>" + 
+			                   "<objContext><![CDATA[2]]></objContext>" + 
+			                   "<editFlag><![CDATA[E]]></editFlag>" + 
+			                   "<keyValue><![CDATA[" + tranID + "]]></keyValue>" + 
+			                   "<forcedSave><![CDATA[false]]></forcedSave>" + 
+			                   "</header></Root>";
+			                 String statusStr = executeSystemEvent("post_save_rec_2",transString, lineNoDet,xtraParams,conn);
+			                 if (statusStr.indexOf("<Errors>") == -1){
+			                	 retString = "Success";*/
+				}
+			}else{
+			xmlBuff = null;
+			xmlBuff = new StringBuffer();
+			xmldetail1 = createHeader(siteCode, distOrderNo,xtraParams, conn);
+			xmlBuff.append(xmldetail1.toString());
+			xmlBuff.append(detail2xml.toString());
+			xmlBuff.append("</Header0>");
+			xmlBuff.append("</group0>");
+			xmlBuff.append("</DocumentRoot>");
+			xmlString = xmlBuff.toString();
+			System.out.println("xmlString------" + xmlString);
 			System.out.println("Number of Records in Detail---" + countDtl);
 			System.out.println("xmlString.contains(Detail2)----" + xmlString.contains("Detail2"));
@@ -1612,11 +1938,19 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				}
 			}
 			System.out.println("Last final return String1 ="+retString);
+			//added by  azhar[STATRT][W16HSUN001]
+			/*if(result.equalsIgnoreCase("YES") && tranID.length() > 0){
+				retString = "Success";
+			}*/
+			System.out.println("Last final return String2 ="+retString);
+			//added by  azhar[END][W16HSUN001]
+			}
 		}
 		catch (Exception e)
 		{
 			System.out.println("createDistIssue Catch Recived");
-			isError = true;
 			throw new ITMException(e);
 		}
 		finally
@@ -1637,9 +1971,68 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				throw new ITMException(ex);
 			}
 		}
-		System.out.println("Last final return String2 ="+retString);
+		System.out.println("Last final return String ="+retString);
 		return retString;
 	}
+	public String executeSystemEvent(String eventCode, String processXml,String xtraParams,String dbID,Connection conn) throws ITMException 
+	{
+		String result = "";
+		try {
+			InitialContext ctx = null;
+			AppConnectParm appConnect = new AppConnectParm();
+			ctx = new InitialContext(appConnect.getProperty());
+			Document dom = null;
+			if(processXml.length() == 0){
+				dom = null;
+			}else{
+				dom = genericUtility.parseString(processXml);
+			}
+			EventManagerLocal eventManager = (EventManagerLocal) ctx.lookup("ibase/EventManagerEJB/local");
+			result = eventManager.executeSystemEvent("dist_order_post",eventCode,"1",dom,dom,xtraParams,dbID,conn);
+		}
+		catch (Exception e) 
+		{
+			throw new ITMException(e);
+		}
+		return result;
+	}
+	private String getXmlInEditMode(String tranId, String xtraParams, Connection conn, String type) 
+	{
+		InitialContext ctx = null;
+		String xmlInEditMode = "";
+		MasterStatefulLocal masterStateful = null;
+		AppConnectParm appConnect = new AppConnectParm();
+		UserInfoBean userInfo = new UserInfoBean();
+		if(!type.equalsIgnoreCase("dist_order_post"))
+			return "";
+		try 
+		{
+			userInfo.setLoginCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
+			userInfo.setEmpCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
+			userInfo.setSiteCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
+			userInfo.setEntityCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "entityCode"));
+			userInfo.setProfileId(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "profileId"));
+			userInfo.setUserType(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "userType"));
+			userInfo.setRemoteHost(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
+			ctx = new InitialContext(appConnect.getProperty());
+			masterStateful = (MasterStatefulLocal) ctx.lookup("ibase/MasterStatefulEJB/local");
+			masterStateful.setUserInfo(userInfo);
+			xmlInEditMode = masterStateful.getDetailXMLDomString("dist_order_post","1", "E", tranId, "");	
+		}
+		catch (Exception e) 
+		{
+			e.printStackTrace();
+		}
+		System.out.println("Returning from MasterStateful xmlInEditMode ::: " + xmlInEditMode);
+		return xmlInEditMode;
+	}
 	private double getIntegralQty(String siteCode, String itemCode, String lotNo, String packCode, String checkIntegralQty) throws ITMException
 	{
 		double integralQty = 0.0D;
@@ -1794,42 +2187,38 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		return s;
 	}
+	@SuppressWarnings("unused")
 	public String createHeader(String siteCode, String distOrderNo,String xtraParams, Connection conn)
 			throws RemoteException, ITMException
 			{
 		StringBuffer xmlBuffHeader = new StringBuffer();
-		String currCode = "";
+		String sql = null,isAutoConfirm = "N";
-		String sql = null,sqlInsert = "",isAutoConfirm = "N";
 		//String tranDate = null;
 		String tranDate = null;
-		String locCode = null;
 		String retString = "";
-		PreparedStatement pstmt = null; PreparedStatement pstmt1 = null; PreparedStatement pstmt2 = null,distIssHdrPstmt = null;
+		PreparedStatement pstmt = null; PreparedStatement distIssHdrPstmt = null;
-		ResultSet rs = null; ResultSet rs1 = null; ResultSet rs2 = null;
+		ResultSet rs = null;  
-		String lsPackCode = null; String unitAlt = null; String unit = null; String mLotNo = null;
+		//double mod = 0.0D; double minputQty = 0.0D; double remQuantity = 0.0D; double stockQty = 0.0D; double integralQty = 0.0D;
-		int count = 0;
+		//double grossPer = 0.0D; double netPer = 0.0D; double tarePer = 0.0D; double grossWt = 0.0D; double netWt = 0.0D; double tareWt = 0.0D; double rateClgVal = 0.0D; double rate2 = 0.0D;
-		int linenoCtr = 0;
+		//double disAmount = 0.0D; double amount = 0.0D; double shipperQty = 0.0D; double discount = 0.0D;
-		String tranType = "";
+		//int minShelfLife = 0; int noArt1 = 0; int cnt = 0;
-		double mod = 0.0D; double minputQty = 0.0D; double remQuantity = 0.0D; double stockQty = 0.0D; double integralQty = 0.0D;
+		//int mLineNoDist = 0;
-		double grossPer = 0.0D; double netPer = 0.0D; double tarePer = 0.0D; double grossWt = 0.0D; double netWt = 0.0D; double tareWt = 0.0D; double rateClgVal = 0.0D; double rate2 = 0.0D;
+		//double qtyConfirm = 0.0D; double qtyShipped = 0.0D; double lcQtyOrderAlt = 0.0D; double lcFact = 0.0D;
-		double disAmount = 0.0D; double amount = 0.0D; double shipperQty = 0.0D; double discount = 0.0D;
+		//String suppSour = ""; String trackShelfLife = ""; String siteCodeMfg = ""; String sundryCode = ""; String potencyPerc = "";
-		int minShelfLife = 0; int noArt1 = 0; int cnt = 0;
+		//String priceList = ""; String tabValue = ""; String priceListClg = ""; String chkDate = ""; String disCountPer = "";
-		int mLineNoDist = 0;
+		//String tranTypePparent = null; String rate = ""; String lsTranTypeParent = "";
-		double qtyConfirm = 0.0D; double qtyShipped = 0.0D; double lcQtyOrderAlt = 0.0D; double lcFact = 0.0D;
+		//String qtyOrdAlt = ""; String convQtyAlt = "";
-		String suppSour = ""; String trackShelfLife = ""; String siteCodeMfg = ""; String sundryCode = ""; String potencyPerc = "";
+		//String res = ""; String locCodeDamaged = ""; String itemCode = ""; String availableYn = "";
-		String priceList = ""; String tabValue = ""; String priceListClg = ""; String chkDate = ""; String disCountPer = "";
+		//String checkIntegralQty = ""; String rate1 = ""; String tranTypeParent = ""; String quantity = "";
-		String tranTypePparent = null; String rate = ""; String lsTranTypeParent = "";
+		//String active = ""; String itemDescr = ""; String errCode = ""; String sql2 = ""; String noArt = "";
-		String qtyOrdAlt = ""; String convQtyAlt = "";
+		//String detail2stock = ""; String errString = ""; String taxChap = ""; String siteCodeShip = "";
-		String res = ""; String locCodeDamaged = ""; String itemCode = ""; String availableYn = "";
+		//String lotNo = ""; String lotSl = ""; String packCode = ""; String rateClg = ""; String taxEnv = ""; String taxClass = "";
-		String checkIntegralQty = ""; String rate1 = ""; String tranTypeParent = ""; String quantity = "";
+		//java.util.Date expDate = null; java.util.Date mfgDate = null; java.util.Date chkDate1 = null;
-		String active = ""; String itemDescr = ""; String errCode = ""; String sql2 = ""; String noArt = "";
+		//int caseCount = 0;
-		String detail2stock = ""; String errString = ""; String taxChap = ""; String siteCodeShip = "";
+		//boolean isDetFound = false;
-		String lotNo = ""; String lotSl = ""; String packCode = ""; String rateClg = ""; String taxEnv = ""; String taxClass = "";
+		boolean isError = false;
-		java.util.Date expDate = null; java.util.Date mfgDate = null; java.util.Date chkDate1 = null;
+		//String today = "",tranId = "";
-		int caseCount = 0;
-		boolean isDetFound = false,isError = false;
-		String today = "",tranId = "";
 		try
 		{
 			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
@@ -2008,6 +2397,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		System.out.println("Header return string::" + retString);
 		return retString;
 	}
+	@SuppressWarnings({  "rawtypes", "unused" })
 	private String getDetails(String mSiteCode, int mLineNoDist, String mDistOrder, String lsTranType, Connection conn) 
 			throws RemoteException, ITMException 
 			{
@@ -2086,7 +2476,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		            detail2hdr.append("<qty_order__alt>" + lcQty + "</qty_order__alt>");
 					/*hm.put("quantity", lcQty);
 					hm.put("qty_order__alt", lcQty);*/
-					lcQty = lcQty;
+					//lcQty = lcQty;
 				}
 				else
 				{
@@ -2121,6 +2511,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		return detail2hdr.toString();
 		//return hm;
 			}
+	@SuppressWarnings("unused")
 	private String calcExpiry(String tranDate, int months)
 	{
 		java.util.Date expDate = new java.util.Date();
@@ -2397,6 +2788,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		System.out.println("(int)noArt :" + (int)noArt);
 		return (int)noArt;
 	}
+	@SuppressWarnings("unused")
 	private  String getError(String saleOrder,String Code,Connection conn)  throws ITMException, Exception
 	{
 		String mainStr ="";
@@ -2445,6 +2837,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		}
 		return input.trim();
 	}
+	@SuppressWarnings("unused")
 	private String checkNull( String input )
 	{
 		if ( input == null )
@@ -2455,7 +2848,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 	}
 	private java.sql.Timestamp getCurrtDate() throws RemoteException,ITMException 
 	{
-		String currAppdate = "";
 		java.sql.Timestamp currDate = null;
 		try 
 		{
@@ -2474,6 +2866,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 	}
 	//private String allocStockLocCodeTo(ArrayList stkList,ArrayList tranIdIssList,String refSer,String refId,int countDso,Connection conn)  throws ITMException, Exception
 	//private String allocStockLocCodeTo(ArrayList stkList,Connection conn)  throws ITMException, Exception
+	@SuppressWarnings({ "unused", "rawtypes", "unchecked" })
 	private String allocStockLocCodeTo(ArrayList stkList,boolean deallocFlag,Connection conn)  throws ITMException, Exception
 	{
 		String result = "",locCodeTo = "",sqlUpdate = "",tranIdList = "",deallocQty = "";
@@ -2543,7 +2936,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		int countAWms = 0;
 		PreparedStatement pstmt=null;
 		ResultSet rs = null;
-		String sql = "",scheduleStatus = "";
+		String sql = "";
 		try
 		{
 			sql = "SELECT COUNT(*) AS COUNT FROM SWMS_TO_AWMS WHERE REF_ID = ?";
@@ -2597,6 +2990,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 	}
 	//private String despatchOrder(String saleOrder,String custCode,String tranId,Date lrDate,String invoiceNo, String xtraParams, Connection conn) throws RemoteException, ITMException
+	@SuppressWarnings("rawtypes")
 	private String despatchOrder(String saleOrder,ArrayList<String> lineNoList,String xtraParams,String locCode, Connection conn) throws RemoteException, ITMException
 	{
 		String userId = "", termId = "",custCode = "";
@@ -2624,34 +3018,28 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		String taxClass="";
 		String taxChap="";
 		String taxEnv = "";
-		String packCode ="",dlvTo="";
+		String packCode ="";
 		String siteCodeDet ="",convRtuomStduom="";
 		String rateStduom="",netAmt="";
-		String varValue = "",unitStd = "",noArt = "",packInstr="";
+		String unitStd = "",noArt = "",packInstr="";
 		String stanCodeDlv="",dlvAdd1="",dlvAdd2="",dlvAdd3="",dlvCity="",dlvPin="",countCodeDlv="",tranCode="",stanCodeInit="",status=" ",statusRemarks="",shipmentId="";
-		String lrDateVal="",siteCodeMfg="",pack_instr="",lineNo="";
+		String siteCodeMfg="",lineNo="";
-		Date orderDt = null,statusDate=null,expDate=null,mfgDate=null;
+		Date orderDt = null,expDate=null,mfgDate=null;
-		PreparedStatement pstmt = null,pstmt1 =null,pstmt2 =null;
+		PreparedStatement pstmt = null,pstmt1 =null;
-		ResultSet rs = null,rs1 = null,rs2=null;
+		ResultSet rs = null,rs1 = null;
 		double rateClg=0;
 		int lnno = 0;
 		E12GenericUtility genericUtility = new E12GenericUtility();
 		StringBuffer xmlBuff = null;
 		String xmlString = null,retString  = null;
-		ITMDBAccessEJB itmDBAccessLocal = null;
-		DistCommon dComm = new DistCommon();
 		String dimension="";
-		double qtyStk=0d,grossWeight=0d,tareWeight=0d,netWeight=0d,palletWt=0d,cAllocQty=0d,cQty=0d;
+		double qtyStk=0d,palletWt=0d,cAllocQty=0d,cQty=0d;
 		double balQty = 0d;
 		double grossPer = 0d;
 		double netPer = 0d;
 		double tarePer = 0d;
 		double grossWeight1 = 0d,tareWeight1 = 0d,netWeight1 = 0d;
 		DecimalFormat df = new DecimalFormat("#########.###");
-		String sqlTemp ="";
-		String trackInfoXml="" ,ipAddress="",trackRequest="";
-		double netWeightFmPorcp = 0d,tareWeightFmPorcp=0d,grossWeightFmPorcp=0d;
 		try   
 		{
 				System.out.println("@@@@@@@ despatchOrder  function called");
@@ -2690,9 +3078,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					dlvAdd1 = rs.getString("DLV_ADD1") == null ? " " : rs.getString("DLV_ADD1");
 					dlvAdd2 = rs.getString("DLV_ADD2") == null ? " " : rs.getString("DLV_ADD2");
 					dlvAdd3 = rs.getString("DLV_ADD3") == null ? " " : rs.getString("DLV_ADD3");
-					dlvTo = rs.getString("DLV_TO") == null ? " " : rs.getString("DLV_TO");
-					/*------------------------------------------------------------------------------*/
 					dlvCity = rs.getString("DLV_CITY") == null ? " " : rs.getString("DLV_CITY");
 					dlvPin = rs.getString("DLV_PIN") == null ? " " : rs.getString("DLV_PIN");
 					countCodeDlv = rs.getString("COUNT_CODE__DLV") == null ? " " : rs.getString("COUNT_CODE__DLV");
@@ -2700,7 +3085,6 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					stanCodeInit = rs.getString("STAN_CODE__INIT") == null ? "" : rs.getString("STAN_CODE__INIT");
 					//status = rs.getString("STATUS") == null ? " " : rs.getString("STATUS");
 					statusRemarks = rs.getString("STATUS_REMARKS") == null ? " " : rs.getString("STATUS_REMARKS");
-					statusDate = rs.getDate("STATUS_DATE");
 				}
 				rs.close();rs =null;
 				pstmt.close();pstmt = null;
@@ -3218,6 +3602,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		return retString;
 	}
+	@SuppressWarnings("unused")
 	private String getLocCodeTo(String itemCode,Connection conn)  throws ITMException, Exception
 	{
 		String locCodeTo = "",itemSerRg = "";

--- a/webitm-wms/ibase/webitm/ejb/wms/PhysicalCountAct.java
+++ b/webitm-wms/ibase/webitm/ejb/wms/PhysicalCountAct.java
+package ibase.webitm.ejb.wms;
+import ibase.utility.E12GenericUtility;
+import ibase.system.config.ConnDriver;
+import ibase.webitm.ejb.ActionHandlerEJB;
+import ibase.utility.CommonConstants;
+import ibase.webitm.utility.ITMException;
+import java.rmi.RemoteException;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import javax.ejb.Stateless;
+import org.w3c.dom.Document;
+@Stateless
+public class PhysicalCountAct extends ActionHandlerEJB implements PhysicalCountActLocal, PhysicalCountActRemote {
+	public String actionHandler(String actionType, String xmlString, String xmlString1, String objContext, String xtraParams) throws RemoteException, ITMException {
+		System.out.println("In " + this.getClass().getSimpleName() + " params:\n\t actionType [" + actionType + "] \n\t xmlString[" + xmlString + "] \n\t xmlString1 [" + xmlString1 + "] \n\t xtraParams [" + xtraParams + "]");
+		Document dom = null, dom1 = null;
+		String retString = "";
+		E12GenericUtility genericUtility = new E12GenericUtility();
+		try {
+			if (xmlString != null && xmlString.trim().length() > 0) {
+				dom = genericUtility.parseString(xmlString);
+			}
+			if (xmlString1 != null && xmlString1.trim().length() > 0) {
+				dom1 = genericUtility.parseString(xmlString1);
+			}
+			if (actionType.equalsIgnoreCase("Stock")) {
+				retString = actionStock(dom, dom1, objContext, xtraParams);
+			}
+		} catch (Exception e) {
+			System.out.println("Exception in " + this.getClass().getSimpleName() + " actionHandler (S) [" + e.getMessage() + "]");
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		System.out.println("Returning from " + this.getClass().getSimpleName() + " :actionHandler (S) [" + retString +"]");
+		return retString;
+	}
+	private String checkNull(String input) {
+		return input == null ? "" : input.trim();
+	}
+	private String actionStock(Document dom, Document dom1, String objContext, String xtraParams) throws RemoteException, ITMException {
+		String sql = "", itemCode = "", locCode = "", quantity = "", siteCode = "", stkItemCode = "", stkSiteCode = "",
+				stkUnit = "",  stklotNo = "", stklotSl = "", stkLocCode = "", lotSl = "", lotNo = "";
+		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
+		ConnDriver connDriver = new ConnDriver();
+		Connection conn = null;
+		PreparedStatement pstmt = null;
+		ResultSet rs = null;
+		E12GenericUtility genericUtility = new E12GenericUtility();
+		try {
+			//conn = connDriver.getConnectDB("DriverITM");
+			conn = getConnection();
+			itemCode = checkNull(genericUtility.getColumnValue("item_code", dom));
+			locCode = checkNull(genericUtility.getColumnValue("loc_code", dom));
+			quantity = checkNull(genericUtility.getColumnValue("quantity", dom));
+			siteCode = checkNull(genericUtility.getColumnValue("site_code", dom1));
+			lotSl = checkNull(genericUtility.getColumnValue("lot_sl", dom));
+			lotNo = checkNull(genericUtility.getColumnValue("lot_no", dom));
+			System.out.println("ItemCode:" + itemCode + ":locCode:" + locCode + ":siteCode:" + siteCode + ":" + ":lotNo:" + lotNo + ":locSl:" + lotSl);
+			sql = "select site_code, item_code, lot_no, lot_sl, loc_code, unit, nvl(quantity,0) as quantity from stock where site_code= ? "
+					+ " AND ITEM_CODE LIKE '" + itemCode + "%' "
+					+ " AND LOT_NO LIKE '" + lotNo + "%' "
+					+ " AND LOT_SL LIKE  '" + lotSl + "%' "
+					+ " AND LOC_CODE LIKE '" + locCode + "%' ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, siteCode);
+			rs = pstmt.executeQuery();
+			System.out.println("itemCode:" + itemCode + ":locCode:" + locCode + ":quantity:" + quantity + ":siteCode:" + siteCode + ":");
+			while (rs.next()) {
+				stkSiteCode = checkNull(rs.getString("SITE_CODE"));
+				stkItemCode = checkNull(rs.getString("ITEM_CODE"));
+				stklotNo = checkNull(rs.getString("LOT_NO"));
+				stklotSl = checkNull(rs.getString("LOT_SL"));
+				stkLocCode = checkNull(rs.getString("LOC_CODE"));
+				stkUnit = checkNull(rs.getString("UNIT"));				
+				valueXmlString.append("<Detail>\r\n");
+				valueXmlString.append("<item_code>").append("<![CDATA[").append(stkItemCode).append("]]>").append("</item_code>\r\n");
+				valueXmlString.append("<loc_code>").append("<![CDATA[").append(stkLocCode).append("]]>").append("</loc_code>\r\n");
+				valueXmlString.append("<lot_no>").append("<![CDATA[").append(stklotNo).append("]]>").append("</lot_no>\r\n");
+				valueXmlString.append("<lot_sl>").append("<![CDATA[").append(stklotSl).append("]]>").append("</lot_sl>\r\n");
+				valueXmlString.append("<unit>").append("<![CDATA[").append(stkUnit).append("]]>").append("</unit>\r\n");
+				valueXmlString.append("</Detail>\r\n");
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+			valueXmlString.append("</Root>\r\n");
+			/*String retXmlString = valueXmlString.toString();//genericUtility.serializeDom(genericUtility.parseString(valueXmlString.toString()));
+			valueXmlString = null;
+			valueXmlString = new StringBuffer(retXmlString);*/
+		} catch (Exception e) {
+			System.out.println("Exception in " + this.getClass().getSimpleName() + " actionHandler (S) [" + e.getMessage() + "]");
+			e.printStackTrace();
+			throw new ITMException(e);
+		} finally {
+			try {
+				if(conn != null) {
+					conn.close();
+					conn = null;
+				} if(rs != null) {
+					rs.close();
+					rs = null;
+				} if(pstmt != null) {
+					pstmt.close();
+					pstmt = null;
+				}
+			} catch (Exception e) {
+				System.out.println("Exception in " + this.getClass().getSimpleName() + " actionHandler (S) [" + e.getMessage() + "]");
+				e.printStackTrace();
+				throw new ITMException(e);
+			}
+		}
+		System.out.println("PhysicalCountAct:actionStock:Final Value :valueXmlString.toString():" + valueXmlString.toString());
+		return valueXmlString.toString();
+	}
+}
--- a/webitm-wms/ibase/webitm/ejb/wms/PhysicalCountActLocal.java
+++ b/webitm-wms/ibase/webitm/ejb/wms/PhysicalCountActLocal.java
+package ibase.webitm.ejb.wms;
+import java.rmi.RemoteException;
+import javax.ejb.Local;
+import ibase.webitm.ejb.ActionHandlerLocal;
+import ibase.webitm.utility.ITMException;
+@Local
+public interface PhysicalCountActLocal extends ActionHandlerLocal{
+	public String actionHandler(String actionType, String xmlString, String xmlString1, String objContext, String xtraParams) throws RemoteException,ITMException;
+}
--- a/webitm-wms/ibase/webitm/ejb/wms/PhysicalCountActRemote.java
+++ b/webitm-wms/ibase/webitm/ejb/wms/PhysicalCountActRemote.java
+package ibase.webitm.ejb.wms;
+import java.rmi.RemoteException;
+import javax.ejb.Remote;
+import ibase.webitm.ejb.ActionHandlerRemote;
+import ibase.webitm.utility.ITMException;
+@Remote
+public interface PhysicalCountActRemote extends ActionHandlerRemote {
+	public String actionHandler(String actionType, String xmlString, String xmlString1, String objContext, String xtraParams) throws RemoteException,ITMException;
+}