Updated the js for product Wizard changes

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

webitm-wms/module-resource/web/js/prodWiz_Common.js

@@ -214,7 +214,10 @@
 		}
 		else if(setColumnValues == "defaultBarcode")
 		{
-			document.getElementById("barcode_flag").value = xmldoc;
+			if(xmldoc == "Y")
+			{
+				setBarcodeVal(xmldoc);	
+			}
 		}
 		else
 		{
@@ -652,8 +655,24 @@
 	 {
 		var action = "SET_DEFAULT_BARCODE_FLAG";
 		var url = "/ibase/ProdWizItemChangeServlet?ACTION="+action;
-		makeRequest( url, "defaultBarcode");	
+		makeRequest( url, "defaultBarcode");
+	 }
+	 
+	 function setBarcodeVal(xmldoc)
+	 {
+		 if(xmldoc == "Y")
+		 {
+			 //alert("Barcode will be auto generated.");
+			 var maxId = $('#SKUItemId tbody tr').length;
+			 for(var i = 1; i <= maxId; i++)
+			 {
+				 document.getElementById("Detail2."+i+".item_barcode").readOnly = true;
+			 }
+		 }
 	 }
+	 
+
+	
 	 // Changed by Sneha on 24-11-2016, to auto generate barcode [End]
 	
 	function checkDate()

webitm-wms/module-resource/web/js/prodWiz_Edit.js

@@ -1659,9 +1659,15 @@
 				}
 				else if (document.getElementById("Detail"+formNo+"."+dbID+".item_barcode").value == "")
 				{
-					alert("Please Enter Barcode for Product '"+ document.getElementById("Detail"+formNo+"."+dbID+".descr").value +"'.");
-					document.getElementById("Detail"+formNo+"."+dbID+".item_barcode").focus();
-					return false;
+					 defaultBarcodeFlag();
+					 if(xmldoc == "N")
+					 {
+						alert("Please Enter Barcode for Product '"+ document.getElementById("Detail"+formNo+"."+dbID+".descr").value +"'.");
+						document.getElementById("Detail"+formNo+"."+dbID+".item_barcode").focus();
+						return false;
+					 }
+					
+					
 				}
 				// Added by parikshit on 17/7/15 to make alert end
 				
@@ -2047,13 +2053,7 @@
 		
 		defaultBarcodeFlag();
 		//alert("valueFromServlet for defaultBarcodeFlag --->>"+valueFromServlet);
-		
-		if(valueFromServlet == "Y")
-		{
-			defaultBarcodeVal();
-			//alert("valueFromServlet for defaultBarcodeVal -3333333-->>"+valueFromServlet);
-		}
-		
+
 		//alert("itemCode---"+itemCode);	
 		//itmparntChangeNew(itemCode, "GET_ITEM_DESCR");
 		//alert("valueFromServlet for GET_ITEM_DESCR --->>"+valueFromServlet);
@@ -2378,7 +2378,7 @@
 		document.getElementById("Detail3."+ maxRowId +".descr").value = itemParntDescr;
 		//document.getElementById("Detail3."+ maxRowId +".descr").innerHTML = itemParntDescr;
 		document.getElementById("Detail3."+ maxRowId +".language_dtl").value = languageDtl;
-		document.getElementById("Detail3."+ maxRowId +".item_barcode").value = valueFromServlet;
+		//document.getElementById("Detail3."+ maxRowId +".item_barcode").value = valueFromServlet;
 		document.getElementById("Detail3."+ maxRowId +".descr").focus();
 		
 		
@@ -2395,6 +2395,14 @@
 		{
 			document.getElementById("Detail3."+maxRowId+".phy_attrib_4").value = "";
 		}
+		
+		if(valueFromServlet == "Y")
+		{
+			//defaultBarcodeVal();
+			//alert("valueFromServlet for defaultBarcodeVal -3333333-->>"+valueFromServlet);
+			document.getElementById("Detail3."+maxRowId+".item_barcode").readOnly = "true";
+			
+		}
 		// Changed by Sneha on 28-10-2016, for customer item reference [End]
 	}	
 	
@@ -2482,6 +2490,10 @@
 		{
 			setCustItemRefVal(xmldoc);	// from prodWiz_Form_I.js 
 		}
+		else if(setColumnValues == "defaultBarcode")
+		{
+			setBarcodeVal(xmldoc);
+		}
 		// Changed by Sneha on 25-10-2016, for customer item reference [End]
 		//setColumnValuesNew( xmldoc );
 		
@@ -2768,12 +2780,25 @@
 		makeRequestNew( url, "defaultBarcode");	
 	 }
 	 
-	 function defaultBarcodeVal()
+	 function setBarcodeVal(xmldoc)
+	 {
+		 if(xmldoc == "Y")
+		 {
+			 //alert("Barcode will be auto generated.");
+			 var maxId = $('#SKUItemId tbody tr').length;
+			 for(var i = 1; i <= maxId; i++)
+			 {
+				 document.getElementById("Detail3."+i+".item_barcode").readOnly = true;
+			 }
+		 }
+	 }
+	 
+	 /*function defaultBarcodeVal()
 	 {
 		 var action = "GET_DEFAULT_BARCODE_VAL";
 		 var url = "/ibase/ProdWizItemChangeServlet?ACTION="+action;
 		 makeRequestNew( url, "");	
-	 }
+	 }*/
 	 // Changed by Sneha on 24-11-2016, to auto generate barcode [End]
 	 
 	 
\ No newline at end of file

webitm-wms/module-resource/web/js/prodWiz_Popup.js

@@ -845,7 +845,7 @@
 	}
 	
 	//  Changed by Sneha on 04-11-2016, to add new to upload images [Start]
-	function uploadImg(objName)
+	/*function uploadImg(objName)
 	{
 		//alert(objName);
 		var refId = document.getElementById("Detail1.1.item_parnt").value;
@@ -858,7 +858,7 @@
 			var url = "/ibase/webitm/jsp/ITMAttachmentView.jsp?OBJ_NAME="+objName+"&REF_ID="+refId;
 			var win = window.open( url, 'Product Details', 'toolbar=no,status=yes,resizable=no,scrollbars=yes,left=100,top=50,width=500,height=550' );
 		}
-	}
+	}*/
 	//Changed by Sneha on 04-11-2016, to add new to upload images [End]