W16FKAT002 updated Source for opening screen from standard screen

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

webitm-wms/ibase/webitm/bean/wms/PorderDetailBean.java

@@ -77,7 +77,8 @@ public class PorderDetailBean
 			{
 				defaultPath = ".." + File.separator + "webapps" + File.separator + "ibase" + File.separator + CommonConstants.ITM_CONTEXT + File.separator;
 			}
-			File xslPath = new File( defaultPath + File.separator  + "xsl" + File.separator + CommonConstants.THEME + File.separator + "WIZARD");
+			//File xslPath = new File( defaultPath + File.separator  + "xsl" + File.separator + CommonConstants.THEME + File.separator + "WIZARD");
+			File xslPath = new File( defaultPath + File.separator  + "xsl" + File.separator + CommonConstants.THEME + File.separator + "WIZARD" + File.separator + "Galaxy");
 			if ( !xslPath.exists() )
 			{
 				xslPath.mkdir();

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

@@ -2660,7 +2660,39 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 				currDate = sdf.format(new java.util.Date());
 				
 				int count = 0;
-				String sql = "";
+				String sql = "",conf = "";
+				
+				sql = " SELECT CONFIRMED FROM PORDER WHERE PURC_ORDER = ? ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, purcOrder);
+				rs = pstmt.executeQuery();
+				if (rs.next())
+				{
+					conf = checkNullAndTrim(rs.getString("CONFIRMED"));
+					count++;
+				}
+				if (rs != null) 
+				{					
+					rs.close();rs = null;
+				}
+				if (pstmt != null ) 
+				{					
+					pstmt.close();pstmt = null;
+				}
+				
+				if("Y".equalsIgnoreCase(conf))
+				{
+					return "Y";
+				}
+				
+				if(count == 0)
+				{
+					return "0";
+				}
+				else //else purchase order is present
+				{
+					count = 0;
+					
 					sql = " SELECT COUNT(1) FROM PORDER_TEMP WHERE PURC_ORDER = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, purcOrder);
@@ -2679,7 +2711,6 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 						pstmt.close();
 						pstmt = null;
 					}
-				
 					if(count > 0)	// 
 					{
 						sql = " SELECT PURC_ORDER, ORD_DATE, TRAN_DATE, IND_NO, PORD_TYPE, ITEM_SER, TASK_DESC, SUPP_CODE, SUPP_NAME, CR_TERM, CRTERM_DESCR," 
@@ -2961,6 +2992,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
 					//valueXmlString.append("<udf_str__3>").append("<![CDATA[]]>").append("</udf_str__3>\r\n");
 					valueXmlString.append("</Detail1>\r\n");
 				}
+			} 
 			catch (Exception e) 
 			{
 				e.printStackTrace();