Wavegen Wizard Check-in by Santosh

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

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java

@@ -176,6 +176,13 @@ etc
 						valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
 						valueXmlString.append( "<item_ser__from><![CDATA[" ).append( "00" ).append( "]]></item_ser__from>\r\n" );
 						valueXmlString.append( "<item_ser__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" );
+						//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [Start]
+						valueXmlString.append( "<sort_order><![CDATA[" ).append( "Default" ).append( "]]></sort_order>\r\n" );
+						valueXmlString.append( "<product_style__from><![CDATA[" ).append( "00" ).append( "]]></product_style__from>\r\n" );
+						valueXmlString.append( "<product_style__to><![CDATA[" ).append( "ZZ" ).append( "]]></product_style__to>\r\n" );
+						valueXmlString.append( "<credit_term__from><![CDATA[" ).append( "00" ).append( "]]></credit_term__from>\r\n" );
+						valueXmlString.append( "<credit_term__to><![CDATA[" ).append( "ZZ" ).append( "]]></credit_term__to>\r\n" );
+						//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [End]
 						valueXmlString.append( "<item_code__from><![CDATA[" ).append( "00" ).append( "]]></item_code__from>\r\n" );
 						valueXmlString.append( "<item_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_code__to>\r\n" );
 						valueXmlString.append( "<cust_code__from><![CDATA[" ).append( "00" ).append( "]]></cust_code__from>\r\n" );

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -345,6 +345,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		//Changed by Sneha on 16-05-2016 [Start]
 		String carrierCodeInput = "";
 		//Changed by Sneha on 16-05-2016 [End]
+		//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [Start]
+		String itemParentFrom="",itemParentTo="", custPODate = "", sortOrder = "", creditTermFrom = "", creditTermTo = "", orderByStr="";
+		String[] sortOrderValueArry = null;
+		//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [End]
 		
 		retTabSepStrBuff = new StringBuffer( "<?xml version='1.0' encoding='UTF-8'?>\r\n<DocumentRoot>\r\n<description>Datawindow Root</description>\r\n<group0>\r\n" +
 		"<description>Group0 description</description>\r\n<Header0>\r\n<description>Header0 members</description>\r\n");
@@ -516,6 +520,51 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			}
 			//System.out.println(" carrier_code =========>> " + carrierCodeInput);
 			//Changed by Sneha on 16-05-2016 [End]
+			//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [Start]
+			
+			itemParentFrom = genericUtility.getColumnValue("product_style__from",headerDom);         
+			if ( itemParentFrom == null || itemParentFrom.trim().length() == 0 )
+			{
+				itemParentFrom = "";
+				System.out.println("Item Parent from is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+
+			itemParentTo = genericUtility.getColumnValue("product_style__to",headerDom);         
+			if ( itemParentTo == null || itemParentTo.trim().length() == 0 )
+			{
+				itemParentTo = "";
+				System.out.println("Item parent to is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			sortOrder = genericUtility.getColumnValue("sort_order",headerDom);         
+			if ( sortOrder == null || sortOrder.trim().length() == 0 )
+			{
+				sortOrder = "";
+				System.out.println("Sort Order is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+
+			creditTermFrom = genericUtility.getColumnValue("credit_term__from",headerDom);         
+			if ( creditTermFrom == null || creditTermFrom.trim().length() == 0 )
+			{
+				creditTermFrom = "";
+				System.out.println("Credit Term From is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			creditTermTo = genericUtility.getColumnValue("credit_term__to",headerDom);         
+			if ( creditTermTo == null || creditTermTo.trim().length() == 0 )
+			{
+				creditTermTo = "";
+				System.out.println("Credit Term To is Null...");
+				errString = itmDBAccessEJB.getErrorString("","VTMRPPARM","","",conn);
+				return errString;
+			}
+			//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [End]
 			
 			globalSingleLot = checkNull(genericUtility.getColumnValue("single_lot",headerDom));
 			globalMasterPackAllow = checkNull(genericUtility.getColumnValue("master_pack_allow",headerDom));
@@ -570,7 +619,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			+" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS  UNIT__STD, SORDDET.CONV__QTY_STDUOM "
 			//chnaged by pragyan on 15/10/14 for cold chain
 			//+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
-			+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT " ;
+			//[W16GKAT008] Changed by Santosh on 23/11/16 to add cust po and po date
+			//+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT " ;
+			+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT,SORDER.DLV_CITY, SORDER.CUST_PORD, SORDER.PORD_DATE, FN_PAYAMT_CHECK(SORDER.CUST_CODE) AS PEND_CUST_AMT " ;
 
 			//Changed By Manish on 04/11/15
 			projectName = distCommon.getDisparams("999999","PROJECT",conn);
@@ -599,7 +650,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					   +" ITEM.ITEM_CODE <=? ";*/
 
 			//changed by manish on 02/09/15 for Ms sql server databse (add left outer join in query in place of (+)).
-			getDataSql = getDataSql +"FROM SORDDET,SORDER,SORDITEM,ITEM ,CUSTOMER C,  "
+			//Changed by Santosh on 23/11/16 to CRTERM join
+			//getDataSql = getDataSql +"FROM SORDDET,SORDER,SORDITEM,ITEM ,CUSTOMER C,  "
+			getDataSql = getDataSql +"FROM SORDDET,SORDER,SORDITEM,ITEM ,CRTERM, CUSTOMER C,  "
 			+"CUSTOMER LEFT OUTER JOIN WAVE_TYPE WAVE_TYPE ON(CUSTOMER.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE) "
 			+"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
 			+"( SORDITEM.SALE_ORDER = SORDER.SALE_ORDER ) AND "
@@ -607,6 +660,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			+"( SORDITEM.ITEM_CODE = ITEM.ITEM_CODE ) AND "
 			+"( SORDER.CUST_CODE = CUSTOMER.CUST_CODE ) AND  "
 			+"( SORDDET.SITE_CODE = SORDITEM.SITE_CODE ) AND  "
+			//Added By Santosh on 23/11/16 to add CRTERM join
+			+"(SORDER.CR_TERM = CRTERM.CR_TERM) AND "
 			//Changed By Pragyan 17-SEP-13 To join the wave type with cust_code__dlv
 			//+"( CUSTOMER.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
 			//+"( C.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
@@ -627,6 +682,47 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			} 
 			//Changed by Sneha on 16-05-2016 for carrier code fliter in sql [End]
 			
+			//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [Start]
+			getDataSql +=" AND ITEM.ITEM_PARNT >='"+itemParentFrom+"'";
+			getDataSql +=" AND ITEM.ITEM_PARNT <='"+itemParentTo+"'";
+			getDataSql +=" AND SORDER.CR_TERM  >= '"+creditTermFrom+"'";
+			getDataSql +=" AND SORDER.CR_TERM  <= '"+creditTermTo+"'";
+			
+			System.out.println("Wave Generation SortOrder string is["+sortOrder+"]");
+			
+			if("Default".equalsIgnoreCase(sortOrder))
+			{
+				orderByStr = "";
+			}
+			else
+			{
+				sortOrderValueArry = sortOrder.split(",");
+				
+				for(int i=0; i<sortOrderValueArry.length; i++)
+				{
+					if("Customer Rank".equalsIgnoreCase(sortOrderValueArry[i]))
+					{
+						orderByStr += "CUSTOMER.CUST_PRIORITY,";
+					}
+					else if("Credit Term Rank".equalsIgnoreCase(sortOrderValueArry[i]))
+					{
+						orderByStr += "CRTERM.CR_TERM_PRIORITY,";
+					}
+					else if("Canellation Date".equalsIgnoreCase(sortOrderValueArry[i]))
+					{
+						orderByStr += "SORDER.DUE_DATE,";
+					}
+					else if("Pending Payments".equalsIgnoreCase(sortOrderValueArry[i]))
+					{
+						orderByStr += "PEND_CUST_AMT,";
+					}
+				}
+			}
+			
+			System.out.println("orderByStr for ["+sortOrder+"] sort order is ["+orderByStr+"]");
+			
+			//[W16GKAT008] Added by Santosh on 23/11/16 to add item_parnt from and to filter [End]
+			
 			System.out.println("new batch id is ---"+ batchID);
 			if(batchID.trim().length() > 0)
 			{
@@ -684,17 +780,23 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				System.out.println("ordtypeGetData::::::::"+saleOrdertype);
 				if("mssql".equalsIgnoreCase(DB))
 				{
-					getDataSql = getDataSql + " AND RTRIM(LTRIM ( SORDER.ORDER_TYPE )) = ? ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+					//Changed by Santosh on 23/11/16 to add order by string
+					//getDataSql = getDataSql + " AND RTRIM(LTRIM ( SORDER.ORDER_TYPE )) = ? ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+					getDataSql = getDataSql + " AND RTRIM(LTRIM ( SORDER.ORDER_TYPE )) = ? ORDER BY "+orderByStr+" SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
 				}
 				else
 				{
-					getDataSql = getDataSql + " AND TRIM ( SORDER.ORDER_TYPE ) = ? ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+					//Changed by Santosh on 23/11/16 to add order by string
+					//getDataSql = getDataSql + " AND TRIM ( SORDER.ORDER_TYPE ) = ? ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+					getDataSql = getDataSql + " AND TRIM ( SORDER.ORDER_TYPE ) = ? ORDER BY "+orderByStr+" SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
 				}
 			}
 			else
 			{
 				System.out.println("no sale order type");
-				getDataSql = getDataSql + " ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+				//Changed by Santosh on 23/11/16 to add order by string
+				//getDataSql = getDataSql + " ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
+				getDataSql = getDataSql + " ORDER BY "+orderByStr+" SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD "; 
 			}
 			//changed by sankara on 04/02/14 for getting sale order type end.
 			resrvLoc  = discommon.getDisparams("999999","RESERV_LOCATION",conn);         
@@ -1546,6 +1648,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						retTabSepStrBuff.append( "<cust_code__dlv><![CDATA[" ).append(checkNull(rs.getString("CUST_CODE__DLV"))).append( "]]></cust_code__dlv>\r\n" );
 						retTabSepStrBuff.append( "<customer_cust_name><![CDATA[" ).append(checkNull(rs.getString("CUST_DLV_NAME"))).append( "]]></customer_cust_name>\r\n" );
 					    changed by sankara on 25/07/13 cust_code_dlv,name already declared in above end....		*/
+						//[W16GKAT008] Added by Santosh on 23/11/16 to add cust po and po date[Start]
+						custPODate = checkNull(rs.getString("PORD_DATE"));
+						custPODate = "".equalsIgnoreCase(custPODate) ? "" : genericUtility.getValidDateString( custPODate , dbDateFmt, applDateFmt );
+						retTabSepStrBuff.append( "<cust_pord><![CDATA[" ).append(checkNull(rs.getString("CUST_PORD"))).append( "]]></cust_pord>\r\n" );
+						retTabSepStrBuff.append( "<pord_date><![CDATA[" ).append(custPODate).append( "]]></pord_date>\r\n" );
+						retTabSepStrBuff.append( "<dlv_city><![CDATA[" ).append(checkNull(rs.getString("DLV_CITY"))).append( "]]></dlv_city>\r\n" );
+						//[W16GKAT008] Added by Santosh on 23/11/16 to add cust po and po date[End]
 						retTabSepStrBuff.append( "</Detail2>\r\n" );
 					}
 				}while(rs.next());
@@ -5300,6 +5409,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				{				
 					errString="VTCOMPL";
 					errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
+					//Added by Santosh on 23/11/16 to format errString for Wavegen Wizard Screen [Start]
+					errString = getWaveIDErrorStr(waveId, errString,conn);
+					//Added by Santosh on 23/11/16 to format errString for Wavegen Wizard Screen [End]
 					return errString;
 				}
 				//Changed by sumit on 07/08/12 display massage for report generated succesfully end.
@@ -26821,6 +26933,29 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	}
 	//Changed by samadhan on 04/12/2015 for handling special characters End
 
+	//Added by Santosh on 23/11/16 to format errString for Wavegen Wizard Screen [Start]
+	private String getWaveIDErrorStr(String waveID, String oldErrString, Connection conn)
+	{
+		String retErrStr ="";
+		
+		try
+		{
+			String begPart = oldErrString.substring(0,oldErrString.indexOf("</description>"));
+			String endDesc = oldErrString.substring(oldErrString.indexOf("</description>")+14);
+			retErrStr= begPart+". Wave ID["+waveId+"]</description>"+endDesc;
+			System.out.println("retErrStr::::::::::::::::::["+retErrStr+"]");
+			
+		}
+		catch(Exception e)
+		{
+			System.out.println("WaveGenerationPrc.getWaveIDErrorStr()"+e.getMessage());
+			e.printStackTrace();
+		}
+		
+		return retErrStr;
+	}
+	//Added by Santosh on 23/11/16 to format errString for Wavegen Wizard Screen [End]
+	
 	//Changed by samadhan on 23/02/2016 for hold sale order start
 	private  String holdSaleOrder(String reasonErr)  throws ITMException, Exception
 	{