W16FKAT002 updated source for item code pop help for sales and purchase

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

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

@@ -1401,7 +1401,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			}
 			else if ("item_code".equalsIgnoreCase(field))
 			{
-				sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL AND ITEM_SER = ? ";
+				//sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL AND ITEM_SER = ? ";
+				sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL ";
 			}
 			else if ("state_code__dlv".equalsIgnoreCase(field))
 			{
@@ -1424,11 +1425,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			
 			pstmt = conn.prepareStatement(sql);
 			
-			if ("item_code".equalsIgnoreCase(field))
+			/*if ("item_code".equalsIgnoreCase(field))
 			{
 				pstmt.setString(1, values[1]);
 			}
-			else if ( param.length() > 0 && ("cust_code".equalsIgnoreCase(field) || "cust_code__dlv".equalsIgnoreCase(field) || "cust_code__bil".equalsIgnoreCase(field)))
+			else*/
+			if ( param.length() > 0 && ("cust_code".equalsIgnoreCase(field) || "cust_code__dlv".equalsIgnoreCase(field) || "cust_code__bil".equalsIgnoreCase(field)))
 			{
 				pstmt.setString(1, param);
 			}
@@ -1572,7 +1574,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 		return valueXmlString.toString();
 	}
 	
-	public String getAutoSearchData(String param, String field) throws ITMException
+	public String getAutoSearchData(String param, String field, String parameters) throws ITMException
 	{
 		String sql = "";
 		StringBuffer valueXmlString = new StringBuffer("<?xml version = \"1.0\" encoding=\"UTF-8\" ?> \r\n <Root>\r\n");
@@ -1581,10 +1583,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 		ResultSet rs = null;
 		try 
 		{
-			System.out.println("Inside getAutoSearchData getList---->Param["+param+"] Field["+field+"]");
+			System.out.println("Inside getAutoSearchData getList---->Param["+param+"] Field["+field+"] Parameters ["+parameters+"]");
 			
 			conn = getConnection();
 			
+			String [] extras = parameters.split("~"); 
+			
 			valueXmlString.append("<DOCUMENTROOT><DESCRIPTION/><METADATA><DEFAULT_COL>1</DEFAULT_COL></METADATA><GROUP0><DESCRIPTION/><HEADER0>");
 			
 			if ("cust_code".equalsIgnoreCase(field))	
@@ -1607,13 +1611,45 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			}
 			else if ("item_code".equalsIgnoreCase(field))
 			{
-				sql = " SELECT ITEM_PARNT,DESCR,ITEM_SER FROM ITEM WHERE ITEM_PARNT LIKE UPPER ('"+param+"%') ";
+				if(parameters.length() > 0 )
+				{
+					if("T".equalsIgnoreCase(extras[1]))	
+					{
+				    	sql =" SELECT ITEM_CODE,DESCR,ITEM_SER FROM ITEM WHERE ITEM_CODE "
+							+" IN (SELECT  DISTINCT ITEM_PARNT FROM ITEM WHERE ITEM_CODE IN " 
+						    +" (SELECT ITEM_CODE FROM SUPPLIERITEM WHERE SUPP_CODE = ? )) AND ITEM_CODE LIKE UPPER ('"+param+"%') ";
+					}
+					else
+					{
+						sql =" SELECT I.ITEM_CODE,I.DESCR,I.ITEM_SER FROM ITEM I,ITEMSER S WHERE I.ITEM_CODE IN " +
+							 " (SELECT ITEM_CODE FROM SUPPLIERITEM WHERE SUPP_CODE = ? ) " +
+							 " AND I.ITEM_SER = S.ITEM_SER AND S.BUSINESS_TYPE  = ? AND I.ITEM_CODE LIKE UPPER ('"+param+"%') ";
+					}
+				}
+				else
+				{
+					sql = " SELECT ITEM_CODE,DESCR,ITEM_SER FROM ITEM WHERE ITEM_PARNT IS NULL AND ITEM_CODE LIKE UPPER ('"+param+"%') ";
+				}
+				
 			}
 			
 			System.out.println("Sql is="+sql);
 			
 			pstmt = conn.prepareStatement(sql);
 
+			if("item_code".equalsIgnoreCase(field) && parameters.length() > 0)
+			{
+				if("T".equalsIgnoreCase(extras[1]))	
+				{
+					pstmt.setString(1,extras[0]);
+				}
+				else
+				{
+					pstmt.setString(1,extras[0]);
+					pstmt.setString(2,extras[1]);
+				}
+			}
+			
 			rs = pstmt.executeQuery();
 			
 			int num = 1;
@@ -2493,7 +2529,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 					+ "SELECT  I.ITEM_PARNT, PT.ITEM_CODE, PT.QUANTITY FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? " 
 					+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY 1, 2 ";*/
 				
-				sql = "SELECT  I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.LINE_NO AS TAB_NO,P.DSP_DATE  FROM SORDDET P, ITEM I WHERE SALE_ORDER = ? AND " 
+				sql = "SELECT  I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.CUST_SPEC__NO AS TAB_NO,P.DSP_DATE  FROM SORDDET P, ITEM I WHERE SALE_ORDER = ? AND " 
 						+ "I.ITEM_CODE = P.ITEM_CODE AND P.ITEM_CODE NOT IN (SELECT  PT.ITEM_CODE FROM SORDDET_TEMP PT WHERE SALE_ORDER = ? ) " 
 						+ "UNION  " 
 						+ "SELECT  I.ITEM_PARNT, PT.ITEM_CODE, PT.QUANTITY, PT.TAB_NO, PT.DSP_DATE FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? " 
@@ -4338,4 +4374,5 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 		timestamp = Timestamp.valueOf(sdf1.format(frDate).toString() + " 00:00:00.0");
 		return timestamp;
 	}
+	
 }

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

@@ -25,4 +25,7 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
 	public String getSorderDetail(String saleOrder,String flag) throws ITMException;
 	public String SaveSorderDetail(String str) throws ITMException;
 	public String getSKUDetail(String itemParent,String itemDLVDate,String paraData,String details) throws ITMException ;
+	
+	public String getAutoSearchData(String searchStr,String field,String param) throws ITMException ;
+	public String getDocIDImages(String refSer,String refId,String imgStr) throws ITMException ;
 }

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

@@ -25,4 +25,7 @@ public interface SorderWizardEJBRemote extends ValidatorRemote
 	public String getSorderDetail(String saleOrder,String flag) throws ITMException;
 	public String SaveSorderDetail(String str) throws ITMException;
 	public String getSKUDetail(String itemParent,String itemDLVDate,String paraData,String details) throws ITMException;
+	
+	public String getAutoSearchData(String searchStr,String field,String param) throws ITMException ;
+	public String getDocIDImages(String refSer,String refId,String imgStr) throws ITMException ;
 }

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

@@ -376,7 +376,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
             //xmlStringHdr.append("</Detail1>");
 	
             StringBuffer xmlStringDet = new StringBuffer();
-			String lineNoOrd = "",itemCode = "",taxChap = "",taxClass = "",taxEnv = "",empCodeAprv = "",unit = "",unitRate = "",itmFlag = "",itemDescr = "",dspDate = "";
+			String lineNoCntr = "",lineNoOrd = "",itemCode = "",taxChap = "",taxClass = "",taxEnv = "",empCodeAprv = "",unit = "",unitRate = "",itmFlag = "",itemDescr = "",dspDate = "";
 			int domID = 0;
 			double quantity = 0,rate = 0,rateStd = 0,rateClg = 0;
 			
@@ -452,6 +452,10 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
 					{
 						dspDate = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
 					}
+					else if(childNode != null && "line_no__contr".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
+					{
+						lineNoCntr = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
+					}
 				}
 				 domID++;
 				 
@@ -483,6 +487,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
 				 xmlStringDet.append("<conv__qty_stduom>").append("<![CDATA[" + 1 + "]]>").append("</conv__qty_stduom>");
 				 xmlStringDet.append("<conv__rtuom_stduom>").append("<![CDATA[" + 1 + "]]>").append("</conv__rtuom_stduom>");
 				 xmlStringDet.append("<dsp_date>").append("<![CDATA["+dspDate+"]]>").append("</dsp_date>");
+				 xmlStringDet.append("<cust_spec__no>").append("<![CDATA["+lineNoCntr+"]]>").append("</cust_spec__no>");
 				 
 				 xmlStringDet.append("</Detail2>");