tag by Ajay Jadhav

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

webitm-dis/ibase/webitm/ejb/dis/adv/PorderConf.java

@@ -1705,7 +1705,9 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
 			masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
 			System.out.println("-----------masterStateful------- " + masterStateful);
 			String [] authencate = new String[2];
-			authencate[0] = "";
+			//Changes By Ajay on 25-12-2017:START
+			authencate[0] = "userId";
+			//Changes  By Ajay on 25-12-2017:END
 			authencate[1] = "";
 			System.out.println("xmlString to masterstateful [" + xmlString + "]");
 			retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);

webitm-dis/ibase/webitm/ejb/dis/adv/SaleOrderHold.java

@@ -71,16 +71,20 @@ public class SaleOrderHold extends ActionHandlerEJB implements SaleOrderHoldLoca
 			
 			if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) ||  "mysql".equalsIgnoreCase(CommonConstants.DB_NAME ))
 			{
-				sql =  " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
-				
+				//Changes and Commented By Ajay on 22-12-2017:START
+				//sql =  " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
+			      sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update ";  
 			}
 			else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
 			{
-				sql =  " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
+				//sql =  " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
+				sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder (updlock) WHERE sale_order = ?";
 			}
 			else
 			{
-				sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
+				//sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
+				sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update nowait";
+				//Changes and Commented By Ajay on 22-12-2017:END
 			}
 			
 			pstmt  = conn.prepareStatement(sql);

webitm-dis/ibase/webitm/ejb/dis/adv/SaleOrderRelease.java

@@ -75,16 +75,21 @@ public class SaleOrderRelease extends ActionHandlerEJB implements SaleOrderRelea
 			
 			if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) ||  "mysql".equalsIgnoreCase(CommonConstants.DB_NAME ))
 			{
-				sql =  " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
+				//Changes and Commented By Ajay on 22-12-2017:START
+				//sql =  " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
+				sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update ";
 				
 			}
 			else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
 			{
-				sql =  " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
+				//sql =  " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
+				  sql =  "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder (updlock) WHERE sale_order = ? ";
 			}
 			else
 			{
-				sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
+				//sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
+				  sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update nowait";
+				//Changes and Commented By Ajay on 22-12-2017:END
 			}
 			pstmt  = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId);

webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java

@@ -66,8 +66,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
 
 			if (saleOrder != null && saleOrder.trim().length() > 0) 
 			{
-				sql = "	select cust_code , item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
-						" status, order_date   from sorder where sale_order = ? ";
+				//Changes and Commented By Ajay on 22-12-2017:START
+				//sql = "	select cust_code , item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
+				//		" status, order_date   from sorder where sale_order = ? ";
+				sql = "select cust_code , item_ser , site_code ,	due_date	, tot_amt, confirmed , " +
+						"(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status , order_date from sorder where sale_order = ?";
+				//Changes and Commented By Ajay on 22-12-2017:END
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, saleOrder);
 				rs = pstmt.executeQuery();