Issuetracker point 99(Deallocation sumit),Isutracker (14/17 Hazmet spliting wave)

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

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

 package ibase.webitm.ejb.wms;
 
 import java.rmi.RemoteException;
+import java.sql.Connection;
+
 import ibase.webitm.ejb.ActionHandlerLocal;
 import ibase.webitm.utility.ITMException;
 
 @javax.ejb.Local
 public interface DeallocArtConfLocal extends ActionHandlerLocal
 {
-	public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException;	
+	public String confirm( String tranId, String xtraParams, String forcedFlag )throws RemoteException,ITMException;
+	public String confirm( String tranId, String xtraParams, String forcedFlag, Connection conn, boolean conStat )throws RemoteException,ITMException;
 }

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

 package ibase.webitm.ejb.wms;
 
 import java.rmi.RemoteException;
+import java.sql.Connection;
+
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.ejb.ActionHandlerRemote;
 
 @javax.ejb.Remote
 public interface DeallocArtConfRemote extends ActionHandlerRemote
 {
-	public String confirm(String tranId, String xtraParams, String forcedFlag) throws RemoteException,ITMException;	
+	public String confirm( String tranId, String xtraParams, String forcedFlag )throws RemoteException,ITMException;
+	public String confirm( String tranId, String xtraParams, String forcedFlag, Connection conn, boolean conStat )throws RemoteException,ITMException;
 }
\ No newline at end of file

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

@@ -191,7 +191,7 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 							
 							if( "N".equalsIgnoreCase(holdStatus) && "N".equalsIgnoreCase(cancelStatus))
 							{
-								sql = "";
+								/*sql = "";
 								sql = "SELECT WAVE_ID, PTCN, REF_TYPE FROM WAVE_TASK_DET WHERE PTCN = ? AND REF_TYPE IN (?,?) ";
 								pstmt1 = conn.prepareStatement(sql);
 								pstmt1.setString(1, ptcn);
@@ -205,7 +205,7 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 									break;
 								}
 								rs1.close(); rs1 = null;
-								pstmt1.close(); pstmt1 = null;
+								pstmt1.close(); pstmt1 = null;*/
 								
 								if("A".equalsIgnoreCase(editFlag))
 								{
@@ -215,19 +215,20 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 											" FROM CARTON_MASTER CM, PICK_ORD_DET POD , PICK_ORD_HDR POH, WAVE_TASK_DET WTD WHERE CM.PTCN = ? " +
 											" AND CM.PICK_ORDER = POD.PICK_ORDER AND POH.PICK_ORDER = POD.PICK_ORDER " +
 											" AND CM.LINE_NO__PICK = POD.LINE_NO AND WTD.PTCN = CM.PTCN " +
-											" AND WTD.REF_ID = CM.PICK_ORDER  AND POH.PICK_TYPE IN (?,?) ";
+											" AND WTD.REF_ID = CM.PICK_ORDER  ";
+											//" AND POH.PICK_TYPE IN (?,?) ";
 											//" AND ( FN_CHECK_DEALLOC_ARTDET(CM.PTCN, CM.CARTON_NO ) = 0 ) "+					
 											//" AND CM.STATUS <> ? ";		
 										
 									pstmt1 = conn.prepareStatement(sql);		
 									pstmt1.setString(1, ptcn);		
-									pstmt1.setString(2, "C");
-									pstmt1.setString(3, "M");
+									//pstmt1.setString(2, "C");
+									//pstmt1.setString(3, "M");
 									//pstmt1.setString(4, "R");
 									rs1 = pstmt1.executeQuery();
 									if( !rs1.next() )
 									{
-										errList.add( "INVPTCASAD" ); //do not have case pick task in this ptcn
+										errList.add( "INVPTCASAD" ); 
 										errFields.add( childNodeName.toLowerCase() );
 										break;
 									}
@@ -705,7 +706,7 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 		{
 			String userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 			String chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
-
+			siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "site_code" );
 			DateFormat dateFormat = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			String dbDateFormat = genericUtility.getDBDateFormat();
 			String applDateFormat = genericUtility.getApplDateFormat();
@@ -727,8 +728,27 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 			{
 			case 1:
 			{
-				valueXmlString.append( "<Detail1>\r\n" );				
-				if( currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ) )							
+				valueXmlString.append( "<Detail1>\r\n" );
+				if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )							
+				{
+					valueXmlString.append( "<site_code><![CDATA[" ).append( siteCode ).append( "]]></site_code>\r\n" );
+					valueXmlString.append( "<cust_code__fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__fr>\r\n" );
+					valueXmlString.append( "<cust_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__to>\r\n" );
+					valueXmlString.append( "<cust_code__dlv_fr><![CDATA[" ).append( "00" ).append( "]]></cust_code__dlv_fr>\r\n" );
+					valueXmlString.append( "<cust_code__dlv_to><![CDATA[" ).append( "ZZ" ).append( "]]></cust_code__dlv_to>\r\n" );
+					valueXmlString.append( "<item_ser__fr><![CDATA[" ).append( "00" ).append( "]]></item_ser__fr>\r\n" );
+					valueXmlString.append( "<item_ser__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_ser__to>\r\n" );
+					valueXmlString.append( "<item_code__fr><![CDATA[" ).append( "00" ).append( "]]></item_code__fr>\r\n" );
+					valueXmlString.append( "<item_code__to><![CDATA[" ).append( "ZZ" ).append( "]]></item_code__to>\r\n" );
+					valueXmlString.append( "<lot_no__fr><![CDATA[" ).append( "00" ).append( "]]></lot_no__fr>\r\n" );
+					valueXmlString.append( "<lot_no__to><![CDATA[" ).append( "ZZ" ).append( "]]></lot_no__to>\r\n" );
+					valueXmlString.append( "<sale_order__fr><![CDATA[" ).append( "00" ).append( "]]></sale_order__fr>\r\n" );
+					valueXmlString.append( "<sale_order__to><![CDATA[" ).append( "ZZ" ).append( "]]></sale_order__to>\r\n" );
+					valueXmlString.append( "<carton_no__fr><![CDATA[" ).append( "00" ).append( "]]></carton_no__fr>\r\n" );
+					valueXmlString.append( "<carton_no__to><![CDATA[" ).append( "ZZ" ).append( "]]></carton_no__to>\r\n" );					
+					
+				}
+				else if( currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ) )							
 				{					
 					tranID = genericUtility.getColumnValue( "tran_id", currDom );
 					System.out.println("tranID ["+tranID+"]");
@@ -746,9 +766,13 @@ public class DeallocArtIC extends ValidatorEJB implements DeallocArtICRemote, De
 					valueXmlString.append( "<ptcn protect ='1'><![CDATA[" ).append( ptcn ).append( "]]></ptcn>\r\n" );
 					
 				}
-				else if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )							
+				else if( currentColumn.trim().equalsIgnoreCase( "sale_order__fr" ) )							
+				{					
+					//valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );					
+				}
+				else if( currentColumn.trim().equalsIgnoreCase( "sale_order__to" ) )							
 				{					
-					valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );					
+					//valueXmlString.append( "<confirmed><![CDATA[" ).append( "N" ).append( "]]></confirmed>\r\n" );					
 				}
 				else if("ptcn".equalsIgnoreCase(currentColumn.trim()))
 				{

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

@@ -163,7 +163,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			pstmtStock = conn.prepareStatement(sql);
 
 			sql = "SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, "
-					+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, R.QUANTITY QUANTITY, R.NO_ART NO_ART, "
+					//Changed by sumit on 14/03/13 getting quantity as (quantity - dealloc_qty)
+					//+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, R.QUANTITY QUANTITY, R.NO_ART NO_ART, "
+					+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) AS QUANTITY, R.NO_ART NO_ART, "
 					+ " R.LOC_CODE__TO LOC_CODE__TO, O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, O.PICK_ORDER,H.PICK_TYPE  "
 					+ " FROM PICK_ISS_DET R,  PICK_ORD_DET O,PICK_ORD_HDR H" 
 					+ " WHERE R.TRAN_ID = ? "
@@ -554,7 +556,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			    rs1.close();rs1 = null;
 			    pstmt1.close();pstmt1 = null;
 				
-				sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    //Changed by sumit on 19/03/13 changing condition check it from status flag
+			    //sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE STATUS = 'Y' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, waveId);
 			    pstmt1.setString(2, saleOrder);

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

@@ -156,9 +156,11 @@ public class MasterPackPos extends ValidatorEJB implements MasterPackPosRemote,
 
 					NodeList node2= dom.getElementsByTagName("Detail3");
 					System.out.println("****************%%%%%%%%%%%%%%%%******************************");
+					//Changed by sumit on 13/03/13 changing sql adding status condition
 					//Changed by Rohan on 25-02-13 for update master carton
 					//sql = "UPDATE CARTON_MASTER SET STATUS = ? WHERE CARTON_NO = ? ";
-					sql = "UPDATE CARTON_MASTER SET STATUS = ?,MASTER_CARTON = ? WHERE CARTON_NO = ? ";
+					//sql = "UPDATE CARTON_MASTER SET STATUS = ?,MASTER_CARTON = ? WHERE CARTON_NO = ? ";
+					sql = "UPDATE CARTON_MASTER SET STATUS = ?,MASTER_CARTON = ? WHERE CARTON_NO = ? AND STATUS <> 'R' ";
 					pstmt = conn.prepareStatement(sql);
 					for(cnt = 0; cnt < node2.getLength(); cnt++)
 					{	
@@ -245,7 +247,9 @@ public class MasterPackPos extends ValidatorEJB implements MasterPackPosRemote,
 						{
 							outerCarton = rs.getString(1);
 							System.out.println("Outer Carton["+outerCarton+"]");
-							sql1 = "UPDATE CARTON_MASTER SET STATUS = 'U' WHERE CARTON_NO = ? ";
+							//Changed by sumit on 13/03/13 changing sql adding status condition
+							//sql = "UPDATE CARTON_MASTER SET STATUS = ?,MASTER_CARTON = ? WHERE CARTON_NO = ? ";
+							sql1 = "UPDATE CARTON_MASTER SET STATUS = 'U' WHERE CARTON_NO = ? AND STATUS <> 'R'";
 							pstmt1 = conn.prepareStatement(sql1);
 							pstmt1.setString(1,outerCarton);
 							pstmt1.executeUpdate();	

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

@@ -290,7 +290,9 @@ public class PackingConf extends ActionHandlerEJB implements PackingConfLocal, P
 			    rs1.close();rs1 = null;
 			    pstmt1.close();pstmt1 = null;
 				
-			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    //Changed by sumit on 19/03/13 changing condition
+			    //sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE STATUS = 'Y' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, waveId);
 			    pstmt1.setString(2, saleOrder);

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

@@ -257,14 +257,18 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 				pstmtStock = conn.prepareStatement(sql);
 
 				sql = "SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, "
-						+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, R.QUANTITY QUANTITY, R.NO_ART NO_ART, "
+						//Changed by sumit on 11/03/13 getting quantity as 
+						//+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, R.QUANTITY QUANTITY, R.NO_ART NO_ART, "
+						+ " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, (R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) AS QUANTITY, R.NO_ART NO_ART, "
 						+ " R.LOC_CODE__TO LOC_CODE__TO, O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, O.PICK_ORDER,H.PICK_TYPE,R.LINE_NO__ORD,O.EXP_LEV EXP_LEV "
 						+ " FROM PICK_ISS_DET R,  PICK_ORD_DET O ,PICK_ORD_HDR H"//CHANGES DONE BY CHITRANJAN PICK_ORD_HDR H  TO GET PICK TYPE 
 						+ " WHERE R.TRAN_ID = ? "
 						+ " AND R.PICK_ORDER = O.PICK_ORDER "   
 						+"AND H.PICK_ORDER = O.PICK_ORDER" //CHANGES DONE BY CHITRANJAN 
 						+ " AND O.LINE_NO = R.LINE_NO__ORD " 
-				+ " AND R.LOC_CODE <> R.LOC_CODE__TO ";
+						//Changed by sumit on 11/03/13 adding condition to retrieve data
+						+ " AND (R.QUANTITY - (CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END )) > 0 "
+						+ " AND R.LOC_CODE <> R.LOC_CODE__TO ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);
 				rs = pstmt.executeQuery();
@@ -1097,7 +1101,9 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 			    rs1.close();rs1 = null;
 			    pstmt1.close();pstmt1 = null;
 				
-			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    //Changed by sumit on 19/03/13 changing condition
+			    //sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE STATUS = 'Y' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, waveId);
 			    pstmt1.setString(2, saleOrder);

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

@@ -147,7 +147,11 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 						//if(!"M".equalsIgnoreCase(pickType)) // 22/09/12 manoharan
 						if(!"M".equalsIgnoreCase(pickType) || "P-PICK".equalsIgnoreCase(refSer)) // 22/09/12 manoharan
 						{
-							sql = "UPDATE CARTON_MASTER SET STATUS = 'U', pallet_no = ? WHERE PICK_ORDER = ? and line_no__pick in (select line_no__ord from pick_iss_det where tran_id = ?) ";
+							//Changed by sumit on 11/09/13 adding condition of status.
+							//sql = "UPDATE CARTON_MASTER SET STATUS = 'U', pallet_no = ? WHERE PICK_ORDER = ? and line_no__pick in (select line_no__ord from pick_iss_det where tran_id = ?) ";
+							sql =   " UPDATE CARTON_MASTER SET STATUS = 'U', PALLET_NO = ? WHERE PICK_ORDER = ? " +
+									" AND LINE_NO__PICK IN (SELECT LINE_NO__ORD FROM PICK_ISS_DET WHERE TRAN_ID = ?) " +
+									" AND STATUS <> 'R'";
 							
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1,palletNo);
@@ -173,7 +177,10 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 							//end by kunal
 						}
 						//select no of art from pick_ord_det 
-						sql = "SELECT SUM(NO_ART) FROM PICK_ORD_DET WHERE PICK_ORDER = ?";
+						//Changed by sumit on 18/03/13 adding condition 
+						//sql = "SELECT SUM(NO_ART) FROM PICK_ORD_DET WHERE PICK_ORDER = ? ";
+						sql = "SELECT SUM(NO_ART) FROM PICK_ORD_DET WHERE PICK_ORDER = ? " +
+							  "AND (QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END ) > 0 ";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString( 1, pickOrder );
 						rs = pstmt.executeQuery();

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

@@ -103,7 +103,7 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 		double stkGrossRate = 0d;
 		double stkRate = 0d;
 
-		double quantity = 0.0,pickQty = 0, actualQty = 0,qtyOrd = 0.0;
+		double quantity = 0.0,pickQty = 0, actualQty = 0,qtyOrd = 0.0,deallocQty = 0.0;
 		double noArt = 0.0;
 		double shipperSize = 0,itemGrossWeight = 0,	caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0;
 
@@ -246,7 +246,8 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					{
 					//Chnaged by Rohan on 15-02-13 for calculating actual qty from repanishment in case of stock to dock.end	
 						replOrderLineNo  = rs.getInt("ORDER_lINE_NO");
-						sql = " SELECT SUM(QUANTITY) AS QUANTITY FROM " +
+						//Changed by sumit on 13/03/13 getting quantity as (quantity-dealloc_qty).start
+						/*sql = " SELECT SUM(QUANTITY) AS QUANTITY FROM " +
 								" ( SELECT SUM(QUANTITY) AS QUANTITY FROM (SELECT SUM(QUANTITY) AS QUANTITY FROM PICK_ORD_DET P " +
 								" WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ?   AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' " +
 								" UNION ALL " +
@@ -260,7 +261,21 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 								" (SELECT REPL_ORDER , LINE_NO FROM REPL_ORD_DET  WHERE PICK_ORDER = ? AND LINE_NO__PICK = ? )))" +
 								//Changed by sumit on 14/02/13 checking whether wave cancel or hold
 								" AND FN_IS_VALID_PICK_ORDER(PICK_ORDER) = 'Y' ))";
-	
+						 */
+						sql = " SELECT SUM(QUANTITY) AS QUANTITY FROM " +
+						" ( SELECT SUM(QUANTITY) AS QUANTITY FROM (SELECT SUM(QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END) AS QUANTITY FROM PICK_ORD_DET P " +
+						" WHERE P.REPL_ORDER = ? AND P.LINE_NO__REPL = ?   AND FN_IS_VALID_PICK_ORDER(P.PICK_ORDER) = 'Y' " +
+						" UNION ALL " +
+						" SELECT SUM(QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END) FROM PICK_ORD_DET  WHERE (REPL_ORDER, LINE_NO__REPL) 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' " +
+						" UNION ALL " +
+						" SELECT SUM(QUANTITY - CASE WHEN DEALLOC_QTY IS NULL THEN 0 ELSE DEALLOC_QTY END) 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' ))";
+						//Changed by sumit on 13/03/13 getting quantity as (quantity-dealloc_qty).end
+						
 						pstmtPick = conn.prepareStatement(sql);
 						pstmtPick.setString(1, replOrder);	
 						pstmtPick.setInt(2, replOrderLineNo);	
@@ -575,6 +590,11 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 							while(rsPick.next())
 							{
 								pickQty = rsPick.getDouble("QUANTITY");
+								deallocQty = rsPick.getDouble("DEALLOC_QTY");
+								System.out.println("19/03/13 pickQty [" + pickQty + "]deallocQty ["+deallocQty+"]");
+								pickQty = pickQty - deallocQty;
+								System.out.println("19/03/13 after calculating pickQty [" + pickQty + "]");
+								
 								saleOrder = rsPick.getString("SALE_ORDER");
 								lineNoSord = rsPick.getString("LINE_NO__SORD");
 								lineNoSord = "   " + lineNoSord; 
@@ -1357,7 +1377,9 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 			    rs1.close();rs1 = null;
 			    pstmt1.close();pstmt1 = null;
 				
-				sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    //Changed by sumit on 19/03/13 changing condition
+			    //sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE WAVE_STATUS = 'V' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
+			    sql1 = "SELECT COUNT(*) AS CONT FROM WAVE_TASK_DET WHERE STATUS = 'Y' AND WAVE_ID = ? AND SALE_ORDER = ? AND REF_SER <> 'S-DSP' ";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, waveId);
 			    pstmt1.setString(2, saleOrder);

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

@@ -365,6 +365,10 @@ etc
 										valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
 										//Changed by sumit on 29/12/12 display parcel pick allow
 										valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
+										valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n");
+										valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n");
+										valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n");
+										
 									}
 									//System.out.println("Hello sale_order__from4");
 								}
@@ -380,6 +384,9 @@ etc
 									valueXmlString.append( "<stock_to_dock_allow protect ='1' ><![CDATA[" ).append( "" ).append( "]]></stock_to_dock_allow>\r\n" );
 									//Changed by sumit on 29/12/12 display parcel pick allow
 									valueXmlString.append("<parcelpack_allow protect ='1' ><![CDATA[").append("").append("]]></parcelpack_allow>\r\n");
+									valueXmlString.append("<direct_pick_loc><![CDATA[").append("").append("]]></direct_pick_loc>\r\n");
+									valueXmlString.append("<ship_type><![CDATA[").append("").append("]]></ship_type>\r\n");
+									valueXmlString.append("<pallet_no><![CDATA[").append("").append("]]></pallet_no>\r\n");
 									
 								}
 								
@@ -644,6 +651,11 @@ etc
 		String masterPackAllow = "";
 		String activePickAllow = "";
 		String stockToDockAllow = "";
+		String parcelPackAllow = "";
+		String directPickLoc = "";
+		String palletNo = "";
+		//Changed By Pragyan 25/feb/13 To change the validation with ship type
+		String  shipType = "";
 		String custCode = "";
 		//Changed by sumit on 03/10/12 
 		String printer = "";
@@ -761,6 +773,7 @@ etc
 					else if ( "master_pack_allow".equalsIgnoreCase( childNodeName ) )
 					{
 						masterPackAllow = checkNull(genericUtility.getColumnValue( "master_pack_allow", currFormDataDom ));
+						parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
 						custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
 						if(masterPackAllow.trim().length() > 0 )
 						{
@@ -779,6 +792,112 @@ etc
 									//errFields.add( "" );
 								}
 							}
+							
+							if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
+							{
+								errFields.add( childNodeName.toLowerCase() );
+								errList.add( "ONSELCMP" );
+							}
+							
+							if( rs != null )
+							{
+								rs.close();
+								rs = null;
+							}
+							if( pstmt != null )
+							{
+								pstmt.close();
+								pstmt = null;								
+							}
+						}
+					}
+					//Changed By Pragyan 25/feb/13 To change the validation with ship type.start
+					else if ( "parcelpack_allow".equalsIgnoreCase( childNodeName ) )
+					{
+						parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
+						custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
+						if(parcelPackAllow.trim().length() > 0 )
+						{
+							sql = 	"SELECT C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
+									"FROM CUSTOMER C, WAVE_TYPE W WHERE C.WAVE_TYPE = W.WAVE_TYPE AND C.CUST_CODE = ? ";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, custCode);
+							rs = pstmt.executeQuery();
+							if( rs.next())
+							{								
+								if( !parcelPackAllow.equalsIgnoreCase(rs.getString("PARCELPACK_ALLOW")))
+								{
+									//errList.add( "STOCK2DOC" );
+									errFields.add( childNodeName.toLowerCase() );
+									errList.add( "CHSINGLELT" );
+									//errFields.add( "" );
+								}
+							}
+							if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
+							{
+								errFields.add( childNodeName.toLowerCase() );
+								errList.add( "ONSELCMP" );
+							}
+							if( rs != null )
+							{
+								rs.close();
+								rs = null;
+							}
+							if( pstmt != null )
+							{
+								pstmt.close();
+								pstmt = null;								
+							}
+						}
+					}
+					//Changed By Pragyan 25/feb/13 To change the validation with ship type.end
+					else if ( "ship_type".equalsIgnoreCase( childNodeName ) )
+					{
+						masterPackAllow = checkNull(genericUtility.getColumnValue( "master_pack_allow", currFormDataDom ));
+						parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
+						shipType = checkNull(genericUtility.getColumnValue( "ship_type", currFormDataDom ));
+						
+						if(("Y".equalsIgnoreCase(masterPackAllow)) && !("A".equalsIgnoreCase(shipType) || "M".equalsIgnoreCase(shipType)))
+						{
+							errFields.add( childNodeName.toLowerCase() );
+							errList.add( "ATLSTSELMP" );
+						}
+						else if(("Y".equalsIgnoreCase(parcelPackAllow)) && !("A".equalsIgnoreCase(shipType) || "P".equalsIgnoreCase(shipType)))
+						{
+							errFields.add( childNodeName.toLowerCase() );
+							errList.add( "ATLSTSELPP" );
+						}
+						else if(!("Y".equalsIgnoreCase(parcelPackAllow) || "Y".equalsIgnoreCase(masterPackAllow) ) && ("M".equalsIgnoreCase(shipType) || "P".equalsIgnoreCase(shipType)))
+						{
+							errFields.add( childNodeName.toLowerCase() );
+							errList.add( "ATLSTSENAN" );
+						}
+						
+					}//directPickLoc
+					else if ( "direct_pick_loc".equalsIgnoreCase( childNodeName ) )
+					{
+						directPickLoc = checkNull(genericUtility.getColumnValue( "direct_pick_loc", currFormDataDom ));
+						int countLoc = 0;
+						if(directPickLoc != null && directPickLoc.trim().length() > 0 )
+						{
+							sql = 	"SELECT COUNT(*) FROM LOCATION WHERE LOC_CODE= ? AND DIRECT_PICK = ?" ;
+									
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, directPickLoc);
+							pstmt.setString(2, "Y");
+							rs = pstmt.executeQuery();
+							if( rs.next())
+							{					
+								countLoc = rs.getInt(1); 
+								if( !(countLoc > 0))
+								{
+									//errList.add( "STOCK2DOC" );
+									errFields.add( childNodeName.toLowerCase() );
+									errList.add( "INVDPIKLOC" );
+									//errFields.add( "" );
+								}
+							}
+							
 							if( rs != null )
 							{
 								rs.close();
@@ -790,7 +909,56 @@ etc
 								pstmt = null;								
 							}
 						}
+						
 					}
+					else if ( "pallet_no".equalsIgnoreCase( childNodeName ) )
+					{
+						directPickLoc = checkNull(genericUtility.getColumnValue( "direct_pick_loc", currFormDataDom ));
+						palletNo = checkNull(genericUtility.getColumnValue( "pallet_no", currFormDataDom ));
+						int countLoc = 0;
+						if(directPickLoc != null && directPickLoc.trim().length() > 0 )
+						{
+								if(palletNo != null && palletNo.trim().length() > 0 )
+								{
+									sql = 	"SELECT COUNT(*) FROM PALLET_NO WHERE PALLET_NO = ? AND STATUS= ?" ;
+											
+									pstmt = conn.prepareStatement(sql);
+									pstmt.setString(1, palletNo);
+									pstmt.setString(2, "A");
+									rs = pstmt.executeQuery();
+									if( rs.next())
+									{					
+										countLoc = rs.getInt(1); 
+										if( !(countLoc > 0))
+										{
+											//errList.add( "STOCK2DOC" );
+											errFields.add( childNodeName.toLowerCase() );
+											errList.add( "INVPLTNO1" );
+											//errFields.add( "" );
+										}
+									}
+									
+									if( rs != null )
+									{
+										rs.close();
+										rs = null;
+									}
+									if( pstmt != null )
+									{
+										pstmt.close();
+										pstmt = null;	
+									}
+								}
+								else
+								{
+									errFields.add( childNodeName.toLowerCase() );
+									errList.add( "NVLPLTMND" );
+									
+								}
+						}
+						
+					}
+					//Changed by sumit on 03/10/12 validating printer service name with existing printer in system start.
 					else if ( "active_pick_allow".equalsIgnoreCase( childNodeName ) )
 					{
 						activePickAllow = checkNull(genericUtility.getColumnValue( "active_pick_allow", currFormDataDom ));

webitm-wms/module-resource/sql/update.sql

@@ -31498,8 +31498,407 @@ alter table pick_iss_det modify carton_no varchar2(20);
 alter table pick_iss_det add pack_code char(5);
 
 
+DROP TABLE dealloc_art;
+
+CREATE TABLE dealloc_art
+(
+TRAN_ID                                 VARCHAR2(10),
+SITE_CODE                               CHAR(5),         
+CONFIRMED                               CHAR(1),
+CONF_DATE                               DATE,                       
+CHG_DATE                                DATE,                                
+CHG_USER                                CHAR(10),                           
+CHG_TERM                                CHAR(15)   
+);
+
+ALTER TABLE DEALLOC_ART ADD ( CONSTRAINT PK_A_DEALLOC PRIMARY KEY ( TRAN_ID )) ;
+
+DROP TABLE dealloc_art_det;
+Create table dealloc_art_det
+(
+TRAN_ID                                 VARCHAR2(10),                      
+LINE_NO                                 NUMBER(3), 
+SALE_ORDER                              CHAR(10),                            
+LINE_NO__SORD                           CHAR(3),   
+WAVE_ID                                 VARCHAR2(12),                         
+PTCN                                    CHAR(10),
+CARTON_NO                               VARCHAR2(20),   
+ITEM_CODE                               CHAR(10),  
+LOC_CODE                                CHAR(8),            
+LOT_NO                                  CHAR(15),                                                                 
+LOT_SL                                  CHAR(15), 
+QUANTITY                                NUMBER(14,3) ,               
+PICK_TYPE                               CHAR(1),
+PICK_ORDER                              CHAR(10),                   
+LINE_NO__PICK                           NUMBER(3)
+);
+ALTER TABLE DEALLOC_ART_DET ADD ( CONSTRAINT PK_A_DEALLOCDET PRIMARY KEY ( TRAN_ID, LINE_NO )) ;
+
+
+alter table repl_ord_det add dealloc_qty  NUMBER(14,3);
+alter table repl_iss_det add dealloc_qty  NUMBER(14,3);
+alter table pick_ord_det add dealloc_qty  NUMBER(14,3);
+alter table pick_iss_det add dealloc_qty  NUMBER(14,3);
+
+INSERT INTO obj_itemchange (
+	obj_name ,
+	form_no ,
+	field_name ,
+	mandatory )
+ VALUES (
+	'dealloc_art_proc',
+	'1  ',
+	'itm_default',
+	'Y');
+	
+	INSERT INTO SYSTEM_EVENTS (
+	obj_name ,
+	event_code ,
+	event_context ,
+	service_code ,
+	method_rule ,
+	overwrite_core ,
+	chg_date ,
+	chg_user ,
+	chg_term ,
+	result_handle ,
+	comp_type ,
+	comp_name ,
+	comm_format )
+ VALUES (
+	'dealloc_art_proc',
+	'post_item_change',
+	'1',
+	'poic_default_ejb',
+	NULL,
+	'0',
+	TO_DATE('11-01-2013 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+	'BASE      ',
+	'BASE',
+	'2',
+	'EJB',
+	'DeallocArtIC',
+	NULL);
+
+	alter table pack_det add status char(1) default 'P';
+
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'INVDEALLQ1',
+        'Invalid quantity',
+        'Quantity can not be zero or less than zero',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE',
+        'BASE',
+        NULL,
+        NULL);
+		
+		INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'INVDEALLQ2',
+        'Invalid quantity',
+        'Quantity can not be more than real quantity',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE',
+        'BASE',
+        NULL,
+        NULL);
+		
+		INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'INVREFIDDE',
+        'Deallocation not allowed',
+        'Scanning is in progress, please scan first then deallocate.',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE',
+        'BASE',
+        NULL,
+        NULL);
+		
+
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'INVDEALLQ3',
+        'Invalid quantity',
+        'Quantity can not be altered for full CASES',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE',
+        'BASE',
+        NULL,
+        NULL);
+		
+delete  from messages where msg_no in ('ATLSTSELMP','ATLSTSELPP','ATLSTSENAN','ONSELCMP','INVDPIKLOC');
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'NVLPLTMND',
+        'Blank Pallet No',
+        'Pallet No is Mandatory In case of Direct Pick Location Selected in Wave',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE      ',
+        'Pragyan',
+        NULL,
+        NULL);
+        
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+        'NVLTRANCOD',
+        'DOCK Location not available',
+        'DOCK Location not available',
+        'E',
+        'Y',
+        NULL,
+        NULL,
+        NULL,
+        TO_DATE('14-12-2012 00:00:00','DD-MM-YYYY HH24:MI:SS'),
+        'BASE      ',
+        'Pragyan',
+        NULL,
+        NULL);
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+	'ATLSTSELMP',
+	'Invalid selection',
+	'For Master Pack , Shipment type should be As per Routing or Master Pack',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
+	'base      ',
+	'Pragyan        ',
+	NULL,
+	NULL);
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+	'ATLSTSELPP',
+	'Invalid selection',
+	'For Parcel Pack , Shipment type should be As per Routing or Parcel Pack',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
+	'base      ',
+	'Pragyan        ',
+	NULL,
+	NULL);
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+	'ATLSTSENAN',
+	'Invalid selection',
+	'Only For Master/Parcel Pack , Shipment Type should be Master/Parcel',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
+	'base      ',
+	'Pragyan        ',
+	NULL,
+	NULL);
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES(
+	'INVDPIKLOC',
+	'Invalid Direct Pick',
+	'Invalid Direct Pick Location',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
+	'base      ',
+	'Pragyan        ',
+	NULL,
+	NULL);
+INSERT INTO MESSAGES (
+        msg_no ,
+        msg_str ,
+        msg_descr ,
+        msg_type ,
+        msg_opt ,
+        msg_time ,
+        alarm ,
+        err_source ,
+        chg_date ,
+        chg_user ,
+        chg_term ,
+        override_input,
+        mail_option )
+ VALUES (
+	'ONSELCMP  ',
+	'Invalid selection',
+	'Both Master Allow and Parcel Allow should not be selected for the same wave',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
+	'base      ',
+	'Pragyan        ',
+	NULL,
+	NULL);
+
  
-       		
 commit;