migrated from pb

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

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

@@ -1758,6 +1758,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						valueXmlString.append("<stk_opt protect =\"1\">").append("<![CDATA[" + stkOpt + "]]>").append("</stk_opt>");
 					} // end itm_defaultedit
 					else if(currentColumn.trim().equalsIgnoreCase("item_code"))
+					{
+						if( !"D".equalsIgnoreCase( getCurrentUpdateFlag( dom.getElementsByTagName("Detail2").item( 0 ) ) ) )
 						{
 							//System.out.println( "item_code itemchange !!!" ); 
 							retReplFlag = genericUtility.getColumnValue("ret_rep_flag",dom);
@@ -2143,6 +2145,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 							setNodeValue( dom, "cust_item__ref", itemRef );
 							valueXmlString.append("<cust_item_ref_descr>").append("<![CDATA[" + descr + "]]>").append("</cust_item_ref_descr>");
 							setNodeValue( dom, "cust_item_ref_descr", descr );
+						}
 					} //  end item_code
 					else if (currentColumn.trim().equals("ret_rep_flag") )			
 					{
@@ -5282,8 +5285,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 						}
 						if( childNodeName.equalsIgnoreCase( "ret_ref" ) )
 						{ 
-							mVal = genericUtility.getColumnValue( "ret_ref", dom );
-							lsRetOpt = genericUtility.getColumnValue( "ret_opt", dom );
+							mVal = getAbsString( genericUtility.getColumnValue( "ret_ref", dom ) );
+							lsRetOpt = getAbsString( genericUtility.getColumnValue( "ret_opt", dom ) );
 							if( "D".equalsIgnoreCase( lsRetOpt ) )
 							{
 								lsCustCode = genericUtility.getColumnValue( "cust_code", dom1 );
@@ -5316,7 +5319,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 									errList.add( errCode );
 									errFields.add( childNodeName.toLowerCase() );
 								}	
-							
+								cnt = 0;
 								sqlStr = " select count(*) ll_cnt "
 										+"	from sreturn "
 										+"	where confirmed = 'Y' "
@@ -5335,7 +5338,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 								pstmt.close();
 								pstmt = null;
 								
-								if( cnt == 0 )
+								if( cnt > 0 )
 								{
 									errCode = "VTRETREF2";
 									//errString = getErrorString( childNodeName, errCode, userId ); 
@@ -7136,8 +7139,13 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 				errList = null;
 				errFields.clear();
 				errFields = null;
-			}
 				
+				errStringXml.append("</Errors></Root>\r\n");
+			}
+			else
+			{
+				errStringXml = new StringBuffer( "" );
+			}
 		}//END TRY
 		catch(Exception e)
 		{
@@ -7166,7 +7174,7 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 				  throw new ITMException( d );
 				}
 		}
-		errStringXml.append("</Errors></Root>\r\n");
+		
 		errString = errStringXml.toString();
 		
 		return errString;
@@ -8262,6 +8270,26 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
 		return reqVal;
 	}	
 	
+	private String getCurrentUpdateFlag(Node currDetail)
+	{
+		NodeList currDetailList = null;
+		String updateStatus = "",nodeName = "";
+		int currDetailListLength = 0;
+
+		currDetailList = currDetail.getChildNodes();
+		currDetailListLength = currDetailList.getLength();
+		for (int i=0;i< currDetailListLength;i++)
+		{
+			nodeName = currDetailList.item(i).getNodeName();
+			if (nodeName.equalsIgnoreCase("Attribute"))
+			{
+				updateStatus = currDetailList.item(i).getAttributes().getNamedItem("updateFlag").getNodeValue();
+				break;
+			}
+		}
+		return updateStatus;		
+	}	
+
 }// END OF MAIN CLASS
 		
 		
\ No newline at end of file