qc order and qc_order_lots quantity updates for expired stock

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

webitm-wms/ibase/webitm/utility/wms/NearExpirySchedule.java

@@ -587,13 +587,7 @@ public class NearExpirySchedule implements Schedule
 						{
 							isError = true;
 						}
-						//Start Added by chandrashekar on 29-may-2015
-						retString=updateQcOrder(siteCode,stockExpList,xtraParams,conn);
-						if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
-						{
-							isError = true;
-						}
-						//End added by chandrashekar on 29-may-2015
+						
 						System.out.println("going to insert in inv_hold EXPIRED");
 						
 						retString = holdGen.generateHoldTrans( dataVal2, "EXPIRED","EXP", siteCode, stockExpList, "", conn );
@@ -618,13 +612,6 @@ public class NearExpirySchedule implements Schedule
 					System.out.println("stockNexpList.size() ["+stockNexpList.size()+"] and count1 -> ["+count1+"]");
 					if ( stockNexpList.size() > 0 && count1 > 0 )
 					{
-						//Start Added by chandrashekar on 29-may-2015
-						retString=updateQcOrder(siteCode,stockNexpList,xtraParams,conn);
-						if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
-						{
-							isError = true;
-						}
-						//End added by chandrashekar on 29-may-2015
 						System.out.println("going to insert in inv_hold for NEAREXPIRY----> ");
 						//Changed by Rohan on 3/7/12
 						//retString = holdGen.generateHoldTrans( dataVal2, "NEAREXPIRY","NEXP", siteCode, stockNexpList, "", conn );
@@ -642,22 +629,40 @@ public class NearExpirySchedule implements Schedule
 					{
 						//retString = inventoryTransfer( stockExpList, "w_stock_transfer", xtraParams, conn );
 						retString = inventoryTransfer( siteCodeExpeMap, "w_stock_transfer", xtraParams, conn );//Change by chandrashekar 0n 28-05-2015
+						//Start Added by chandrashekar on 29-may-2015
+						if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
+						{
+							isError = true;
+						}
+						retString=updateQcOrder(siteCode,stockExpList,xtraParams,conn);
+						//End added by chandrashekar on 29-may-2015
+						
 					}
 					if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
 					{
 						isError = true;
 						//return retString;
 					}
+					
 					if ( stockNexpList.size() > 0 && count1 > 0)
 					{
+						
 						//retString = inventoryTransfer( stockNexpList, "w_stock_transfer", xtraParams, conn );
 						retString = inventoryTransfer( siteCodeNeExpeMap, "w_stock_transfer", xtraParams, conn );//Change by chandrashekar 0n 28-05-2015
+						//Start Added by chandrashekar on 29-may-2015
+						if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
+						{
+							isError = true;
+						}
+						retString=updateQcOrder(siteCode,stockNexpList,xtraParams,conn);
+						//End added by chandrashekar on 29-may-2015
 					}
 					if ( retString != null && retString.trim().length() > 0 && retString.trim().equalsIgnoreCase("ERROR") )
 					{
 						isError = true;
 						//return retString;
 					}
+					
 				}
 			}
 		}
@@ -777,13 +782,14 @@ public class NearExpirySchedule implements Schedule
 					locCode = (String) dataMap1.get("loc_code");
 				}
 				sql = "select qorder_no,quantity,qty_passed,qty_rejected,qty_sample,lot_sl from qc_order where site_code = ? " 
-				+ " and item_code = ? and lot_no= ?  and status='U' and loc_code= ? ";
+				//+ " and item_code = ? and lot_no= ?  and status='U' and loc_code= ? ";
+				+ " and item_code = ? and lot_no= ?  and status='U' ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, listSiteCode);
 				pstmt.setString(2, itemCode);
 				pstmt.setString(3, lotNo);
 				//pstmt.setString(4, lotSl);
-				pstmt.setString(4, locCode);
+				//pstmt.setString(4, locCode);
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{