added grp_code in pricelist wizard

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

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

@@ -28,7 +28,7 @@ public class PricelistGenEJB extends ValidatorEJB
 	DistCommon distCommon = new DistCommon();
 	DecimalFormat df = new DecimalFormat("0.00");
 	
-	public Object generateAndInsertPriceList(String productCode, ArrayList<HashMap<String, String>> targetPlist, String effFrom, String validUpto, String xtraParams, boolean isPreview, Connection conn) throws RemoteException,ITMException
+	public Object generateAndInsertPriceList(String productCode,String grpCode, ArrayList<HashMap<String, String>> targetPlist, String effFrom, String validUpto, String xtraParams, boolean isPreview, Connection conn) throws RemoteException,ITMException
 	{
 		String  trDate = "";
 		boolean isError = false;
@@ -42,11 +42,17 @@ public class PricelistGenEJB extends ValidatorEJB
 
 		try
 		{
-			System.out.println("PriceListGenEJB.generateAndInsertPriceList() : productCode["+productCode+"] effFrom["+effFrom+"] validUpto["+validUpto+"] isPreview["+isPreview+"]");
+			System.out.println("PriceListGenEJB.generateAndInsertPriceList() : productCode["+productCode+"] effFrom["+effFrom+"] validUpto["+validUpto+"] isPreview["+isPreview+"] grpCode["+grpCode+"]");
 
 			trDate = genericUtility.getValidDateString(new Date(), genericUtility.getApplDateFormat());
 			
-			sql = "SELECT ITEM_CODE, UNIT FROM ITEM WHERE PRODUCT_CODE = ?";
+			sql = "SELECT ITEM_CODE, UNIT FROM ITEM WHERE PRODUCT_CODE = ? ";
+			
+			if(grpCode!=null && grpCode.trim().length()>0)
+			{
+				sql+="AND GRP_CODE = '"+grpCode+"' " ;
+			}
+				
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, productCode);
 			

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

@@ -82,7 +82,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 		
 		String productCode="",descr="",loginUser="";
 		int currentFormNo = 0;
-		String siteCode = "", currDate = "", retString ="", dateFormat = "",
+		String siteCode = "", currDate = "", retString ="", dateFormat = "",grpCode="",
 		priceList="",plistParent,orderType="",manageType="",methodType="",freeQty="",freeOn="",discount="",remarks1="", tranType = "A";
 		boolean selectFlag=false,offerSelect=false;
 		DistCommon distCommon = new DistCommon();
@@ -144,7 +144,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 						rs=null;
 						if(existCnt>0)
 						{
-							String getPrvData="Select b.descr,a.product_code,a.eff_from,a.valid_upto,a.remarks,a.offer_free_qty,a.offer_free_on,a.disc_perc,A.tran_type "
+							String getPrvData="Select a.grp_code,b.descr,a.product_code,a.eff_from,a.valid_upto,a.remarks,a.offer_free_qty,a.offer_free_on,a.disc_perc,A.tran_type "
 									+ "from PRICING_MANAGE a,PRODUCT b "
 									+ "where a.product_code=b.product_code "
 									+ " and a.chg_user=?";
@@ -162,6 +162,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 								validUpto=rs.getTimestamp("valid_upto");
 								descr=E12GenericUtility.checkNull(rs.getString("descr"));
 								tranType = E12GenericUtility.checkNull(rs.getString("tran_type"));
+								grpCode=E12GenericUtility.checkNull(rs.getString("grp_code"));
 							}
 							pstmt.close();
 							pstmt=null;
@@ -202,12 +203,16 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 						valueXmlString.append("<chg_date><![CDATA[").append("").append( "]]></chg_date>");
 						valueXmlString.append("<chg_user><![CDATA[").append(loginUser).append( "]]></chg_user>");
 						valueXmlString.append("<chg_term><![CDATA[").append("").append( "]]></chg_term>");
+						
+						valueXmlString.append("<grp_code protect = \"1\"><![CDATA[").append(grpCode).append( "]]></grp_code>");
+						
 						valueXmlString.append("</Detail1>" );
 						
 					}
 					else if("product_code".equalsIgnoreCase(currentColumn))
 					{
 						productCode=e12genericUtility.getColumnValue("product_code",dom );
+						grpCode=e12genericUtility.getColumnValue("grp_code",dom );
 						System.out.println("productCode"+productCode);
 						
 						String sql="Select descr from product where product_code= ?";
@@ -224,6 +229,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 						rs=null;
 						valueXmlString.append("<Detail1 domID='1'>");
 						valueXmlString.append("<descr><![CDATA[").append(descr).append( "]]></descr>");
+						valueXmlString.append("<grp_code protect = \"0\"><![CDATA[").append(grpCode).append( "]]></grp_code>");
 						valueXmlString.append("</Detail1>" );
 					}
 					
@@ -607,7 +613,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 		Node parentNode = null;
 		int childNodeListLength;
 		Node childNode = null;
-		String errCode=null,errorType=null,productCode=null,userId=null;
+		String errCode=null,errorType=null,productCode=null,userId=null,grpCode=null;
 		int ctr=0,count=0,cnt=0;
 		E12GenericUtility e12genericUtility = new E12GenericUtility();
 		ArrayList <String> errList = new ArrayList<String>();
@@ -665,8 +671,36 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 								errFields.add( childNodeName.toLowerCase() );
 							}
 							
-							
-							
+							if(childNodeName.equalsIgnoreCase("grp_code")) 
+							{
+								grpCode=e12genericUtility.getColumnValue("grp_code", currFormDataDom);
+								
+								if(grpCode!=null || grpCode.trim().length()>0 )
+								{
+								String sql1="Select count(*) from item where product_code= ? and grp_code= ?";
+								pstmt=conn.prepareStatement(sql);
+								pstmt.setString(1, productCode);
+								pstmt.setString(2, grpCode);
+								rs=pstmt.executeQuery();
+								if(rs.next())
+								{
+									count=rs.getInt(1);
+								}
+								pstmt.close();
+								pstmt=null;
+								rs.close();
+								rs=null;
+								if(count==0)
+								{
+									errCode="VTINVGRPCD";
+									errList.add( errCode );
+									errFields.add( childNodeName.toLowerCase() );
+									
+								}
+								
+								}
+								
+							}
 						}
 					}
 					
@@ -923,7 +957,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 	@SuppressWarnings("unchecked")
 	public HashMap<String,ArrayList<HashMap<String,String>>> insertDB(Document dom,Document dom1,Document dom2,String loginUser,String xtraParams,Connection conn) throws SQLException
 	{
-		String tranId="",qty="",qtyFreeOn="",tranType=null,discPerc=null,productCode=null,remarks=null,priceList=null,plistParent=null,listType=null,calcMethod=null,mstprice=null;
+		String tranId="",qty="",qtyFreeOn="",tranType=null,discPerc=null,productCode=null,remarks=null,priceList=null,plistParent=null,listType=null,calcMethod=null,mstprice=null,grpCode=null;
 		int lineNo=0,headcnt=0,hdelcnt=0,detdelcnt=0;
 		int [] batchCount;
 		ArrayList<HashMap<String, String>> targetPlist =new ArrayList();
@@ -954,6 +988,9 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 			
 			qty=genericUtility.getColumnValue("offer_free_qty", dom1);
 			productCode=genericUtility.getColumnValue("product_code", dom1);
+			
+			grpCode=checkNull(genericUtility.getColumnValue("grp_code", dom1));
+			
 			qtyFreeOn=genericUtility.getColumnValue("offer_free_on", dom1);
 			remarks=genericUtility.getColumnValue("remarks", dom1);
 			
@@ -1012,7 +1049,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 			uniqueKey = tg.generateTranSeqID("P-WIZ", keyCol, keyString,
 					conn);
 			System.out.println("uniqueKey :" + uniqueKey);
-			String sql="Insert into pricing_manage(tran_id,tran_date,product_code,eff_from,valid_upto,remarks,tran_type,offer_free_qty,offer_free_on,disc_perc,chg_user) values(?,?,?,?,?,?,?,?,?,?,?)";
+			String sql="Insert into pricing_manage(tran_id,tran_date,product_code,eff_from,valid_upto,remarks,tran_type,offer_free_qty,offer_free_on,disc_perc,chg_user,grp_code) values(?,?,?,?,?,?,?,?,?,?,?,?)";
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1, uniqueKey);
 			pstmt.setTimestamp(2, currAppdate);
@@ -1025,6 +1062,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 			pstmt.setString(9, checkNull(qtyFreeOn));
 			pstmt.setString(10, checkNull(discPerc));
 			pstmt.setString(11, checkNull(loginUser));
+			pstmt.setString(12, checkNull(grpCode));
 			System.out.println("uniqueKey["+uniqueKey+"] currAppdate["+currAppdate+"] productCode["+productCode+"] effFrom["+effFrom+"] "
 					+ "validUpto["+validUpto+"]remarks["+remarks+"]tranType"+tranType+"] qty["+qty+"]qtyFreeOn["+qtyFreeOn+"]discPerc["+discPerc+"]");
 			headcnt=pstmt.executeUpdate();
@@ -1091,7 +1129,7 @@ public class PricelistGenWizEJB extends ValidatorEJB implements PricelistGenWizE
 			System.out.println("sending ArrayList"+targetPlist);
 			
 			PricelistGenEJB ins = new PricelistGenEJB();
-			Object retObj = ins.generateAndInsertPriceList(productCode, targetPlist, genericUtility.getColumnValue("eff_from", dom1), genericUtility.getColumnValue("valid_upto", dom1), xtraParams, true, conn);
+			Object retObj = ins.generateAndInsertPriceList(productCode,grpCode, targetPlist, genericUtility.getColumnValue("eff_from", dom1), genericUtility.getColumnValue("valid_upto", dom1), xtraParams, true, conn);
 			if(retObj instanceof HashMap<?, ?>)
 			{
 				generateAndInsertPriceList = (HashMap<String, ArrayList<HashMap<String, String>>>) retObj;

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

@@ -49,7 +49,7 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
 	public String postSave(Document dom,String tranId,String xtraParams,Connection conn) throws ITMException
 	{
 		String retString = "";
-		String nodeName = "", productCode = "", effFrom = "", validUpto = "", mstPricelist = "", priceListTar = "", priceListParent = "", calcMethod = "",
+		String nodeName = "", productCode = "", effFrom = "", validUpto = "", mstPricelist = "", priceListTar = "", priceListParent = "", calcMethod = "",grpCode="",
 			   freeQty = "", freeOnQty = "", discPerc = "", listType = "", loginUser = "";
 		ArrayList<HashMap<String, String>> inserPlist = new ArrayList<HashMap<String, String>>();
 		boolean isError = false;
@@ -99,6 +99,14 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
 								validUpto = eachDetail1Element.getFirstChild().getNodeValue();
 							}
 						}
+						else if("grp_code".equalsIgnoreCase(nodeName))
+						{
+							if (eachDetail1Element.getFirstChild() != null)
+							{
+								grpCode = eachDetail1Element.getFirstChild().getNodeValue();
+							}
+						}
+						
 					}
 				}
 			}
@@ -168,6 +176,7 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
 								calcMethod = eachDetail2Element.getFirstChild().getNodeValue();
 							}
 						}
+						
 					}
 				}
 				
@@ -187,7 +196,7 @@ public class PricelistGenWizPos extends ValidatorEJB implements PricelistGenWizP
 			System.out.println("final insert plist in pos save["+inserPlist+"]");
 			
 			PricelistGenEJB ins = new PricelistGenEJB();
-			Object retObj = ins.generateAndInsertPriceList(productCode, inserPlist, effFrom, validUpto, xtraParams, false, conn);
+			Object retObj = ins.generateAndInsertPriceList(productCode,grpCode, inserPlist, effFrom, validUpto, xtraParams, false, conn);
 			if(retObj instanceof String)
 			{
 				System.out.println("retObj["+(String) retObj+"]");

webitm-dis/module-resource/js/PlistgenWiz.js

@@ -24,19 +24,26 @@ else if (window.XMLHttpRequest) /*code for IE7+, Firefox, Chrome, Opera, Safari*
 	httpRequest = new XMLHttpRequest(); 
 }
 
-function getListOfValues(fieldName,fieldId,siteCode)
+function getListOfValues(fieldName,fieldId,siteCode,popUpParam)
 {
-	var url = "";
+	var url = "", keyStringVal = "NULL", urlParamString = "";
 	popHelpId = fieldId;
 	
 	if(document.getElementById(popHelpId).value.trim() != "" || document.getElementById(popHelpId).value != null)
 	{
 		curFieldVal = document.getElementById(popHelpId).value;
 	}
+
+	if(popUpParam != undefined && popUpParam.trim().length>0 )
+	{
+		keyStringVal = "0."+popUpParam;
+		urlParamString = "&"+ popUpParam +"="+document.getElementById("Detail1.1."+popUpParam).value;
+ 		
+	}	
 	
 	var addObjName = "&OBJ_NAME=plistgen_wiz";
 	
-	url  = "/ibase/webitm/jsp/PopUp.jsp?FIELDNAME="+escape(fieldName)+"&KEYSTRING=NULL"+addObjName;
+	url  = "/ibase/webitm/jsp/PopUp.jsp?FIELDNAME="+escape(fieldName)+"&KEYSTRING="+keyStringVal+"&OBJ_NAME="+addObjName+urlParamString;
 
 	
 	var fullwidth = eval(screen.width)/2-130;