changes to get tran_id from current detail as it was not available in header

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

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

@@ -142,6 +142,13 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 			
 			
 			currDetail	 = getCurrentDetailFromDom(dom,domID);
+			
+			if (tranId == null || tranId.trim().length() == 0)
+			{
+				tranId  = GenericUtility.getInstance().getColumnValueFromNode("tran_id",currDetail);
+			}
+			System.out.println("Tran ID from currDetail  ["+tranId + "]");
+			
 			updateStatus = getCurrentUpdateFlag(currDetail);
 			
 			System.out.println("manohar 10/11/14 executepreSaveRec DomID ["+domID+"] Update Status ["+updateStatus + "]");
@@ -177,9 +184,17 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 				sordNo			= GenericUtility.getInstance().getColumnValueFromNode("sord_no",currDetail);
 				lineNoSord		= GenericUtility.getInstance().getColumnValueFromNode("line_no__sord",currDetail);
 
+				itemCode = itemCode == null ? "" :itemCode;
+				sordNo = sordNo == null ? "" :sordNo;
+				lineNoSord = lineNoSord == null ? "" :lineNoSord;
+				locCode = locCode == null ? "" :locCode;
+				lotNo = lotNo == null ? "" :lotNo;
+				lotSl = lotSl == null ? "" :lotSl;
+				expLev = expLev == null ? "" :expLev;
+				itemCodeOrd = itemCodeOrd == null ? "" :itemCodeOrd;
 
-				currkey=itemCode.trim()+"@"+sordNo.trim()+"@"+lineNoSord.trim()+"@"+locCode.trim()+"@"+lotNo.trim()+"@"+lotSl.trim()+"@"+expLev.trim()+"@"+itemCodeOrd.trim();
-				System.out.println("currkey---"+currkey);
+				currkey=itemCode.trim()+"@"+sordNo.trim()+"@"+lineNoSord.trim()+"@"+locCode.trim()+"@"+lotNo.trim()+"@"+lotSl.trim()+"@"+expLev.trim();
+				System.out.println("currkey---["+currkey + "]");
 				sql="SELECT SUM(QUANTITY) FROM DESPATCHDET "
 						+"WHERE SORD_NO = ? "
 						  +"AND LINE_NO__SORD = ? "
@@ -225,7 +240,7 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 				lotSl=(genericUtility.getColumnValueFromNode("lot_sl",dom.getElementsByTagName(detailNode).item(i))).trim();
 				expLev=(genericUtility.getColumnValueFromNode("exp_lev",dom.getElementsByTagName(detailNode).item(i))).trim();
 				itemCodeOrd=(genericUtility.getColumnValueFromNode("item_code__ord",dom.getElementsByTagName(detailNode).item(i))).trim();
-				keyString=itemCode.trim()+"@"+sordNo.trim()+"@"+lineNoSord.trim()+"@"+locCode.trim()+"@"+lotNo.trim()+"@"+lotSl.trim()+"@"+expLev.trim()+"@"+itemCodeOrd.trim();
+				keyString=itemCode.trim()+"@"+sordNo.trim()+"@"+lineNoSord.trim()+"@"+locCode.trim()+"@"+lotNo.trim()+"@"+lotSl.trim()+"@"+expLev.trim();
 				System.out.println("keyString----"+keyString);
 				System.out.println("currlineNo----"+currlineNo);
 				System.out.println("lineNo----"+lineNo);
@@ -256,6 +271,10 @@ public class DespatchPrs extends ValidatorEJB implements DespatchPrsLocal, Despa
 				sordNo			= GenericUtility.getInstance().getColumnValueFromNode("sord_no",currDetail);
 				lineNoSord		= GenericUtility.getInstance().getColumnValueFromNode("line_no__sord",currDetail);
 				// 04/04/12 manoharan
+				if (qtyStduomStr == null || "null".equals(qtyStduomStr) || qtyStduomStr.trim().length() ==0 )
+				{
+					qtyStduomStr = "0";
+				}
 				qtyStduom = Double.parseDouble(qtyStduomStr);	
 				// 22/02/10 manoharan if allocation found in sordalloc the deallocate
 				if (updateStatus.equalsIgnoreCase("A"))

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

@@ -203,6 +203,11 @@ public class DistIssuePrs extends ValidatorEJB implements DistIssuePrsLocal, Dis
 			updateStatus = getCurrentUpdateFlag(currDetail);
 			*/
 			currDetail	 = getCurrentDetailFromDom(dom,domID);
+			if (tranId == null || tranId.trim().length() == 0)
+			{
+				tranId  = GenericUtility.getInstance().getColumnValueFromNode("tran_id",currDetail);
+			}
+			System.out.println("Tran ID from currDetail  ["+tranId + "]");
 			updateStatus = getCurrentUpdateFlag(currDetail);
 			
 			System.out.println("updateStatus :"+updateStatus);