D14IKAT004 updated term table query

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

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

@@ -520,7 +520,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 						valueXmlString.append("<site_code__dlv>").append("<![CDATA["+siteCode+"]]>").append("</site_code__dlv>\r\n");
 						valueXmlString.append("<site_code__ord>").append("<![CDATA["+siteCode+"]]>").append("</site_code__ord>\r\n");
 						valueXmlString.append("<site_descr>").append("<![CDATA["+siteDescr+"]]>").append("</site_descr>\r\n");
-						valueXmlString.append("<pord_type>").append("<![CDATA[]]>").append("</pord_type>\r\n");
+						valueXmlString.append("<pord_type>").append("<![CDATA[T]]>").append("</pord_type>\r\n");
 						valueXmlString.append("<task_desc>").append("<![CDATA[]]>").append("</task_desc>\r\n");
 						valueXmlString.append("<site_add1>").append("<![CDATA[]]>").append("</site_add1>\r\n");
 						valueXmlString.append("<emp_code>").append("<![CDATA["+empCode+"]]>").append("</emp_code>\r\n");
@@ -801,7 +801,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 			
 			else if (field.equals("term_table"))
 			{
-					sql = " SELECT FLD_VALUE, DESCR FROM GENCODES WHERE FLD_NAME = 'TERM_TABLE          ' AND MOD_NAME = 'W_PORDER' ";
+					sql = " SELECT FLD_VALUE, DESCR FROM GENCODES WHERE FLD_NAME = 'TERM_TABLE' AND MOD_NAME = 'W_PORDER' ";
 			}
 			
 			pstmt = conn.prepareStatement(sql);
@@ -1487,8 +1487,17 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 			Connection conn = null;
 			PreparedStatement pstmt = null;
 			ResultSet rs = null;
+			String sql = "";
+			
 			String purcOrder = "";
 			String remarks = "";
+			String suppCode = "";
+			String suppName = "";
+			String taxAmt = "";
+			String itemCode = "";
+			String totAmt = "";
+			String quantity = "";
+			
 			StringBuffer details = new StringBuffer("<finish>"); 
 			
 			try
@@ -1496,22 +1505,65 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 				ConnDriver connDriver = new ConnDriver();
 				conn = connDriver.getConnectDB("DriverITM");
 				
-				String sql = "SELECT PURC_ORDER,REMARKS FROM PORDER WHERE UDF_STR__2 = ?";
+				sql = "SELECT PURC_ORDER,REMARKS,SUPP_CODE,TAX_AMT FROM PORDER WHERE UDF_STR__2 = ?";
 				pstmt = conn.prepareStatement(sql);			
 				pstmt.setString(1,random);			
 				rs = pstmt.executeQuery();
 				
 				while(rs.next())
 				{
-					purcOrder = rs.getString("PURC_ORDER");
-					remarks = rs.getString("REMARKS");
+					purcOrder = checkNullAndTrim(rs.getString("PURC_ORDER"));
+					remarks   = checkNullAndTrim(rs.getString("REMARKS"));
+					suppCode  = checkNullAndTrim(rs.getString("SUPP_CODE"));
+					taxAmt    = checkNullAndTrim(rs.getString("TAX_AMT"));
 				}		
 				
+				rs.close();rs = null;
+				pstmt.close();pstmt = null;
+				
 				details.append("<fieldId><![CDATA[").append(purcOrder).append("]]></fieldId>\r\n");
 				details.append("<fieldValue><![CDATA[").append(remarks).append("]]></fieldValue>\r\n");
+				details.append("<supp_code><![CDATA[").append(suppCode).append("]]></supp_code>\r\n");
+				details.append("<tax_amt><![CDATA[").append(taxAmt).append("]]></tax_amt>\r\n");
 				
-				details.append("</finish>");
 				
+				sql = "SELECT SUPP_NAME FROM SUPPLIER WHERE SUPP_CODE = ?";
+				pstmt = conn.prepareStatement(sql);			
+				pstmt.setString(1,suppCode);			
+				rs = pstmt.executeQuery();
+				
+				while(rs.next())
+				{
+					suppName = checkNullAndTrim(rs.getString("SUPP_NAME"));
+				}		
+				
+				rs.close();rs = null;
+				pstmt.close();pstmt = null;
+				
+				
+				sql = "SELECT ITEM_CODE,TOT_AMT,QUANTITY FROM PORDDET WHERE PURC_ORDER = ? ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, purcOrder);
+				rs = pstmt.executeQuery();
+				int domID = 0;
+				
+				while(rs.next())
+				{
+					itemCode  = checkNullAndTrim(rs.getString("ITEM_CODE"));
+					totAmt 	  = checkNullAndTrim(rs.getString("TOT_AMT"));
+					quantity  = checkNullAndTrim(rs.getString("QUANTITY"));
+					domID++;
+					
+					details.append("<supp_name><![CDATA[").append(suppName).append("]]></supp_name>\r\n");
+					details.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>\r\n");
+					details.append("<tot_amt><![CDATA[").append(totAmt).append("]]></tot_amt>\r\n");
+					details.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
+					
+				}
+				rs.close();rs = null;
+				pstmt.close();pstmt = null;
+				
+				details.append("</finish>");
 			}
 			catch(Exception e)
 			{