updated

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

webitm-mfg/ibase/webitm/ejb/mfg/WoTransferPrc.java

@@ -62,7 +62,9 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 	Timestamp lastPhycDate=null,tranDate= null,retestDate =null;
 	String suppCode="";  
 	String chgTerm="",chgUser="";     
+	//
 	String considerAllocate = "Y",	partialUsed = "";
+	//
 	String lotSlOrg="";
 	
 	GenericUtility genericUtility = GenericUtility.getInstance();
@@ -2769,7 +2771,6 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 
 									}
 
-
 								}while(rs.next()); //rs 2nd lopp end 
 								
 								rs.close();
@@ -3008,7 +3009,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 			if(stkOpt.equalsIgnoreCase("0"))
 			{
 				System.out.println("Not To Update Stock>>>>>>>>>>>>>>>>>>>>>>>>");
-	            return errString;//errString to be made - Jiten
+	            return errString;
 			}
 			if(stkOpt.equalsIgnoreCase("1"))
 			{
@@ -3101,6 +3102,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 	                    rs.close();
 	                    System.out.println("Record from QC_ORDER:::- ["+count+"]");
 	            }
+			/*	//Script for updating loc_code & lot_sl as null if qc order is found during stock transfer
 				//Error While be bypass if transer = 'XFRX' and trantype = 'ID' i.e Stock transfer and quantity < 0 i.e Not Receipt 
 				if s_updatestock.transer = 'XFRX' and s_updatestock.trantype = 'ID' and s_updatestock.quantity < 0 Then 
 				else
@@ -3109,6 +3111,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 					ls_errcode = gf_error_location(ls_errcode)
 					return ls_errcode
 				end if
+			*/
 				if( (count > 0) && !("XFRX".equalsIgnoreCase(this.tranSer) && "ID".equalsIgnoreCase(this.tranType)  && meffQty < 0) )
 				{
 	                errString = "VTUNCFQC";
@@ -3562,7 +3565,7 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 						+" inv_stat,ltran_date,last_iss_date,gross_weight,tare_weight,net_weight,pack_instr,dimension,retest_date,"
 						+"rate,rate__oh,acct_code__inv, cctr_code__inv,acct_code__oh,cctr_code__oh,supp_code__mfg,grade,gross_rate,"
 						+" conv__qty_stduom,unit__alt,batch_no,last_phyc_date,qty_per_art,gross_wt_per_art,tare_wt_per_art,actual_rate,remarks, no_art,pack_ref" 
-						+" ,lot_sl__org )"    // cpatil
+						+" ,lot_sl__org )"    
 						+" values( ?,?,?, ?,?,?, ?,?,?, ?,?,?,?,?,?, ?,?,?, ?,?,?, ?,?,?, ?,?,?, ?,?,?, ?,?,?,"
 						+" ?,?,?, ?,?,?, ?,?,?, ?,?,?, ?,?,?)" ;
 					 pstmt = conn.prepareStatement(sql);
@@ -4239,18 +4242,15 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 				{
 					System.out.println("The SQLException occurs in UpdatStock [Stockupdate] getSQLState [" + sqlState + "] getErrorCode [" + errorCode + "]  Exception["+sqx + "]");
 				}
-				
 				ex = sqx;
 				
 				sqx.printStackTrace();
 				sqx = sqx.getNextException();
-			
 				if(sqx == null)
 				{
 					sqx = ex;
 					break;
 				}
-				
 			}
 			
 	        throw new ITMException(sqx);
@@ -5094,7 +5094,8 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
         			updateStockMap.put("exp_date", expDate);
         		}
                 //if isnull(s_updatestock.retest_date) then s_updatestock.retest_date =  mretest_date
-               // System.out.println("@@@@ updateStockMap.get(retest_date) ["+updateStockMap.get("retest_date").toString()+"]"); // added by cpatil on 05-03-13
+               // System.out.println("@@@@ updateStockMap.get(retest_date) ["+updateStockMap.get("retest_date").toString()+"]"); 
+             
                if(  updateStockMap.get("retest_date")!= null  &&  updateStockMap.get("retest_date").toString() != "01/01/1990" ) 
                {
             	    sql2 = " select available from invstat where inv_stat = ( select inv_stat from location where loc_code =  ? ) ";