add source received from sun on 05/DEC/13 for Issue Tracker No-303

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

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

@@ -3227,8 +3227,11 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 								 " R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE NOT IN ('E','Q','T','P','I') " +
 								//Changed by sankara on 18/11/13 for rep order set itm default
 								 //" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE";
-								 " AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND H.ASSIGN_TO = ? " +
-								 " AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY REPL_ORDER, LOC_CODE ";
+								//Changed by sankara on 28/11/13 for rep order set itm default start.
+								/* " AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND H.ASSIGN_TO = ? " +
+								   " AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY REPL_ORDER, LOC_CODE ";   */
+								" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND (H.ASSIGN_TO = ? OR H.ASSIGN_TO IS NULL) " +
+							    " AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY ASSIGN_TO,REPL_ORDER,LOC_CODE ";
 						}
 						else if("active_repl_iss".equalsIgnoreCase(objNameChk))
 						{
@@ -3241,8 +3244,11 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 								  " AND R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE IN ('E','Q','T','P','I') " +
 								 //changed by sankara on 18/11/13 for rep order set itm default
 								 // "AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY LOC_CODE ";
-								  " AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND H.ASSIGN_TO = ? " +
-								  " AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY REPL_ORDER, LOC_CODE ";
+								//changed by sankara on 28/11/13 for rep order set itm default start.
+								/*" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND H.ASSIGN_TO = ? " +
+								  " AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY REPL_ORDER, LOC_CODE ";   */
+								  " AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND L.INV_STAT = ? AND (H.ASSIGN_TO = ? OR H.ASSIGN_TO IS NULL) " +
+								  " AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) ORDER BY ASSIGN_TO,REPL_ORDER,LOC_CODE ";
 						}
 						System.out.println("CURRENT SQL["+sql+"]");
 						
@@ -3281,10 +3287,22 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 						}
 						//changed by sankara on 18/11/13 for rep order set itm default start.
 						//valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
-						if(assignTo !=null && assignTo.trim().length() > 0 )
+						 //changed by sankara on 28/11/13 for rep order set itm default start.
+						/*if(assignTo !=null && assignTo.trim().length() > 0 )
 						{
 							valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
+						}   */
+						if(assignTo != null && assignTo.trim().length() > 0 && replOrderChk != null && replOrderChk.trim().length() > 0  )
+						{
+							System.out.println("assign_to is not null");
+							valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
+						}
+					   if((assignTo == null || assignTo.trim().length() <= 0)  && replOrderChk != null && replOrderChk.trim().length() > 0  )
+					   {
+						   System.out.println("repl order mismatch");
+						   valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
 					   }
+					 //changed by sankara on 28/11/13 for rep order set itm default end.
 					//changed by sankara on 18/11/13 for rep order set itm default end.
 					}
 					//Changed By Pragyan 26/11/12 To set the last used Inventory for scaning.end
@@ -3301,8 +3319,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 									" WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND" +
 									" CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' AND " +
 									" R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE NOT IN ('E','Q','T','P','I') " +
-									" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND H.ASSIGN_TO = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
-									" ORDER BY REPL_ORDER,ASSIGN_TO,LOC_CODE ";
+									//changed by sankara on 28-11-13 for set repl order itm default start.
+									/*" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND H.ASSIGN_TO = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
+									" ORDER BY REPL_ORDER,ASSIGN_TO,LOC_CODE ";*/
+									" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE  AND (H.ASSIGN_TO = ? OR H.ASSIGN_TO IS NULL)  AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
+									" ORDER BY ASSIGN_TO,REPL_ORDER,LOC_CODE ";
+							       //changed by sankara on 28-11-13 for set repl order itm default end.
 						}
 						else if("active_repl_iss".equalsIgnoreCase(objNameChk))
 						{
@@ -3311,9 +3333,12 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 									" FROM REPL_ORD_DET R,REPL_ORD_HDR H, WAVE_TASK_DET W,LOCATION L ,WAVE_TASK WH" +
 									" WHERE W.WAVE_ID = WH.WAVE_ID AND R.REPL_ORDER = H.REPL_ORDER AND " +  
 									" CASE WHEN R.CANCEL_MODE IS NULL THEN 'N' ELSE R.CANCEL_MODE END <> 'Y' " +
-									" AND R.REPL_ORDER = W.REF_ID AND W.STATUS = 'N' AND H.ORDER_TYPE IN ('E','Q','T','P','I') " +
-									" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND H.ASSIGN_TO = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
-									" ORDER BY REPL_ORDER,ASSIGN_TO,LOC_CODE ";
+									//changed by sankara on 28-11-13 for set repl order itm default start.
+									/*" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND H.ASSIGN_TO = ? AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
+									" ORDER BY REPL_ORDER,ASSIGN_TO,LOC_CODE ";*/
+									" AND FN_VALID_REPL(H.REPL_ORDER) = 'Y' AND R.LOC_CODE = L.LOC_CODE AND (H.ASSIGN_TO = ? OR H.ASSIGN_TO IS NULL) AND FN_CHECK_REPL_ORD_USER(H.REPL_ORDER,?) = 1) "+
+									" ORDER BY ASSIGN_TO,REPL_ORDER,LOC_CODE ";
+							       //changed by sankara on 28-11-13 for set repl order itm default end.
 						}					
 						System.out.println("CURRENT SQL["+sql+"]");						
 						pstmt = conn.prepareStatement( sql );
@@ -3339,7 +3364,9 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 							pstmt.close();
 							pstmt = null;
 						}
-						if(assignTo != null && assignTo.trim().length() > 0 )
+						//changed by sankara on 28-11-13 for set repl order itm default
+						//if(assignTo != null && assignTo.trim().length() > 0 )
+						if(assignTo != null && assignTo.trim().length() > 0 && replOrderChk != null && replOrderChk.trim().length() > 0  )
 						{
 							valueXmlString.append( "<repl_order><![CDATA[" ).append( checkNull( replOrderChk )).append( "]]></repl_order>\r\n" );
 							USER_DEFINED_VALUE_MAP.put(loginCode, invstat);

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

@@ -1077,6 +1077,26 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 				    	
 					 //}
 					 
+					/*if(!isOrderIsInProcess(saleOrder, ptcn, conn))
+					{
+					 
+						//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .start
+						pstmtSord.setString(1, "O");
+						pstmtSord.setString(2, saleOrder);
+						pstmtSord.setString(3, "C");
+						
+						updateSorder = pstmtSord.executeUpdate();
+						
+						if(updateSorder > 0)
+						{
+							System.out.println(" SORDER UPDATE COUNT ["+updateSorder+"]");
+						}
+						pstmtSord.clearParameters();
+						//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
+					}*/
+		        	 	
+			    }//if close
+				
 				if(!isOrderIsInProcess(saleOrder, ptcn, conn))
 				{
 					 
@@ -1094,8 +1114,22 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 						pstmtSord.clearParameters();
 						//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
 				}
+				else if(isDespExistForOrder(saleOrder, ptcn, conn))
+				{
+					pstmtSord.setString(1, "C");
+					pstmtSord.setString(2, saleOrder);
+					pstmtSord.setString(3, "C");
+					
+					updateSorder = pstmtSord.executeUpdate();
+					
+					if(updateSorder > 0)
+					{
+						System.out.println(" SORDER UPDATE COUNT DESP EXIST["+updateSorder+"]");
+					}
+					pstmtSord.clearParameters();
+
+				}
 				
-			    }//if close
 			    //Changed by Rohan on 30-05-13 for void packages duning master pick and parcel picking.end
 			 }//while close
 			
@@ -2636,6 +2670,79 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
 	 return isOrderIsInProcess;
 	}
 	//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
+	private boolean isDespExistForOrder(String saleOrder,String ptcn,Connection conn) throws ITMException
+	{
+
+		PreparedStatement pstmt = null;
+		String sql = "";
+		ResultSet rSet = null;
+		boolean isDespExistForOrder = false;
+		int count = 0;
+		
+		try
+		{
+			sql = "SELECT COUNT(*) from despatch d" 
+					+ " WHERE d.SORD_NO = ? " 
+					+ " AND d.CONFIRMED = ? ";
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1,saleOrder);
+			pstmt.setString(2,"Y");
+			
+			rSet = pstmt.executeQuery();
+			
+			if( rSet.next())
+			{
+				count = rSet.getInt(1);		
+				System.out.println("isDespExistForOrder==============>>>count["+count+"]");	
+				if(count > 0)
+				{
+					return isDespExistForOrder = true;
+				}
+			}
+			
+			if(rSet != null)
+			{
+				rSet.close();
+				rSet = null;
+			}
+			
+			if(pstmt != null)
+			{
+				pstmt.close();
+				pstmt = null;
+			}
+			
+		}
+		catch(Exception e)
+		{
+			System.out.println("Exception in  == >"+e);
+			e.printStackTrace();
+			throw new ITMException(e);
+		}
+		finally
+		{
+			try
+			{
+				if( rSet != null )
+				{
+					rSet.close();
+					rSet = null;
+				}
+				if( pstmt != null )
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+			}
+			catch (Exception e1)
+			{
+				throw new ITMException(e1);
+			}
+		}
+	 System.out.println("isDespExistForOrder==============>>>"+isDespExistForOrder);	
+	 return isDespExistForOrder;
+	}
+	//Changed By Pragyan WM3DSUN015 To update status in Sorder as InProcess after .end
 
 	private boolean isManualAllocStock(String saleOrder,String lineNoSord,Connection conn) throws ITMException
 	{

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

@@ -4748,7 +4748,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				else
 				{
 					isActives = false;
-					orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
+					//Changed By Pragyan 04/DEC/13 UAT KB Sir for not integral quantity only case should allocate
+					//orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
+					orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF_CASE, STOCK.LOC_CODE ";
 				}
 				
 				if(isActives && "N".equalsIgnoreCase(isActivePickChecked))