changed by sankara on 08/05/2014 updated deallocartconf,pickorderprc for reassigntask and sordalloc

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

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

@@ -12,7 +12,6 @@ import ibase.webitm.ejb.dis.*;
 import ibase.webitm.ejb.fin.*;
 
 import java.rmi.RemoteException;
-import java.util.Date;
 import java.util.*;
 import java.text.*;
 import java.sql.*;
@@ -849,10 +848,37 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 				System.out.println("Convertd Quantity convertQty  BASEUNIT unit------->"+convertQty);
 				System.out.println("Convertd Quantity qtyStduom UNIT BASEUNIT------->"+qtyStduom);
 				//Changed by Sankara.end
-		
+				//changed by sankara on 06/05/14 for manual stock allocation start.
+				String allocMode = "";
+				sql = " SELECT ALLOC_MODE FROM SORDALLOC "
+						+ " WHERE SALE_ORDER = '" + saleOrder + " ' "
+						+ " AND LINE_NO = '" + lineNo + "' "
+						+ " AND EXP_LEV = '" + expLev + "' "
+						+ " AND ITEM_CODE = '" + itemCode + "' "
+						+ " AND LOT_NO = '" + lotNo + "' "
+						+ " AND LOT_SL = '" + lotSl + "' "
+						+ " AND LOC_CODE = '" + locCode + "' " ;
+				pstmt =  conn.prepareStatement(sql);
+				rs = pstmt.executeQuery();
+				if(rs.next())
+				{
+					allocMode = checkNull(rs.getString("ALLOC_MODE"));
+					System.out.println("allocMode:::::::::"+allocMode);
+				}
+				pstmt.close();
+				pstmt=null;
+				rs.close();
+				rs=null;
+				//changed by sankara on 06/05/14 for manual stock allocation end.
 				invallocTraceMap.put("ref_id",saleOrder);
 				invallocTraceMap.put("ref_line",lineNo);
+				//changed by sankara on 06/05/14 for manual stock allocation start. 
+				//errString = invallocTraceBean.updateInvallocTrace(invallocTraceMap,conn);
+				if( !"M".trim().equalsIgnoreCase(allocMode) )
+				{
 					errString = invallocTraceBean.updateInvallocTrace(invallocTraceMap,conn);
+				}
+				//changed by sankara on 06/05/14 for manual stock allocation end. 
 
 				if (errString != null && errString.trim().length() > 0)
 				{
@@ -860,6 +886,9 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					return errString;
 				}
                 
+				//changed by sankara on 06/05/14 added if condition for checking manual stock allocation case start
+				if( !"M".trim().equalsIgnoreCase(allocMode) )
+				{
 					updateSorditem ="UPDATE SORDITEM  SET QTY_ALLOC = QTY_ALLOC - " + new Double(DeallocQty).toString()
 							+" WHERE SALE_ORDER = '" + saleOrder + "' "
 							+" AND LINE_NO = '" + lineNo + "' "
@@ -880,6 +909,30 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
 					System.out.println("updateSql:::>>>>"+ updateSql);
 					st.executeUpdate(updateSql);
 					System.out.println("UPDATE  SUCCESS FOR SORDALLOC....");
+				}
+				if( "M".trim().equalsIgnoreCase(allocMode) )
+				{
+					System.out.println("inside if1.....");
+					updateSql = " UPDATE SORDALLOC SET WAVE_FLAG = ? " 
+							+ " WHERE SALE_ORDER = '" + saleOrder + " ' "
+							+ " AND LINE_NO = '" + lineNo + "' "
+							+ " AND EXP_LEV = '" + expLev + "' "
+							+ " AND ITEM_CODE = '" + itemCode + "' "
+							+ " AND LOT_NO = '" + lotNo + "' "
+							+ " AND LOT_SL = '" + lotSl + "' "
+							+ " AND LOC_CODE = '" + locCode + "' " ;
+					System.out.println("updateSql:::>>>>"+ updateSql);
+					pstmt = conn.prepareStatement(updateSql);
+					pstmt.setString(1, "N");
+					int updateCount = pstmt.executeUpdate();
+					if( updateCount > 0 )
+					{
+						System.out.println("wave flag updateCount in sordalloc::::::::"+updateCount);
+					}
+					pstmt.close();
+					pstmt = null;		
+				}
+				//changed by sankara on 06/05/14 added if condition for checking manual stock allocation case end
 				SqlQtyAlloc = "SELECT QTY_ALLOC FROM SORDALLOC "
 							+ " WHERE SALE_ORDER = '" + saleOrder + " ' "
 							+ " AND LINE_NO = '" + lineNo + "' "

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

@@ -199,7 +199,9 @@ public class PickOrderPrc extends ProcessEJB implements PickOrderPrcLocal,PickOr
 				getDataSql = " SELECT DISTINCT R.REPL_ORDER, R.SALE_ORDER, R.WAVE_ID, WD.PTCN, R.ASSIGN_TO, WD.WAVE_STATUS " + 
 						     " FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ISS_HDR RH, REPL_ORD_DET RT " +
 						     " WHERE R.REPL_ORDER = WD.REF_ID AND R.REPL_ORDER = RT.REPL_ORDER AND R.WAVE_ID = W.WAVE_ID " +
-						     " AND R.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND W.CANCEL = 'N' AND ( RT.CANCEL_MODE='N' OR RT.CANCEL_MODE IS NULL ) " +
+						  // changed by sankara on 06/05/14 display reference repl orders in reassign task 
+						  // " AND R.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND W.CANCEL = 'N' AND ( RT.CANCEL_MODE='N' OR RT.CANCEL_MODE IS NULL ) " +
+							 " AND R.WAVE_ID = WD.WAVE_ID AND WD.STATUS = 'N' AND ( RT.CANCEL_MODE='N' OR RT.CANCEL_MODE IS NULL ) " +
 						     " AND ( RH.CONFIRMED = 'N' OR RH.REPL_ORDER IS NULL ) AND R.REPL_ORDER BETWEEN ? AND ? AND R.ORDER_DATE BETWEEN ? AND ? " ;
 			}
 			//changed by sankara on 28/09/13 for getting unconfirmed repl_orders end.