tran_id if not available detail2 taken from current detail

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

webitm-dis/ibase/webitm/ejb/dis/DespatchPos.java

@@ -126,11 +126,16 @@ public class DespatchPos extends ValidatorEJB implements DespatchPosLocal, Despa
 			//hdrDom = dom.getElementsByTagName("Detail1");
 			siteCode = GenericUtility.getInstance().getColumnValueFromNode("site_code",hdrDom.item(0));
 			tranId = GenericUtility.getInstance().getColumnValueFromNode("desp_id",hdrDom.item(0));
-			System.out.println("Site Code :: "+siteCode);
-			System.out.println("Tran ID :: "+tranId);
 			System.out.println("10/11/14 manohar executepostSaveRec DomID ["+domID+"] Update Status ["+updateStatus + "]");
 			currDetail  = getCurrentDetailFromDom(dom,domID);
 			updateStatus = getCurrentUpdateFlag(currDetail);
+			System.out.println("Site Code :: "+siteCode);
+			System.out.println("Tran ID :: "+tranId);
+			if (tranId == null || tranId.trim().length() == 0)
+			{
+				tranId  = GenericUtility.getInstance().getColumnValueFromNode("tran_id",currDetail);
+			}
+			System.out.println("Tran ID from currDetail  ["+tranId + "]");
 			System.out.println("DomID :: "+domID+"\n Update Status ::"+updateStatus);
 
 			if (currDetail != null && !updateStatus.equalsIgnoreCase("D"))

webitm-dis/ibase/webitm/ejb/dis/DistIssuePos.java

@@ -180,8 +180,6 @@ public class DistIssuePos extends ValidatorEJB implements DistIssuePosLocal, Dis
 			
 			siteCode = GenericUtility.getInstance().getColumnValueFromNode("site_code",hdrDom.item(0));
 			tranId = GenericUtility.getInstance().getColumnValueFromNode("tran_id",hdrDom.item(0));
-			System.out.println("Site Code :: "+siteCode);
-			System.out.println("Tran ID :: "+tranId);
 			//currDetail = getCurrentDetailFromDom(dom,domID);
 			//currDetail = dom.getElementsByTagName("Detail2").item(0);
 			/*if("distisswiz".equalsIgnoreCase(objName))
@@ -197,6 +195,13 @@ public class DistIssuePos extends ValidatorEJB implements DistIssuePosLocal, Dis
 			currDetail  = getCurrentDetailFromDom(dom,domID);
 			updateStatus = getCurrentUpdateFlag(currDetail);
 			
+			System.out.println("Site Code :: "+siteCode);
+			System.out.println("Tran ID :: "+tranId);
+			if (tranId == null || tranId.trim().length() == 0)
+			{
+				tranId  = GenericUtility.getInstance().getColumnValueFromNode("tran_id",currDetail);
+			}
+			System.out.println("Tran ID from currDetail  ["+tranId + "]");
 			System.out.println("DomID :: "+domID+"\n Update Status ::"+updateStatus);
 
 			if (currDetail != null && !updateStatus.equalsIgnoreCase("D"))