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

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

@@ -69,9 +69,36 @@ public class SCMWebServiceDao extends ValidatorEJB
 					System.out.println("In Side Receipt advance :");
 					String RefNo  = (this.e12GenericUtility.getColumnValueFromNode("ref_no", detail1Node));
 					String CustCode  = (this.e12GenericUtility.getColumnValueFromNode("cust_code", detail1Node));
+					//Added By PriyankaC on 16JAN2019.
+					String uniqueId  = (this.e12GenericUtility.getColumnValueFromNode("unique_id", detail1Node));
 
 					this.setUserInfo(userInfoBean);
 					conn = getConnection();
+					if(RefNo == null || RefNo.trim().length() ==0)
+					{
+						sql = "select tran_id from receipt where GUID = ? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, uniqueId);
+						rs = pstmt.executeQuery();
+						if (rs.next())
+						{
+							tranid = E12GenericUtility.checkNull(rs.getString("tran_id"));
+						}
+						System.out.println("tranid["+tranid+"]");
+						if (pstmt != null)
+						{
+							pstmt.close();
+							pstmt = null;
+						}
+						if (rs != null)
+						{
+							rs.close();
+							rs = null;
+						}
+					}
+					//Added By PriyankaC on 16JAN2019.
+					else
+					{
 						sql = "select tran_id from receipt where ref_no = ? and cust_code = ?";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, RefNo);
@@ -92,6 +119,8 @@ public class SCMWebServiceDao extends ValidatorEJB
 							rs.close();
 							rs = null;
 						}
+					}
+					
 					
 					System.out.println("Calling setNodeValue :");
 					setNodeValue( dataXMLDom, "receipt_no",  tranid );