commited changes of item_parant

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

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

@@ -3267,15 +3267,18 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				{
 					saleOrderTemp = checkNullAndTrim(rs.getString("SALE_ORDER"));
 					
-					//Changes by Kaustubh on 3 Jan 2018 start
+					//Changes by Kaustubh on 24 Jan 2018 start
 
 					/*sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.TAB_NO,P.DSP_DATE,P.DISCOUNT,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? " 
 							+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT,  P.ITEM_CODE ";*/
 					
-					sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.TAB_NO,P.DSP_DATE,P.DISCOUNT,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT,P.TAX_XML FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? " 
-					+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT,  P.ITEM_CODE ";
+				/*	sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.TAB_NO,P.DSP_DATE,P.DISCOUNT,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT,P.TAX_XML FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? " 
+					+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT,  P.ITEM_CODE "; */
 					
-					//Changes by Kaustubh on 3 Jan 2018 end 
+					sql= " SELECT I.PRODUCT_CODE, P.ITEM_CODE, P.QUANTITY, P.TAB_NO,P.DSP_DATE,P.DISCOUNT,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT,P.TAX_XML FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? " 
+						+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.PRODUCT_CODE,  P.ITEM_CODE ";
+					
+					//Changes by Kaustubh on 24 Jan 2018 end 
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, saleOrderTemp);
 				}
@@ -3297,13 +3300,26 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 					+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY 1, 2 ";*/
 				
 				//Changed by wasim for adding discount column
-				sql = "SELECT  I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.CUST_SPEC__NO AS TAB_NO,P.DSP_DATE,P.DISCOUNT  FROM SORDDET P, ITEM I WHERE SALE_ORDER = ? AND " 
+				
+				// changes by kaustubh on 24 jan 2018 start 
+				
+				/*sql = "SELECT  I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.CUST_SPEC__NO AS TAB_NO,P.DSP_DATE,P.DISCOUNT  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,PT.DISCOUNT,PT.TAX_ENV,PT.TAX_CLASS,PT.TAX_CHAP,PT.TAX_AMT, PT.TAX_XML "
 						+ " FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? " 
+						+ " AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";  */
+				
+				sql = "SELECT  I.PRODUCT_CODE, P.ITEM_CODE, P.QUANTITY, P.CUST_SPEC__NO AS TAB_NO,P.DSP_DATE,P.DISCOUNT  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.PRODUCT_CODE, PT.ITEM_CODE, PT.QUANTITY, PT.TAB_NO, PT.DSP_DATE,PT.DISCOUNT,PT.TAX_ENV,PT.TAX_CLASS,PT.TAX_CHAP,PT.TAX_AMT, PT.TAX_XML "
+						+ " FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? " 
 						+ " AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
 				
+				
+				// changes by kaustubh on 24 jan 2018 end  
+				
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrder);
 				pstmt.setString(2, saleOrder);
@@ -3314,7 +3330,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			rs = pstmt.executeQuery();
 			while (rs.next())
 			{
-				itemParent = checkNullAndTrim(rs.getString("ITEM_PARNT"));
+				itemParent = checkNullAndTrim(rs.getString("PRODUCT_CODE"));
 				itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
 				dspDate = rs.getDate("DSP_DATE");
 				quantity = checkNullAndTrim(rs.getString("QUANTITY"));
@@ -4180,8 +4196,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			
 			if("DELETE".equalsIgnoreCase(quantity)) //Deleting accordian
 			{
+				// changes by kaustubh on 24 jan 2018 for product code start
 				//sql = " DELETE FROM SORDDET_TEMP WHERE SALE_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) ";
-				sql = " DELETE FROM SORDDET_TEMP WHERE SALE_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ?";
+				//sql = " DELETE FROM SORDDET_TEMP WHERE SALE_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ?";
+				  sql = " DELETE FROM SORDDET_TEMP WHERE SALE_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE PRODUCT_CODE = ?) AND TAB_NO = ?";
+				// changes by kaustubh on 24 jan 2018 for product code end
+				
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrderHdr);
 				pstmt.setString(2, itemCode);