W16FKAT002 updated source for tab number issue

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

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

@@ -3087,7 +3087,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 			    {
 					//System.out.println("Inside 333333333 ["+ purcOrder +"]");
 					
-					sql = "SELECT  I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.LINE_NO AS TAB_NO  FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND " 
+					sql = "SELECT  I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.FORM_NO AS TAB_NO  FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND " 
 						+ "I.ITEM_CODE = P.ITEM_CODE AND P.Item_code not in (SELECT  PT.ITEM_CODE FROM PORDDET_TEMP PT WHERE PURC_ORDER = ? ) " 
 						+ "UNION  " 
 						+ "SELECT  I.ITEM_PARNT, PT.ITEM_CODE, PT.DLV_DATE, PT.QUANTITY, PT.TAB_NO FROM PORDDET_TEMP PT, ITEM I WHERE PURC_ORDER = ? " 
@@ -3457,9 +3457,15 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 				
 				if("DELETE".equalsIgnoreCase(detail[2])) //Deleting accordian
 				{
-					System.out.println("Inside delete acrrodian");
+					System.out.println("Inside delete acrrodian["+pordType+"]");
 					//sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ?";
 					//sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) ";
+					
+					if(pordType == null || pordType.length() == 0)
+					{
+						pordType = checkNullAndTrim(detail[9]);
+					}
+					
 					if("T".equalsIgnoreCase(pordType))
 					{
 						sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE IN (SELECT ITEM_CODE FROM ITEM WHERE ITEM_PARNT = ?) AND TAB_NO = ? ";
@@ -3558,7 +3564,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 			}
 			catch (Exception e)
 			{
-				System.out.println("Inside catchs savePorderDetail");
+				System.out.println("Inside catchs savePorderDetail"+e.getMessage());
 				e.printStackTrace();
 				isError = true;
 			}

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

@@ -605,7 +605,7 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB
 
 			int noArt = 0;
 			
-			String lineNoOrd = "";
+			String lineNoOrd = "",formNo = "";
 	
 			String lotNo = "";
 			int domID = 0;
@@ -702,6 +702,10 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB
 						taxChap = childNode.getFirstChild().getNodeValue();
 						System.out.println("taxChap============["+taxChap+"]");
 					}
+					else if(childNode != null && "form_no".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
+					{
+						formNo = childNode.getFirstChild().getNodeValue();
+					}
 					
 					//Changed by Manish on 02/02/16 for getting proper tax[end]
 				}
@@ -830,6 +834,7 @@ public class DDPorderWizPosEJB extends ValidatorEJB implements DDPorderWizPosEJB
 				xmlString.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>");
 				xmlString.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>");
 				
+				xmlString.append("<form_no><![CDATA[").append(formNo).append("]]></form_no>");
                 xmlString.append("</Detail2>");
 	            System.out.println("xmlString For generation Purchase Order:: "+xmlString.toString());
 			}