changed by sankara on 07/04/14 update wavegenerationprc and stocktransfergrlic for wms live

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

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

@@ -147,6 +147,8 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 		NodeList childList = null;	
 		String resrvLocInvstat = "";
 		String casePickInvstat = "",deepStoreLoc = "";
+		java.util.Date tranDateDt = null;
+		String prdCode = "";
 		
 		StringBuffer errStringXml = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root><Errors>");
 		String errorType = "", errCode = "";
@@ -170,7 +172,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 			connDriver = new ConnDriver();
 			conn = connDriver.getConnectDB("DriverITM");
 			connDriver = null;
-			
+			SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 			if ( objContext != null && objContext.trim().length() > 0 )
 			{
@@ -264,6 +266,59 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 								errList.add( "INVSITECD" );
 								errFields.add( childNodeName.toLowerCase() );
 							}
+							else //added by kunal on 15-feb-14 for period code
+							{
+								
+								siteCode = genericUtility.getColumnValue("site_code", currDom);
+								cnt = 0; 
+								System.out.println("364 site code ="+siteCode);
+								if (genericUtility.getColumnValue("tran_date", currDom) != null)
+								{
+									tranDateDt = sdf1.parse(genericUtility.getColumnValue("tran_date", currDom));
+									sql = "select code from period where ?  between fr_date and to_date";
+									pstmt = conn.prepareStatement(sql);
+									pstmt.setDate(1, new java.sql.Date(tranDateDt.getTime()));
+									rs = pstmt.executeQuery();
+									if (rs.next())
+									{
+										prdCode = rs.getString(1);
+
+									}
+									rs.close();
+									rs = null;
+									pstmt.close();
+									pstmt = null;
+
+									sql = "select count(*) from period_stat where site_code = ? and prd_code = ? ";
+									pstmt = conn.prepareStatement(sql);
+									pstmt.setString(1, siteCode);
+									pstmt.setString(2, prdCode);
+									rs = pstmt.executeQuery();
+									if (rs.next())
+									{
+										cnt = rs.getInt(1);
+
+									}
+									rs.close();
+									rs = null;
+									pstmt.close();
+									pstmt = null;
+									if (cnt == 0)
+									{
+										errList.add( "VTSITEPD" );
+										errFields.add( childNodeName.toLowerCase() );
+										break;
+									}
+									// nvo_functions_adv.nf_check_period('SAL',mdate1,msite_code)
+									errCode = nfCheckPeriod("IC", tranDateDt, siteCode);
+									System.out.println("425 Error Code = " + errCode);
+									if (errCode != null && errCode.trim().length() > 0)
+									{
+										errList.add( errCode );
+										errFields.add( childNodeName.toLowerCase() );
+									}
+								} 							 
+							}//end 
 						}
 						else if ( "reas_code".equalsIgnoreCase( childNodeName ) )
 						{
@@ -1117,7 +1172,9 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 						invStatList.add(resrvLocInvstat);
 						invStatList.add(deepStoreLoc);
 						//changed by sankara on 10/09/2012 to assign deep storage,case pick location [End]
-						
+						//changed by sankara on 05/04/14 passed login site code
+						siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
+						System.out.println("in case 2:::::"+siteCode);
 						//Commented and changes below by gulzar on 12/23/2011
 						/*
 						sql = "SELECT A.LOC_CODE FROM STOCK A , INVSTAT B, LOCATION C "
@@ -1194,14 +1251,26 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 								", C.LOC_TYPE, C.LOC_ZONE__PREF "+	
 								"FROM STOCK A, INVSTAT B, ITEM C, LOCATION D "+
 								"WHERE A.LOC_CODE = D.LOC_CODE AND D.INV_STAT = B.INV_STAT "+
-								"AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = 'Y' "+
-								"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
+								//changed by sankara on 05/04/14 value passed through prepare state ment
+								//"AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = 'Y' "+
+								"AND A.ITEM_CODE = C.ITEM_CODE AND B.AVAILABLE = ? "+
+								//changed by sankara on 05/04/14 value passed through prepare state ment
+								//"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' " +
+								"AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> ? " +
 								//"AND (A.QUANTITY - A.ALLOC_QTY - CASE WHEN A.HOLD_QTY IS NULL THEN 0 ELSE A.HOLD_QTY END) > 0 "+//Commented by gulzar on 1/12/2012
 								"AND ((CASE WHEN A.QUANTITY IS NULL THEN 0 ELSE A.QUANTITY END) - (CASE WHEN A.ALLOC_QTY IS NULL THEN 0 ELSE A.ALLOC_QTY END)) > 0 "+//Changed by gulzar on 1/12/2012
-								"AND D.INV_STAT = ? ";
+								//changed by sankara on 05/04/14 added login site code
+								//"AND D.INV_STAT = ? ";
+								" AND D.INV_STAT = ? AND A.SITE_CODE = ? ";
 
 						pstmt =  conn.prepareStatement(sql);
-						pstmt.setString(1, grlInvstat);
+						//changed by sankara on 05/04/14 added login site code and using preparestatement statrt.
+						//pstmt.setString(1, grlInvstat);						
+						pstmt.setString(1, "Y");
+						pstmt.setString(2, "S");
+						pstmt.setString(3, grlInvstat);
+						pstmt.setString(4, siteCode);
+						//changed by sankara on 05/04/14 added login site code and using preparestatement end.
 						rs = pstmt.executeQuery();
 						while (rs.next())
 						{

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

@@ -6972,6 +6972,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 									//}
 									
 									shipment2 = null;
+									
+									if(errString != null && errString.trim().length() > 0)
+									{
+										return errString;
+									}
 							}
 						}
 						else