D15CKAT001, Changes for MS SQL Server on 07/10/2015 .

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

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

@@ -99,13 +99,17 @@ public class InvAllocTraceBean
 				+" and lot_no = ?"
 				+"and lot_sl = ? for update ";
 			}
+			
+			//changed by manish add space before and lot_sl on 31/08/2015
 			else if (CommonConstants.DB_NAME.equalsIgnoreCase("MSSQL")){
 				sql =" select alloc_qty from stock (updlock) where item_code = ?"
 			  	+" and site_code = ?" 
 				+" and loc_code  = ?" 
 				+" and lot_no = ?"
-				+"and lot_sl = ?  ";
+				+" and lot_sl = ?  ";
 			}
+			//changed by manish add space before and lot_sl on 31/08/2015
+			
 			else
 			{
 				sql =" select alloc_qty from stock where item_code = ?"

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

@@ -286,8 +286,9 @@ public class InvHoldRelIC extends ValidatorEJB implements InvHoldRelICLocal , In
 										rs = pstmt.executeQuery();
 										if( rs.next() )
 										{
-											siteCode1 = rs.getString(1)==null?"":rs.getString(1);
+											siteCode1 = rs.getString(1)==null?"":rs.getString(1).trim();        // trim() Added By Manish on 30/09/15
 										}
+										      
 										rs.close();
 										rs = null;
 										pstmt.close();

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

@@ -342,9 +342,17 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 					" AND DESPATCH.WAVE_ID = WAVE_TASK.WAVE_ID " +
 					" AND DESPATCH.SORD_NO = WTD.SALE_ORDER " +
 					" AND DESPATCH.CONFIRMED <> 'Y' AND WAVE_TASK.CANCEL <> 'Y' " +
-					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'S' " +
-					" ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
+					" AND CM.STATUS <> 'R' AND CM.CARTON_TYPE = 'S' " ;
+				//	" ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
 					
+			//changed by manish on 28/09/15 for Ms sql server databse 
+			String DB = commonConstants.DB_NAME;
+			if("!mssql".equalsIgnoreCase(DB))
+			{
+				getDataSql = getDataSql + " ORDER BY WAVE_ID, PTCN, SALE_ORDER,LINE_NO__SORD, ITEM_CODE, CARTON_NO "; 
+			}
+			//changed by manish on 28/09/15 for Ms sql server databse.
+
 			pstmt = conn.prepareStatement(getDataSql);		
 			pstmt.setString(1, siteCode);		
 			pstmt.setString(2,saleOrderFr);
@@ -680,6 +688,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 			pstmt.setString(6, chgTerm );
 			if( pstmt.executeUpdate() > 0)
 			{
+				conn.commit();         //Added by manish on 29/09/15
 				System.out.println(" insertion in DEALLOC_ART successfully ");
 			}			
 			pstmt.close();pstmt = null;
@@ -991,6 +1000,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
 				pstmt.setString(15, pickType);
 				if( pstmt.executeUpdate() > 0 )
 				{
+					conn.commit();          //Added by manish on 29/09/15
 					System.out.println(" insert in DEALLOC_ART_DET succesfully done ");
 				}
 				else

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

@@ -5,6 +5,7 @@
 
 package ibase.webitm.ejb.wms;
 
+import ibase.utility.CommonConstants;
 import ibase.webitm.ejb.*;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.GenericUtility;
@@ -111,8 +112,22 @@ public class MultiPickWizPrs extends ValidatorEJB implements MultiPickWizPrsLoca
 				
 				if(ptcnList != null && ptcnList.size() > 0)
 				{
-					sql = "select count(*) from pack_det where trim(carton_no) in "
+					
+					//Changed by Manish on 10/09/2015 for mssql database [START]	
+					String DB = CommonConstants.DB_NAME;
+					if("mssql".equalsIgnoreCase(DB))
+					{
+					sql = "select count(*) from pack_det where RTRIM(LTRIM(carton_no)) in "
+						+ "(select RTRIM(LTRIM(carton_no)) from carton_master where ptcn = ?)";
+					}
+					
+					else
+					{
+						sql = "select count(*) from pack_det where trim(carton_no) in "
 							+ "(select trim(carton_no) from carton_master where ptcn = ?)";
+					}
+						
+					//Changed by Manish on 10/09/2015 for mssql database [END]	
 					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, ptcnList.get(0));					

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

@@ -994,6 +994,12 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 						}
 						rs.close(); rs = null;
 						pstmt.close(); pstmt = null;
+						
+						// Changed by Manish on 29/07/15 (for trim loc_type)
+						locTypeItem = locTypeItem == null ? "" : locTypeItem.trim();
+						locTypeLocation = locTypeLocation == null ? "" : locTypeLocation.trim();
+						// Changed by Manish on 29/07/15
+						
 						if( !locTypeLocation.equalsIgnoreCase(locTypeItem) )
 						{
 							errList.add( "VMLOCTYP1" );
@@ -2150,7 +2156,9 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 							valueXmlString.append( "<vouch_created><![CDATA[" ).append(  checkNull(rs.getString("VOUCH_CREATED")) ).append( "]]></vouch_created>\r\n" );
 							valueXmlString.append( "<lr_no><![CDATA[" ).append(  checkNull(rs.getString("LR_NO")) ).append( "]]></lr_no>\r\n" );
 							valueXmlString.append( "<lorry_no><![CDATA[" ).append(  checkNull(rs.getString("LORRY_NO")) ).append( "]]></lorry_no>\r\n" );
-							valueXmlString.append( "<trans_mode><![CDATA[" ).append(  transMode ).append( "]]></trans_mode>\r\n" );
+							
+							//Added by manish on 27/07/15 (add checknull for trans_mode)
+							valueXmlString.append( "<trans_mode><![CDATA[" ).append(  checkNull(transMode) ).append( "]]></trans_mode>\r\n" );
 							valueXmlString.append( "<item_ser><![CDATA[" ).append(  checkNull(rs.getString("ITEM_SER")) ).append( "]]></item_ser>\r\n" );
 							//valueXmlString.append( "<frt_amt><![CDATA[" ).append(  checkNull(rs.getString("FRT_AMT")) ).append( "]]></frt_amt>\r\n" );//Commented By Mahesh Patidar on 29/06/12
 							valueXmlString.append( "<frt_amt><![CDATA[0]]></frt_amt>\r\n" );//Added By Mahesh Patidar on 29/06/12
@@ -2412,7 +2420,9 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
 							/* Added By Ashish Sonawane on 28/08/12 as per manoharan Sir [START] */
 							valueXmlString.append( "<frt_amt><![CDATA[0]]></frt_amt>\r\n" );
 							valueXmlString.append( "<insurance_amt><![CDATA[0]]></insurance_amt>\r\n" );
-							valueXmlString.append( "<trans_mode><![CDATA[" ).append(  transMode ).append( "]]></trans_mode>\r\n" );
+							
+							//Added by manish on 27/07/15 (add checknull for trans_mode)
+							valueXmlString.append( "<trans_mode><![CDATA[" ).append( checkNull(transMode) ).append( "]]></trans_mode>\r\n" );
 							valueXmlString.append( "<accept_criteria><![CDATA[" ).append(  accptCriteria ).append( "]]></accept_criteria>\r\n" );
 							valueXmlString.append( "<reciept_type><![CDATA[" ).append( "F" ).append( "]]></reciept_type>\r\n" );
 							/* Added By Ashish Sonawane on 28/08/12 as per manoharan Sir [END] */

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

@@ -2951,6 +2951,13 @@ private String checkNull( String input )
 	{
 		input = "";
 	}
+	//Changed By Manish for trim value on 23/09/15 [start]
+	else
+	{
+		input = input.trim();
+	}
+	//Changed By Manish for trim value on 23/09/15 [end]
+	
 	return input;
 }	
 	// 02/08/12 manoharan following method added to generate SSCC18 complaint number