Pragyan sir given for merge

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

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

@@ -96,7 +96,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			locCodeTo = genericUtility.getColumnValue("loc_code__to", dom, "2" );
 			System.out.println("palert no from generic utility ["+palletNo+"]  locCodeTo [" + locCodeTo  + "]");
 			//conn.setAutoCommit(false);
-			sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
+			sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE "
+					+ " HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND HDR.PICK_TYPE IN ('A','M')"
+					+ " AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString( 1, palletNo);
 			pstmt.setString( 2, "N");

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

@@ -347,7 +347,7 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							
 							if("V".equalsIgnoreCase(orderType))
 							{
-								actualQty = quantity;
+								actualQty = 0.0;
 							}
 							else
 							{
@@ -359,21 +359,23 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 								System.out.println("Pick Quantity:="+pickQty);
 								System.out.println("Actual Quantity:="+actualQty);
 								System.out.println("Actual Allocate Quantity:="+actualAllocQty);
-							}
-							//Changed by Dadaso pawar on 26/06/15 [End]
-						
-							if(actualAllocQty != 0.0 && pickQty < actualAllocQty)
-							{
 								
-								System.out.println("Found Last case Found with Other allocation pickQty["+pickQty+"]quantity ["+quantity+"]Stock alloc qty["+actualAllocQty+"]");
-								isLastCaseUpDFlag = true;
-								lastCaseUpdQty = actualQty;
-								//actualQty = 0.0;
-								actualQty = quantity - actualAllocQty;
-								System.out.println("Now Actual Quantity to issue ["+actualQty+"]");
+								//Changed by Dadaso pawar on 26/06/15 [End]
 								
+								if(actualAllocQty != 0.0 && pickQty < actualAllocQty)
+								{
+									
+									System.out.println("Found Last case Found with Other allocation pickQty["+pickQty+"]quantity ["+quantity+"]Stock alloc qty["+actualAllocQty+"]");
+									isLastCaseUpDFlag = true;
+									lastCaseUpdQty = actualQty;
+									//actualQty = 0.0;
+									actualQty = quantity - actualAllocQty;
+									System.out.println("Now Actual Quantity to issue ["+actualQty+"]");
+									
+								}
+								//Changed By Pragyan 03-May-14 for changed Last case logic if pick quantity > last case.end
 							}
-							//Changed By Pragyan 03-May-14 for changed Last case logic if pick quantity > last case.end
+							
 						}
 						else
 						{
@@ -381,7 +383,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							actualQty = quantity - actualAllocQty;
 						}
 					//Chnaged by Rohan on 15-02-13 for calculating actual qty from repanishment in case of stock to dock	
-					}	
+					}
+					System.out.println("Now pickQty["+pickQty+"]quantity ["+quantity+"]Stock alloc qty["+actualAllocQty+"]actualQty["+actualQty+"");
 					// end 09/02/13 manoharan actual quantity (balance quantity) is updated in multiples of number of cases so this has to be taken as the total pick quantity
 					
 					String dExpLev = checkNullAndTrim(rs.getString( "EXP_LEV" ));
@@ -641,10 +644,17 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN ( " 
 								+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN ( "
 								+ " (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))) "
-								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y'  AND (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
+								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y'  AND (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0"
+								+ " UNION ALL"
+								+ " SELECT * FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) IN (	"
+								+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET  WHERE (PICK_ORDER,LINE_NO__PICK) IN ("
+								+ " SELECT REPL_ORDER,LINE_NO FROM REPL_ORD_DET WHERE (PICK_ORDER,LINE_NO__PICK) IN (("
+								+ " SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER =? AND LINE_NO__PICK = ? ))))	"
+								+ " AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y'	AND "
+								+ " (QUANTITY  -(CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END)) > 0";
 
 						
-						//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
+							//Changed by sumit on 08/02/13 changed the sql ( Told Manoharan Sir) end
 						
 							pstmtPick = conn.prepareStatement(sql);
 							pstmtPick.setString(1, replOrder);	
@@ -654,6 +664,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							pstmtPick.setInt(4, replOrderLineNo);
 							pstmtPick.setString(5, replOrder);	
 							pstmtPick.setInt(6, replOrderLineNo);
+							pstmtPick.setString(7, replOrder);	
+							pstmtPick.setInt(8, replOrderLineNo);
 							//Changed By Pragyan 21/02/13 Logic change as above by manohran sir.end
 							rsPick = pstmtPick.executeQuery();
 							

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

@@ -674,7 +674,8 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						pstmt.close();
 						pstmt = null;
 
-						sql = " SELECT R.REPL_ORDER FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ORD_DET RT WHERE " +
+						//sql = " SELECT R.REPL_ORDER FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ORD_DET RT WHERE " +
+						sql = " SELECT R.REPL_ORDER,R.ORDER_TYPE FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, 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 W.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 RT.SITE_CODE = ? AND RT.ITEM_CODE = ? AND RT.LOC_CODE = ? AND RT.LOT_NO = ? AND RT.LOT_SL = ? " +
@@ -689,10 +690,13 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						if( rs.next() )
 						{
 							replOrd = checkNull(rs.getString("REPL_ORDER"));
+							orderType = checkNull(rs.getString("ORDER_TYPE"));
 							System.out.println("replOrd-->"+replOrd);
 							System.out.println("headerreplOrder-->"+replOrder);
-
-							if( !replOrder.trim().equalsIgnoreCase( replOrd ) )
+							System.out.println("orderType-->"+orderType);
+							
+							//if( !replOrder.trim().equalsIgnoreCase( replOrd ) )
+							if( !replOrder.trim().equalsIgnoreCase( replOrd )  && !"U".equalsIgnoreCase(orderType))
 							{
 								errList.add( "VTREPLORDR" );
 								errFields.add( childNodeName.toLowerCase() );