Secondary sales related changes.

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

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

@@ -3585,6 +3585,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 				//Node detailNode3 = dom.getElementsByTagName((new StringBuilder("Detail")).append(currentFormNo).toString()).item(0);
 				if(currentColumn.trim().equals("itm_default"))
 				{	
+					String dlvFlg ="";
 					//NodeList parentNodeList1 = null;
 					NodeList childNodeList1 = null;
 					Node parentNode1 = null;
@@ -3602,6 +3603,24 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 	                    childNodeListLength1 = childNodeList1.getLength();
 	                    System.out.println("childNodeListLength1::: "+ childNodeListLength1+"\n");
 	                   
+	                    //Added by Pratheek[to get dlv_flg value]-Start
+	                    for(int chldRow = 0; chldRow < childNodeListLength1; chldRow++ )
+		                {
+	                    	   childNode1 = childNodeList1.item(chldRow);
+	                    	   childNodeName = childNode1.getNodeName();
+		                       System.out.println("childNodeName :"+childNodeName);
+		                       
+		                       if(childNodeName.equals("dlv_flg"))
+		                       {
+		                        	if(childNode1.getFirstChild()!=null)
+		                            {
+		                        		dlvFlg = childNode1.getFirstChild().getNodeValue();
+		                            	System.out.println("dlvFlagDom :"+dlvFlg);
+		                            }
+		                       } 
+		                 }
+	                  //Added by Pratheek[to get dlv_flg value]-End
+	                    
 	                    for (int childRow = 0; childRow < childNodeListLength1; childRow++)
 	                    {
 	                        childNode1 = childNodeList1.item(childRow);
@@ -3632,6 +3651,12 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 	                            	invoiceIdDom = childNode1.getFirstChild().getNodeValue();
 	                            	System.out.println("Detail3 invoiceIdDom:::]" +invoiceIdDom);
 		                            System.out.println("dlvFlagDom : "+dlvFlagDom);
+		                        	//Added by Pratheek[to get dlv_flg value and set the dlv_flg value to the dom]-Start
+	                            	if(dlvFlg !=null)
+	                            	{
+	                            		dlvFlagDom = dlvFlg;
+	                            	}
+	                            	//Added by Pratheek[to get dlv_flg value and set the dlv_flg value to the dom]-End
 		                            if(dlvFlagDom.equalsIgnoreCase("Y"))
 		                            {
 			                            if(childRow != (childNodeListLength1 - 1))

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

@@ -398,8 +398,9 @@ public class CustStockGWTWizIC extends ValidatorEJB implements CustStockGWTWizIC
 				for (int ctr = childList.getLength(); ctr >= 0; ctr--)
 				//for (int ctr = 0; ctr < childList.getLength(); ctr++)
 				{
-					childNode = childList.item(ctr);
-					//System.out.println("childNode>>>"+childNode);
+					//Added by Pratheek[when click on previous button duplicate item code exception issue]-Start
+					childNode = childList.item(ctr-1);
+					//Added by Pratheek[when click on previous button duplicate item code exception issue]-End
 					
 					if(childNode != null &&  childNode.getNodeName().equalsIgnoreCase("attribute"))
 					{
@@ -433,11 +434,13 @@ public class CustStockGWTWizIC extends ValidatorEJB implements CustStockGWTWizIC
 					
 				}
 				System.out.println("itemCodeDom>>>>"+itemCodeDom+"@@@@@@itemCode>>>"+itemCode);
-				if (itemCode.trim().equalsIgnoreCase(itemCodeDom.trim()))
+				//Added by Pratheek[when click on previous button duplicate item code exception issue]-Start
+				if (itemCode.trim().equalsIgnoreCase(itemCodeDom.trim()) && !lineNo.trim().equalsIgnoreCase(lineNoDom))
 				{
 					isDulplicate = true;
 					break;
 				}
+				//Added by Pratheek[when click on previous button duplicate item code exception issue]-End
 				
 			}//for loop