DI90SUN041 ParseQuantity is allowed and continue

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

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

@@ -640,9 +640,9 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 			java.util.Properties p = appConnect.getProperty();
 			InitialContext ctx = new InitialContext(p);
 
-//			ConsumeIssueHome consumeIssueHome = (ConsumeIssueHome)ctx.lookup("ConsumeIssue");
-//			Validator consumeIssueRemote = consumeIssueHome.create();
-//			System.out.println("ConsumeIssue Created");
+			//ConsumeIssueHome consumeIssueHome = (ConsumeIssueHome)ctx.lookup("ConsumeIssue");
+			//Validator consumeIssueRemote = consumeIssueHome.create();
+			//System.out.println("ConsumeIssue Created");
 
 			//Added Changes - Gulzar - 25-04-07
 			detailList = dom.getElementsByTagName("Detail2");
@@ -670,7 +670,8 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 				//Added on 25/10/06
 				String varValue = "",stkExpLoc = "";
 				varValue = itmDBAccess.getEnvDis("999999","NEAREXP_LOC",null);
-				if(varValue != null && varValue.trim().length() > 0 && !(varValue.equalsIgnoreCase("NULLFOUND"))){
+				if(varValue != null && varValue.trim().length() > 0 && !(varValue.equalsIgnoreCase("NULLFOUND")))
+				{
 					stkExpLoc = varValue;
 				}
 				//End - 25/10/06
@@ -720,6 +721,12 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 				partQuantity = genericUtility.getColumnValue("part_qty", dom1);
 				//End Add - Gulzar - 25/04/07
 				System.out.println("locCode :"+locCode);
+				//Changes done by Chandni  shah -01/09/10
+				if(partQuantity == null || partQuantity.trim().length()== 0) // partial quantity is set as X when it is null
+				{
+					partQuantity = "X";
+				}
+				
 				if (locCode == null || "null".equalsIgnoreCase(locCode) || locCode.trim().length() == 0)
 				{
 					System.out.println("If locCode = null || length() == 0");
@@ -727,41 +734,96 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 					System.out.println("If locCode is null then [%] :"+locCode);
 				}
 				if (lotNo == null || lotNo.trim().length() == 0)
+				// The stock join location master and join invstat with location master inv_st, 
+				// join the location master loc_code with stock loc_code
 				{
 					sql = "SELECT (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "
-						 +"FROM STOCK A, INVSTAT B "
-						 +"WHERE A.INV_STAT  = B.INV_STAT "
+						 +"FROM STOCK A, LOCATION L, INVSTAT B "
+						 +"WHERE L.LOC_CODE = A.LOC_CODE "
+						 + " AND L.INV_STAT  = B.INV_STAT "
 						 +"AND A.ITEM_CODE = '"+itemCode+"' "
 						 +"AND A.SITE_CODE = '"+siteCodeReq+"' "
 						 +"AND B.AVAILABLE = '"+availableYn+"' "
 						 +"AND A.QUANTITY  > 0 "
 						 +"AND A.LOC_CODE  LIKE '"+locCode+"' ";		
+					
+				}
+				//Added by Chandni  shah -01/09/10
+				else 
+				{
+					sql = "SELECT (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "
+						 +"FROM STOCK A, LOCATION L, INVSTAT B "
+						 +"WHERE L.LOC_CODE = A.LOC_CODE "
+						 + " AND L.INV_STAT  = B.INV_STAT "
+						  +"AND A.ITEM_CODE = '"+itemCode+"' "
+						  +"AND A.SITE_CODE = '"+siteCodeReq+"' "
+						  +"AND A.LOC_CODE  = '"+locCode+"' "
+						  +"AND A.LOT_NO    = '"+lotNo+"' "
+						  +"AND A.LOT_SL	 = '"+lotSl+"' "
+						  +"AND (A.QUANTITY - A.ALLOC_QTY) >="+quantity
+						  +" AND B.AVAILABLE = '"+availableYn+"'";			
+				}//
 				System.out.println("sql :"+sql);
 				rs = stmt.executeQuery(sql);
 				if (rs.next())
 				{
 					stockQuantity = rs.getDouble(1);
 					System.out.println("stockQuantity :"+stockQuantity);
+					//acctCode = rs.getString(2);//
+					//System.out.println("acctCode :"+acctCode);//
+					//cctrCode = rs.getString(3);//
+					//System.out.println("cctrCode :"+cctrCode);//
 				}
-					if (stockQuantity == 0)
+				//Changes done by Chandni  shah -01/09/10
+				if (stockQuantity == 0  && "X".equals(partQuantity))
 				{
 					errCode = "VTNOSTK";
 					errString = itmDBAccess.getErrorString("",errCode,"","",conn);
 					System.out.println("errString :"+errString);
 					return errString;
 				}
+				else if (stockQuantity == 0)
+				{
+					continue;
+				}	
+				//
 				stmt.close();
+				
+				if (lotNo == null || lotNo.trim().length() == 0) //Changes done by Chandni  shah -01/09/10 
+				{
+					// The stock join location master and join invstat with location master inv_st, 
+					// join the location master loc_code with stock loc_code
 					sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - A.ALLOC_QTY), A.EXP_DATE, A.UNIT, "
 						  +"A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, " 
 						  +"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE "  
-						  +"FROM STOCK A, INVSTAT B "
-						  +"WHERE A.INV_STAT  = B.INV_STAT "
+						  +"FROM STOCK A, LOCATION L, INVSTAT B "
+						  +"WHERE L.LOC_CODE = A.LOC_CODE "
+						  + " AND L.INV_STAT  = B.INV_STAT "
 						  +"AND A.ITEM_CODE = '"+itemCode+"' "
 						  +"AND A.SITE_CODE = '"+siteCodeReq+"' "
 						  +"AND B.AVAILABLE = '"+availableYn+"' "
 						  +"AND A.QUANTITY - A.ALLOC_QTY > 0 "
 						  +"AND A.LOC_CODE  LIKE '"+locCode+"' "			
 						  +"ORDER BY A.EXP_DATE, A.LOT_NO, A.LOT_SL ";
+				}
+				//Added else part by Chandni  shah -01/09/10
+				else 
+				{
+					
+					sql = "SELECT A.LOT_NO, A.LOT_SL,(A.QUANTITY - A.ALLOC_QTY), A.EXP_DATE, A.UNIT, "
+						  +"A.ITEM_SER, A.SITE_CODE__MFG, A.MFG_DATE, A.POTENCY_PERC, A.ALLOC_QTY, " 
+						  +"A.PACK_CODE, A.LOC_CODE, A.ACCT_CODE__INV,A.CCTR_CODE__INV, A.RATE "  
+						  +"FROM STOCK A, LOCATION L, INVSTAT B "
+						  +"WHERE L.LOC_CODE = A.LOC_CODE "
+						  + " AND L.INV_STAT  = B.INV_STAT "
+						  +"AND A.ITEM_CODE = '"+itemCode+"' "
+						  +"AND A.SITE_CODE = '"+siteCodeReq+"' "
+						  +"AND A.LOC_CODE  = '"+locCode+"' "
+						  +"AND A.LOT_NO    = '"+lotNo+"' "
+						  +"AND A.LOT_SL	 = '"+lotSl+"' "
+						  +"AND (A.QUANTITY - A.ALLOC_QTY) >="+quantity
+						  +" AND B.AVAILABLE = '"+availableYn+"'";			
+				}//
 				System.out.println("sql :"+sql);
 				//stmt = conn.createStatement(); //Gulzar 25/04/07
 				stmt = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_UPDATABLE); //Gulzar 25/04/07
@@ -810,9 +872,11 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 						stkExpFlag = false;
 						String token = "";
 						StringTokenizer stToken = new StringTokenizer(stkExpLoc,",");
-							while(stToken.hasMoreTokens()){
+						while(stToken.hasMoreTokens())
+						{
 							token = stToken.nextToken();
-								if(locCode.equalsIgnoreCase(token)){
+							if(locCode.equalsIgnoreCase(token))
+							{
 								stkExpFlag = true;
 								break;
 							}
@@ -903,8 +967,8 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 					valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString(5)).append("]]>").append("</unit>\r\n");
 					valueXmlString.append("<unit__std>").append("<![CDATA[").append(rs.getString(5)).append("]]>").append("</unit__std>\r\n");
 					valueXmlString.append("<loc_code>").append("<![CDATA[").append(rs.getString(12)).append("]]>").append("</loc_code>\r\n");
-//changed by ALKA on 11/09/07 for no_art column added in the consume_iss_det and itemChange enabled for lot_no for request id "DI78GIN041"						
-//						valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</lot_no>\r\n");
+					//changed by ALKA on 11/09/07 for no_art column added in the consume_iss_det and itemChange enabled for lot_no for request id "DI78GIN041"						
+					//valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</lot_no>\r\n");
 					valueXmlString.append("<lot_no isSrvCallOnChg='1'>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</lot_no>\r\n");
 					valueXmlString.append("<lot_sl>").append("<![CDATA[").append(rs.getString(2)).append("]]>").append("</lot_sl>\r\n");
 					valueXmlString.append("<conv_qty_stduom>").append("<![CDATA[").append(1).append("]]>").append("</conv_qty_stduom>\r\n");
@@ -956,15 +1020,20 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 				{
 					errCode = "VTSTKW";
 				}*/
-					if (remainingQty > 0)
+				if (remainingQty > 0)   //changed by Chandni Shah 01/09/10
 				{
-						if (partQuantity.equals("W"))
+					if (partQuantity.equals("X")) 
 					{
-							errCode = "VTSTKW";
+						errCode = "VTSTOCK1";
+						errString = itmDBAccess.getErrorString("",errCode,"","",conn);
+						System.out.println("errString :"+errString);
+						return errString;
+					
 					}
 				}
-				}//end if
-				else
+				//end if
+				//Commented by Chandni  shah -01/09/10
+				/*else
 				{
 					sql = "SELECT (CASE WHEN (A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE (A.QUANTITY - A.ALLOC_QTY) END), "
 						  +"ACCT_CODE__INV, CCTR_CODE__INV "
@@ -1036,7 +1105,7 @@ public class ConsumeIssueAct extends ActionHandlerEJB implements ConsumeIssueAct
 						valueXmlString.append("<cctr_code__inv>").append("<![CDATA[").append(cctrCode).append("]]>").append("</cctr_code__inv>\r\n");
 					}
 					valueXmlString.append("</Detail>\r\n");
-				}//else end
+				}//else end		*/
 				stmt = null;
 				if (errCode != null && errCode.trim().length() > 0)
 				{