Changes in sql

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/SorderCancel.java

@@ -553,7 +553,7 @@ public class SorderCancel extends ActionHandlerEJB implements SorderCancelLocal,
 			else
 			{
 				cnt = 0;
-				sql = "SELECT COUNT(1)  FROM SORDALLOC WHERE SALE_ORDER = ? AND CASE WHEN STATUS IS NULL THEN 'P' ELSE STATUS END <> 'D' ";
+				/*sql = "SELECT COUNT(1)  FROM SORDALLOC WHERE SALE_ORDER = ? AND CASE WHEN STATUS IS NULL THEN 'P' ELSE STATUS END <> 'D' ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, mSaleOrder.trim());
 				rs = pstmt.executeQuery();
@@ -574,9 +574,34 @@ public class SorderCancel extends ActionHandlerEJB implements SorderCancelLocal,
 
 				if(cnt > 0)
 				{
-					errString = itmDBAccess.getErrorString("", "VTALLOC02", "","",conn);
+					errString = itmDBAccess.getErrorString("", "VTALLOC02", "","",conn); ///COMMENTED  BY NANDKUMAR GADKARI ON 02/01/20
 					return errString;	
+				}*/
+				//ADDED  BY NANDKUMAR GADKARI ON 02/01/20------------START--------------------
+				sql = "SELECT COUNT(1)  FROM SORDALLOC WHERE SALE_ORDER = ? AND CASE WHEN STATUS IS NULL THEN 'P' ELSE STATUS END <> 'D' ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, mSaleOrder.trim());
+				rs = pstmt.executeQuery();
+				if( rs.next() )
+				{
+					cnt = rs.getInt(1);
+				}
+				if ( rs != null )
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pstmt != null )
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+
+				if(cnt > 0)
+				{
+					mStatus = "X";
 				}
+				//ADDED  BY NANDKUMAR GADKARI ON 02/01/20------------END--------------------
 				sql = "SELECT SUM(QTY_ALLOC) AS LD_QTY_ALLOC, SUM(QTY_DESP) AS LD_QTY_DESP 	FROM SORDITEM WHERE SALE_ORDER = ?  AND LINE_TYPE = 'I'";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, mSaleOrder.trim());
@@ -849,7 +874,7 @@ public class SorderCancel extends ActionHandlerEJB implements SorderCancelLocal,
 				while( rs1.next() )
 				{
 					lsSaleOrder = checkNull(rs1.getString("SALE_ORDER"));
-					asLineNo = checkNull(rs1.getString("LINE_NO"));
+					asLineNo = (rs1.getString("LINE_NO"));//REMOVED CHECK NULL BY NANDKUMAR GADKARI ON 02/01/20
 					lsExpLev = checkNull(rs1.getString("EXP_LEV"));
 					lsItemCode = checkNull(rs1.getString("ITEM_CODE"));
 					lsItemCodeOrd = checkNull(rs1.getString("ITEM_CODE__ORD"));
@@ -857,7 +882,7 @@ public class SorderCancel extends ActionHandlerEJB implements SorderCancelLocal,
 					lsLotNo = checkNull(rs1.getString("LOT_NO"));
 					lsLocCode = checkNull(rs1.getString("LOC_CODE"));
 					ldOrdQty = rs1.getDouble("QUANTITY");
-					ldAllocatedQty = (Double)rs1.getDouble("QTY_ALLOC") == null ? 0 : rs.getDouble("QTY_ALLOC");
+					ldAllocatedQty = (Double)rs1.getDouble("QTY_ALLOC") == null ? 0 : rs1.getDouble("QTY_ALLOC");//SET RS1 BY NANDKUMAR GADKARI ON 02/01/20
 					lsUnit = checkNull(rs1.getString("UNIT"));
 					lsStatus = checkNull(rs1.getString("STATUS"));
 					lsSiteCode = checkNull(rs1.getString("SITE_CODE"));
@@ -1364,7 +1389,7 @@ public class SorderCancel extends ActionHandlerEJB implements SorderCancelLocal,
 			}
 
 			count = 0;
-			sql = "select COUNT(1) SORDITEM where	SALE_ORDER	=	? and	(case when QTY_ALLOC is null then 0 else QTY_ALLOC end) > 0";
+			sql = "select COUNT(1) FROM  SORDITEM where	SALE_ORDER	=	? and	(case when QTY_ALLOC is null then 0 else QTY_ALLOC end) > 0";//FROM KEY WORD ADDED BY NANDKUMAR GADKARI ON 02/01/20
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, lsSaleOrder);
 			rs = pstmt.executeQuery();