HEAD--Changed by wasim for Manual stock allocation, checked stock opt from...

HEAD--Changed by wasim for Manual stock allocation, checked stock opt from item master , if stock opt is 2 then only validate the lot_no and lot_sl.


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

webitm-dis/ibase/webitm/ejb/dis/StockAllocIc.java

@@ -106,7 +106,8 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 		String activePickAllow="";
 		
 		ConnDriver connDriver = new ConnDriver();
-		StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); 
+		StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
+		String stockOpt = "";//Added by wasim on 20-APR-17
 		try
 		{
 			//Changes and Commented By Bhushan on 09-06-2016 :START
@@ -465,26 +466,85 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
 					else if(childNodeName.equalsIgnoreCase("lot_no"))
 					{    
 						lotNo = genericUtility.getColumnValue("lot_no", dom);
-
-						if(lotNo == null || lotNo.trim().length() == 0)
+						
+						//Changed by wasim on 20-APR-17 for cehcking stock opt [START]
+						/*if(lotNo == null || lotNo.trim().length() == 0)
 						{
 							errCode = "VTLOTNO";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());	
+						}*/
+						itemCode = genericUtility.getColumnValue("item_code", dom);
+						sql = "SELECT STK_OPT FROM ITEM WHERE ITEM_CODE = ? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, itemCode);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							stockOpt = rs.getString(1) == null ? "" : rs.getString(1).trim();
+						}
+						if(rs!=null)
+						{
+							rs.close();rs = null;
+						}
+						if(pstmt!=null)
+						{
+							pstmt.close();pstmt = null;
 						}
+						
+						if("2".equalsIgnoreCase(stockOpt))
+						{
+							if(lotNo == null || lotNo.trim().length() == 0)
+							{
+								errCode = "VTLOTNO";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());	
+							}
+						}
+						//Changed by wasim on 20-APR-17 for cehcking stock opt [END]
 					}
 					else if(childNodeName.equalsIgnoreCase("lot_sl"))
 					{    
 						lotSl = genericUtility.getColumnValue("lot_sl", dom);
 
-						if(lotSl == null || lotSl.trim().length() == 0)
+						//Changed by wasim on 20-APR-17 for cehcking stock opt [START]
+						/*if(lotSl == null || lotSl.trim().length() == 0)
 						{
 							errCode = "VTLOTSL";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());	
-						}
+						}*/
 						//Change by Rohan on 10/07/12 To check.start
 						
+						itemCode = genericUtility.getColumnValue("item_code", dom);
+						sql = "SELECT STK_OPT FROM ITEM WHERE ITEM_CODE = ? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, itemCode);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							stockOpt = rs.getString(1) == null ? "" : rs.getString(1).trim();
+						}
+						if(rs!=null)
+						{
+							rs.close();rs = null;
+						}
+						if(pstmt!=null)
+						{
+							pstmt.close();pstmt = null;
+						}
+						
+						if("2".equalsIgnoreCase(stockOpt))
+						{
+							if(lotSl == null || lotSl.trim().length() == 0)
+							{
+								errCode = "VTLOTSL";
+								errList.add(errCode);
+								errFields.add(childNodeName.toLowerCase());	
+							}
+						}
+						//Changed by wasim on 20-APR-17 for cehcking stock opt [END]
+						
 						itemCode = genericUtility.getColumnValue("item_code", dom);
 						siteCode = genericUtility.getColumnValue("site_code", dom);
 						locCode = genericUtility.getColumnValue("loc_code", dom);