changed by sanmkara on 30/07/14 updated wavegenerationprc and master packic

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

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

@@ -9,7 +9,6 @@ import java.rmi.RemoteException;
 import java.sql.*;
 import java.text.*;
 import java.util.*;
-import java.util.Date;
 
 import javax.ejb.*;
 import javax.naming.InitialContext;
@@ -128,9 +127,9 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 		ArrayList errFields = new ArrayList();
 		String holdStatus = "N";
 		String cancelStatus = "N";
-        //changed by sankara on 07/jun/14 for period stat
 		java.util.Date tranDateDt = null;
 		String prdCode = "";
+		
 		try
 		{
 			String columnValue = "";
@@ -150,7 +149,6 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 			double cartVolume = 0.0;		
 			double selectCartVolume = 0.0;	
 			int noCases = 0;
-		//	changed by sankara on 07/jun/14 for period stat
 			SimpleDateFormat sdf1 = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			double masterPackCount  = 0.0, masterPackWeight = 0.0; // Added by sumit on 16/01/13
 			DistCommon discommon = new DistCommon(); // Added by sumit on 16/01/13
@@ -549,13 +547,15 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 							
 							//Changed By Pragyan 15-feb-13 to check validation 
 							//sql = "select confirmed from pick_iss_hdr where pick_order = ?";
-							sql = "SELECT COUNT(*) FROM PICK_ISS_HDR P,PICK_ISS_DET D "+
+							//changed by sankara on 29/07/14 check status from wave_task_det directley start.
+							/*sql = "SELECT COUNT(*) FROM PICK_ISS_HDR P,PICK_ISS_DET D "+
 									" WHERE P.TRAN_ID = D.TRAN_ID AND P.PICK_ORDER= ? "+ 
-									" AND P.CONFIRMED= ? ";
+									" AND P.CONFIRMED= ? ";*/
+							sql = " SELECT COUNT(*) FROM WAVE_TASK_DET WHERE REF_ID =  ? AND STATUS = ? " ; 
+							//changed by sankara on 29/07/14 check status from wave_task_det directley end.
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setString(1, pickOrder);
-							pstmt.setString(2, "N");
-							
+							pstmt.setString(2, "N");						
 							rs = pstmt.executeQuery();
 							int cCtr = 0;
 							
@@ -574,6 +574,28 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 								errList.add( "VTPCKCONF1" );
 								errFields.add( childNodeName.toLowerCase() );
 							}
+							//Changed By Pragyan 29/JUL/14 To check from that all lines are picked.start
+							sql = " SELECT COUNT(1)  FROM PICK_ORD_DET P WHERE P.PICK_ORDER = ? "
+								 +" AND (P.QUANTITY - (CASE WHEN P.DEALLOC_QTY IS NULL THEN 0 ELSE P.DEALLOC_QTY END ) )> 0 "
+								 +" AND (CASE WHEN P.STATUS IS NULL THEN 'N' ELSE P.STATUS END ) <> 'C'";			
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, pickOrder);			
+							rs = pstmt.executeQuery();
+							if (rs.next())
+							{
+								cCtr = rs.getInt(1);
+							}
+							rs.close();
+							rs = null;
+							pstmt.close();
+							pstmt = null;
+							//if( ! "Y".equalsIgnoreCase(confirmed.trim()) )
+							if( cCtr > 0)
+							{
+								errList.add( "TRALNOTPIK" );
+								errFields.add( childNodeName.toLowerCase() );
+							}
+							//Changed By Pragyan 29/JUL/14 To check from that all lines are picked.end
 						}
 					}//outer_carton_no case
 					/*else if ( "outer_carton_no".equalsIgnoreCase( childNodeName ) )
@@ -753,6 +775,31 @@ public class MasterPackIC extends ValidatorEJB implements MasterPackICRemote, Ma
 						}//end 
 						//Changed by Pragyan.End
 					}
+					//changed by sankara on 29/07/14 for packing not allowed if hold quantity found start.
+					int Holdqtycount = 0;
+					pickOrder = genericUtility.getColumnValue("pick_order", currDom );
+					System.out.println("pick order from currdom:::::"+pickOrder);
+					
+					sql = " SELECT COUNT(*) AS HOLD_QTY FROM STOCK S, PICK_ISS_HDR PH, PICK_ISS_DET PD WHERE PH.PICK_ORDER = PD.PICK_ORDER " +
+						  " AND PD.SITE_CODE = S.SITE_CODE AND PD.ITEM_CODE = S.ITEM_CODE AND PD.LOT_NO = S.LOT_NO AND PD.LOT_SL = S.LOT_SL " +
+						  " AND PD.LOC_CODE = S.LOC_CODE AND TRIM ( S.HOLD_QTY ) > 0 AND PD.DEALLOC_QTY IS NULL AND PD.PICK_ORDER = ? " ;
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1, pickOrder);
+					rs = pstmt.executeQuery();
+					if ( rs.next() )
+					{
+						Holdqtycount = rs.getInt("HOLD_QTY");
+						System.out.println("Holdqtycount::::::"+Holdqtycount);
+					}
+					if ( Holdqtycount > 0 )
+					{
+						errList.add( "VTPACKALED" );
+						errFields.add( childNodeName.toLowerCase() );
+						break;
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;
+					//changed by sankara on 29/07/14 for packing not allowed if hold quantity found end.
 				}// for loop end
 			}//case 2 end
 			break;

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

@@ -723,6 +723,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					getTranInfo = new HashMap();
 					saleOrderTran = rs.getString("SALE_ORDER");
 					System.out.println("CURRENT PICK TYPE BEFORE["+pickType+"]ShipType["+shipType+"]");
+					//changed by sankara on 30/07/14 validation for item lot pack size start.
+					double itemSize = (Double)itemVolMap.get("ITEM_SIZE");
+					System.out.println("itemsize:["+itemSize+"]");
+					double lotSize = (Double)itemVolMap.get("LOT_SIZE");
+					System.out.println("lotSize:["+lotSize+"]");
+					double packweight = (Double)itemVolMap.get("PACK_WEIGHT");
+					System.out.println("packweight:["+packweight+"]");
+
+					if( itemSize == 0 || lotSize == 0 || itemWeight == 0 || packweight == 0 || packSize == 0   )
+					{
+						errString = getError(saleOrderTran + "]ItemCode["+itemCode+"]","VTINVDAETL",conn);
+						return errString;
+					}
+					//changed by sankara on 30/07/14 validation for item lot pack size end.
 					//if("Y".equalsIgnoreCase(globalMasterPackAllow))
 					if("Y".equalsIgnoreCase(globalMasterPackAllow) || (globalMasterPackAllow.length() == 0 && "Y".equalsIgnoreCase(masterPackAllow)))
 					{

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

@@ -47261,7 +47261,92 @@ INSERT INTO POPHELP (
         NULL,
         NULL);
 commit;
-
+--changed by sankara on 30/07/14 messages sql
+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 (
+	'VTINVDAETL',
+	'Check Item Dimension/Weight !!',
+	'Please check dimension and weight for this item',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'SUN ',
+	'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 (
+	'TRALNOTPIK',
+	'All Pick Lines not confirmed ',
+	'Could not allowed to Packing because all pick lines are not confirmed',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'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 (
+	'VTPACKALED',
+	'Quantity is on hold',
+	'Could not allowed to Packing because quantity is on hold',
+	'E',
+	'Y',
+	NULL,
+	NULL,
+	NULL,
+	fn_sysdate(),
+	'BASE  ',
+	'BASE   ',
+	NULL,
+	NULL);
+commit;