To merge src for WMS

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

webitm-wms/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>webitm-wms</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

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

@@ -56,7 +56,7 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
 		int count = 0;
 		int updCnt = 0;
 		int ctr = 0;
-
+		int lineNoCtr = 0;
 		java.sql.Timestamp chgDate = null,currDate = null;
 		Date date = null;
 		String chgTerm = "";
@@ -158,7 +158,7 @@ public class AsnLotStatConf extends ValidatorEJB implements AsnLotStatConfLocal,
 						pStmt.setString(4, itemCodeDet);
 						pStmt.setString(5, lotNoDet);
 						rs = pStmt.executeQuery();
-						int lineNoCtr = 0;
+						
 						if( rs.next() )
 						{
 							lineNoCtr++;

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

@@ -94,7 +94,8 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 		String columnValue = "";			
 		String errString = "";
 		String sql = "";
-
+		//Changed by sumit on 04/10/12 created variable confirmed
+		String confirmed = "";
 		int count = 0;
 		int noOfChilds = 0;
 		int noOfParent = 0;
@@ -156,24 +157,44 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 						}
 						else
 						{
-							sql = "SELECT COUNT(*) AS COUNT FROM SHIPMENT  WHERE SHIPMENT_ID = ?";
+							//Changed by sumit on 04/10/12 changing sql for getting confirmed value
+							//sql = "SELECT COUNT(*) AS COUNT FROM SHIPMENT  WHERE SHIPMENT_ID = ?";
+							sql = "SELECT CONFIRMED FROM SHIPMENT S, SHIP_DOCS SD  WHERE S.SHIPMENT_ID = ? " +
+									" AND S.SHIPMENT_ID = SD.SHIPMENT_ID "+
+									" AND SD.REF_SER = ?";
 							pstmt = conn.prepareStatement( sql );
 							pstmt.setString( 1, shipmentId );
+							pstmt.setString( 2, "S-DSP" );
 							rs = pstmt.executeQuery();
 
 							if( rs.next() )
 							{
-								count = rs.getInt("COUNT");
+								//changed by sumit on 04/10/12 for validation of confirmed shipment id start.
+								//count = rs.getInt("COUNT");
+								confirmed = rs.getString("CONFIRMED");
+								if( "Y".contentEquals(confirmed))
+								{
+									errList.add( "VMSHIPACON" );
+									errFields.add( childNodeName.toLowerCase() );
+								}
+							}
+							else
+							{
+								errList.add( "INVSHIPID" );
+								errFields.add( childNodeName.toLowerCase() );
 							}
+							//changed by sumit on 04/10/12 for validation of confirmed shipment id end.
 							rs.close();
 							rs = null;
 							pstmt.close();
 							pstmt = null;
-							if( count <= 0 )
+							//Changed by sumit on 04/10/12 written this code above start.
+							/*if( count <= 0 )
 							{
 								errList.add( "INVSHIPID" );
 								errFields.add( childNodeName.toLowerCase() );
-							}
+							}*/
+							//Changed by sumit on 04/10/12 written this code above end.
 						}
 					}
 				}
@@ -464,10 +485,12 @@ public class CheckSheetIC extends ValidatorEJB implements CheckSheetICLocal,Chec
 						//Changed By Pragyan 17-Sep-12 as Carton no taken from despatch details.start
 						//sql = "select ref_id from ship_docs where  shipment_id = ? ";
 						sql = "SELECT DISTINCT S.PALLET_NO AS PLTNO FROM DESPATCHDET S WHERE "
-							+" S.DESP_ID IN (SELECT REF_ID FROM SHIP_DOCS WHERE  SHIPMENT_ID = ?)"
+							+" S.DESP_ID IN (SELECT REF_ID FROM SHIP_DOCS WHERE  SHIPMENT_ID = ? AND DESP_CONFIRMED = ? AND REF_SER = ? )"							
 							+" ORDER BY S.PALLET_NO ";
 						pstmt = conn.prepareStatement( sql );
 						pstmt.setString( 1, shipmentId);
+						pstmt.setString(2, "N");
+						pstmt.setString(3, "S-DSP");						
 						rs = pstmt.executeQuery();
 						
 						while ( rs.next() )

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

@@ -12,6 +12,8 @@ import java.rmi.RemoteException;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.w3c.dom.*;
 
@@ -55,7 +57,7 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
 		PreparedStatement pstmt2 = null;
 		ResultSet rs1 = null ;
 		ResultSet rs2 = null ;
-		ArrayList allPallets = new ArrayList<String>();
+		ArrayList allPallets = new ArrayList<String>();		
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
 		int noOfPalletScanned=0;
 
@@ -91,12 +93,18 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
 						// System.out.println("wave id = "+waveId);								
 						// //for pick iss
 						//sql1 = "select pick_order,pick_type from pick_ord_hdr p,wave_task_det w where p.wave_id = w.wave_id and w.ptcn = ? and w.ref_id = p.pick_order and p.wave_id = ?";
-						sql = "SELECT DISTINCT S.PALLET_NO AS PLTNO FROM DESPATCHDET S WHERE "
+						//Changes by sumit on 04/10/12 getting desp_id value to confirmed 
+						/*sql = "SELECT DISTINCT S.PALLET_NO AS PLTNO FROM DESPATCHDET S WHERE "
 							+" S.DESP_ID IN (SELECT REF_ID FROM SHIP_DOCS WHERE  SHIPMENT_ID = ?)"
-							+" ORDER BY S.PALLET_NO ";
+							+" ORDER BY S.PALLET_NO ";*/
+						sql = "SELECT DISTINCT S.PALLET_NO AS PLTNO, DESP_ID FROM DESPATCHDET S WHERE "
+								+" S.DESP_ID IN (SELECT REF_ID FROM SHIP_DOCS WHERE  SHIPMENT_ID = ? AND DESP_CONFIRMED = ? AND REF_SER = ? )"							
+								+" ORDER BY S.PALLET_NO ";
 
 						pstmt1 = conn.prepareStatement( sql );
 						pstmt1.setString( 1, shipmentId);
+						pstmt1.setString(2, "N");
+						pstmt1.setString(3, "S-DSP");
 						//pstmt1.setString( 2, waveId);
 						rs1 = pstmt1.executeQuery();
 						while ( rs1.next() )
@@ -111,15 +119,15 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
 							//while ( rs2.next() )
 							//{
 								palletNo = rs1.getString("PLTNO");
-								allPallets.add(palletNo);
-
+								allPallets.add(palletNo);								
 							//}
 							//rs2.close(); rs2 = null;
 							//pstmt2.close(); pstmt2 = null;
 
 						}
 						rs1.close(); rs1 = null;
-						pstmt1.close(); pstmt1 = null;
+						pstmt1.close(); pstmt1 = null;				
+						
 						//for repl iss
 						sql1 = "select repl_order,order_type from repl_ord_hdr r,wave_task_det w where r.wave_id = w.wave_id and w.ptcn = ? and w.ref_id = r.repl_order and r.wave_id = ? ";
 						pstmt1 = conn.prepareStatement( sql1 );
@@ -162,6 +170,8 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
 
 				NodeList parentList = dom.getElementsByTagName( "Detail2");
 				noOfParent = parentList.getLength();
+				
+				pstmt = conn.prepareStatement(sql);
 				for ( int ctr1 = 0; ctr1 < noOfParent; ctr1++ )  //Loop for each node of current detail
 				{
 						palletNo = genericUtility.getColumnValueFromNode( "pallet_no", parentList.item(ctr1) );
@@ -170,18 +180,22 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
 						{
 							System.out.println("pallet scanned");
 							noOfPalletScanned++;
-						}
+							
+						}						
+						
 				}
+				pstmt.close();
+				pstmt = null;
 				System.out.println("No of pallet scanned ="+noOfPalletScanned);
 				System.out.println("Total No of pallet ="+allPallets.size());
 				if(allPallets.size() == noOfPalletScanned)
-				{
-					System.out.println("conf called");
-					errString = shipConf.confirm(shipmentId, xtraParams, forcedFlag, conn);
-					System.out.println("Error String  = "+errString);
-					System.out.println("SHIP CONF CALLED ");
-					errString = shipConf.confirm(shipmentId, xtraParams, forcedFlag);
-					System.out.println("Error String  = "+errString);
+				{					
+						//Changed by sumit on 05/10/12 commented as a wrong method.
+						errString = shipConf.confirm(shipmentId, xtraParams, forcedFlag, conn);
+						System.out.println("Error String  = "+errString);
+						System.out.println("SHIP CONF CALLED ");
+						errString = shipConf.confirm(shipmentId, xtraParams, forcedFlag);						
+						System.out.println("Error String  = "+errString);				
 
 				}
 				else

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

@@ -232,6 +232,7 @@ public class ConsolidatToDoc {
 											+ " FROM PACK_DET PKD, PACK_HDR PKH, PICK_ISS_DET P, PICK_ORD_HDR PO , PICK_ORD_DET POD,PICK_ISS_HDR PH "
 											+ " WHERE  PKD.TRAN_ID =  PKH.TRAN_ID "
 											+ " AND POD.PICK_ORDER = PO.PICK_ORDER "
+											+ " AND PKD.ITEM_CODE = P.ITEM_CODE "
 											+ " AND PO.PICK_ORDER IN ( SELECT REF_ID FROM WAVE_TASK_DET W WHERE W.WAVE_ID = PO.WAVE_ID "
 											+ " AND W.REF_SER = 'M-PICK' AND W.REF_ID = PO.PICK_ORDER and w.ptcn = pkh.ptcn ) "
 											+ " AND POD.PICK_ORDER = P.PICK_ORDER "
@@ -946,19 +947,25 @@ public class ConsolidatToDoc {
 							else
 							{
 								// check all the issues are 
+								int countTrf = 0;
 								sql1 = "SELECT count(1)  FROM pick_iss_hdr WHERE pick_order = ? and case when TRF_STATUS is null then 'N' else TRF_STATUS end = 'N'";
 								pstmt1 = conn.prepareStatement(sql1);
 								pstmt1.setString(1,refId);
 								rs1 = pstmt1.executeQuery();
 								if (rs1.next())
 								{
-									
+									countTrf = rs1.getInt(1);
 								}
 								rs1.close();
 								rs1 = null;
 								pstmt1.close();
 								pstmt1 = null;
 								
+								if(countTrf > 0)
+								{
+									return isConfirmed = false;
+								}
+								
 							}
 							
 						}

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

@@ -43,7 +43,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 		String pickType = "";
 		String palletNo = "";
 		String itemCode = "",siteCode = "",locCode = "",lotNo = "",lotSl = "",locCodeSys = "",
-				saleOrder = "",lineNoSord = "",replOrder = "",retString = "";
+				saleOrder = "",lineNoSord = "",replOrder = "",retString = "",ptcn="";
 		double quantity = 0.0,noArt = 0.0;
 		int totOrdDet = 0,lineNo = 0;
 		int ordDetScaned = 0;
@@ -178,7 +178,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				locCodeTo = rs.getString( "loc_code__to" );
 				saleOrder = rs.getString( "SALE_ORDER" );
 				lineNoSord = rs.getString( "LINE_NO__SORD" );
-				replOrder = rs.getString( "PICK_ORDER" );
+				pickOrder = rs.getString( "PICK_ORDER" );
+				lineNo = rs.getInt( "LINE_NO" );
 				pickType = rs.getString( "PICK_TYPE" );
 				System.out.println("pick type from hdr->> ["+pickType+"]");
 
@@ -190,7 +191,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				// a separate probably in stockupdate so that we can call the same from various places 
 				//
 				// 
-				lineNo = rs.getInt( "LINE_NO" );
+			
 
 				pstmtStock.setString(1,itemCode);
 				pstmtStock.setString(2,siteCode);
@@ -323,6 +324,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 					break;
 				}
 				strAllocate = null;
+				
+				lineNoSord = "   " + lineNoSord; 
+				lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
 				// end 16/10/11 manoharan allocation stock for new location
 				// 16/10/11 manoharan update sordalloc
 				updateSql = "UPDATE SORDALLOC SET LOC_CODE = ? "
@@ -343,6 +347,16 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 
 				updCnt = pstmtUpd.executeUpdate(); //change done by kunal on 14/09/12 uncomment sql query     
 				// end 16/10/11 manoharan update sordalloc
+				
+				updateSql = "UPDATE PICK_ISS_DET SET LOC_CODE__TO = ? "
+					+ " WHERE TRAN_ID = ? AND LINE_NO = ? ";
+					
+				
+				pstmtUpd = conn.prepareStatement(updateSql);
+				pstmtUpd.setString(1, locCodeTo);
+				pstmtUpd.setString(2, tranId);
+				pstmtUpd.setInt(3, lineNo);				
+				updCnt = pstmtUpd.executeUpdate();
 			}
 			rs.close();
 			rs = null;
@@ -354,6 +368,15 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 				return retString;
 			}
 
+			updateSql = "UPDATE PICK_ISS_HDR SET TRF_STATUS = 'Y' "
+				+ " WHERE TRAN_ID = ?  ";
+		
+			pstmtUpd = conn.prepareStatement(updateSql);
+			pstmtUpd.setString(1, tranId);
+			updCnt = pstmtUpd.executeUpdate();
+		
+			pstmtUpd.close();
+			pstmtUpd = null;
 			//update the status of pick order in wave_task_det table
 			//Changed by sumit on 10/08/12 update wave_status 'V' with updating status = 'Y' 
 			//updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y' WHERE REF_ID = ? ";
@@ -375,11 +398,13 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 			{
 				System.out.println( updCnt + " row of wave_status updated successfully" );
 			}
+			
+			
 			//Changed by sumit on 30/08/12 for updating wave_status end.
-			/*
+	
 			sql = "select ptcn from wave_task_det where ref_id = ?";
 			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1,replOrder);
+			pstmt.setString(1,pickOrder);
 			rs = pstmt.executeQuery();
 			if( rs.next() )
 			{
@@ -398,8 +423,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 
 			ConsolidatToDoc conToDoc = new ConsolidatToDoc();
 			retString = conToDoc.process(ptcn, conn);
-			 */
-
+	
 
 			System.out.println("pick type from pick_ord_hdr table--->>["+pickType+"]");
 		}

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

@@ -1393,7 +1393,9 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 		//Changed by sumit on 27/06/12 start.
 		StringBuffer valueTemp = new StringBuffer();
 		String suggestedInvStat = "";
-		//Changed by sumit on 27/06/12 end.		
+		//Changed by sumit on 27/06/12 end.	
+		//Changed by sumit on 05/10/12 
+		String acctCodeCr = "", acctCodeDr = "", cctrCodeDr = "", cctrCodeCr = "";
 		//Changed by sumit on 05/08/12 start
 		PreparedStatement pstmt1 = null;
 		ResultSet rs1 = null;
@@ -1448,11 +1450,17 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 					valueXmlString.append( "<Detail1 domID='1'>\r\n" );
 					if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) )							
 					{
-						sql = 	"SELECT DISTINCT I.LOCK_CODE FROM INV_HOLD I,INV_HOLD_DET H, ITEM M,LOCATION L  WHERE" 
+						sql = 	"SELECT DISTINCT I.LOCK_CODE FROM INV_HOLD I,INV_HOLD_DET H, ITEM M,LOCATION L, STOCK S  WHERE" 
 								+" I.TRAN_ID = H.TRAN_ID AND"
 								+" H.ITEM_CODE = M.ITEM_CODE AND"
 								+" H.LOC_CODE = L.LOC_CODE AND"
 								+" H.HOLD_STATUS = ? "
+								+" AND H.ITEM_CODE = S.ITEM_CODE "
+								+" AND H.SITE_CODE = S.SITE_CODE "
+								+" AND H.LOC_CODE = S.LOC_CODE "
+								+" AND H.LOT_NO = S.LOT_NO "
+								+" AND H.LOT_SL = S.LOT_SL "
+								+" AND S.QUANTITY > 0 "
 								+" AND I.LOCK_CODE IN (?,?)";
 								
 						pstmt = conn.prepareStatement(sql);
@@ -1578,7 +1586,6 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 								" AND H.LOT_SL = S.LOT_SL " +
 								" AND S.QUANTITY > 0 " +
 								" AND S.INV_STAT <> ? ";
-;
 						
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, "H");
@@ -2030,7 +2037,7 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 								rs1 = null;
 							}
 							
-							sql = "SELECT QUANTITY, NO_ART FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
+							sql = "SELECT QUANTITY, NO_ART, ACCT_CODE__INV, CCTR_CODE__INV FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ? AND LOC_CODE = ? AND LOT_NO = ? AND LOT_SL = ? ";
 							pstmt2 = conn.prepareStatement(sql);
 							pstmt2.setString(1, itemCode);
 							pstmt2.setString(2, siteCodeHold);							
@@ -2041,7 +2048,11 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 							if( rs2.next() )
 							{
 								quantity = rs2.getDouble("QUANTITY");
-								noArt = rs2.getString("NO_ART");								
+								noArt = rs2.getString("NO_ART");	
+								acctCodeCr = rs2.getString("ACCT_CODE__INV");	
+								acctCodeDr = rs2.getString("ACCT_CODE__INV");
+								cctrCodeCr = rs2.getString("CCTR_CODE__INV");
+								cctrCodeDr = rs2.getString("CCTR_CODE__INV");								
 							}
 							pstmt2.close();pstmt2 = null;
 							rs2.close();rs2 = null;
@@ -2089,8 +2100,15 @@ public class ExpStockTransferIC extends ValidatorEJB implements ExpStockTransfer
 							valueXmlString.append("<lot_sl__to><![CDATA[").append(checkNull(lotSl)).append("]]></lot_sl__to>\r\n");
 							valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
 							valueXmlString.append("<hold_qty><![CDATA[").append(holdQty).append("]]></hold_qty>\r\n");
-							//Changed by sumit on 14/09/12 insert no_art							
+							//Changed by sumit on 14/09/12 insert no_art						
 							valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
+							//Changed by sumit on 05/10/12 insert acct_code__cr and other start
+							valueXmlString.append("<acct_code__cr><![CDATA[").append(acctCodeCr).append("]]></acct_code__cr>\r\n");
+							valueXmlString.append("<acct_code__dr><![CDATA[").append(acctCodeDr).append("]]></acct_code__dr>\r\n");
+							valueXmlString.append("<cctr_code__dr><![CDATA[").append(cctrCodeDr).append("]]></cctr_code__dr>\r\n");
+							valueXmlString.append("<cctr_code__cr><![CDATA[").append(cctrCodeCr).append("]]></cctr_code__cr>\r\n");
+							//Changed by sumit on 05/10/12 insert acct_code__cr and other end
+							
 							//Changed by Rohan 0n 20/06/12 [WM1ESU006] To add Location Code Suggested.start
 							
 							//Changed by sumit sarkar on 13/07/12 commented start.

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

@@ -56,7 +56,7 @@ public class MPhyItemScanPos extends ValidatorEJB implements MPhyItemScanPosLoca
 			
 			for(ctr = 0; ctr < parentNodeListLength ; ctr++ )
 			{
-				lineNo=Integer.parseInt((genericUtility.getColumnValueFromNode("line_no",dom.getElementsByTagName("Detail2").item(ctr))).trim());
+				lineNo=Integer.parseInt((genericUtility.getColumnValueFromNode("line_no",dom.getElementsByTagName("Detail3").item(ctr))).trim());
 				//quantityInput = Double.parseDouble(genericUtility.getColumnValueFromNode("phy_input", dom.getElementsByTagName("Detail2").item(i))); //added by Kunal
 				//invStat = genericUtility.getColumnValue("inv_stat", dom); //added by Kunal
 				quantityInput = Double.parseDouble(genericUtility.getColumnValue("phy_input", dom) == null ?"0":genericUtility.getColumnValue("phy_input", dom)); //change done by kunal on 10/09/12 

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

@@ -592,7 +592,8 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 		ResultSet rsStock = null ;
 		ArrayList pickLocList = null;
 		String childNodeName = "";
-
+		String pickType = "";
+		String tranCode = "";
 		StringBuffer valueXmlString;
 
 		System.out.println("xtraParams=["+xtraParams+"]");
@@ -651,14 +652,15 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 					System.out.println("pallet no  -----["+palletNo+"]");
 					System.out.println("location to "+locCodeTo);
 
-					sql = "SELECT PICK_ORDER FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ?";
+					sql = "SELECT PICK_ORDER,PICK_TYPE FROM PICK_ISS_HDR HDR WHERE HDR.PALLET_NO = ?";
 					pstmt = conn.prepareStatement( sql );
 					pstmt.setString( 1, palletNo );
 					rs = pstmt.executeQuery();
 					if ( rs.next() )
 					{
 						pickOrder = rs.getString("PICK_ORDER");
-						System.out.println("PICK_ORDER -----["+pickOrder+"]");
+						pickType = rs.getString("PICK_type");
+						System.out.println("PICK_ORDER -----["+pickOrder+"]pickType["+pickType+"]");
 					}
 					rs.close();
 					rs = null;
@@ -677,6 +679,28 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 					rs = null;
 					pstmt.close();
 					pstmt = null;
+					
+					if("M".equalsIgnoreCase(pickType))
+					{
+						sql = "SELECT T.LOC_CODE__DOCK FROM WAVE_TASK_DET W,DESPATCH D,TRANSPORTER T WHERE" 
+								+" W.PTCN = (SELECT PTCN FROM WAVE_TASK_DET WHERE REF_ID =?)" 
+								+" AND W.REF_SER='S-DSP'"
+								+" AND D.DESP_ID = W.REF_ID"
+								+" AND T.TRAN_CODE = D.TRAN_CODE";
+						pstmt = conn.prepareStatement( sql );
+						pstmt.setString( 1, pickOrder );
+						rs = pstmt.executeQuery();
+						if ( rs.next() )
+						{
+							docLocCode = rs.getString(1);
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						
+					}
+					
 					System.out.println(" locCodeTo [" + locCodeTo + "] docLocCode [" + docLocCode + "]");
 
 					valueXmlString.append( "<Detail2 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
@@ -737,7 +761,71 @@ public class PalletNoIC extends ValidatorEJB implements PalletNoICLocal, PalletN
 		//		System.out.println( "valueXmlString.toString()>>>>>>>::"+valueXmlString.toString());
 		return valueXmlString.toString();
 	}
+	//Changed by Rohan on 10-03-12 to get doc location.start
+	private String getDocLoc(String tranCode,Connection conn) throws ITMException
+	{
+		String sql = "";
+		String sqlShipStanCode = "";
+		ResultSet rs = null;
+		PreparedStatement pstmt = null;
+		String docLoc = "";
+				
+		try
+		{
+										
+			
+			sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM TRANSPORTER A "
+				+ " WHERE A.TRAN_CODE = ? ";
+				
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, tranCode);
+			rs = pstmt.executeQuery();
 
+			while (rs.next())
+			{
+				docLoc  = rs.getString("DOC_LOC");
+			}
+			
+			if( rs != null )
+			{
+				rs.close();
+				rs = 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( rs != null )
+				{
+					rs.close();
+					rs = null;
+				}
+				if( pstmt != null )
+				{
+					pstmt.close();
+					pstmt = null;
+				}
+			}
+			catch (Exception e1)
+			{
+			}
+		}
+	 return docLoc;	
+	}
+	//Changed by rohan on 10-03-12 to get doc location.end
 
 
 

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

@@ -135,7 +135,7 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 								if(genericUtility.getColumnValue("tran_date", dom) != null)
 								{
 									date1 = Timestamp.valueOf(genericUtility.getValidDateString( genericUtility.getColumnValue("tran_date", dom1) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-									sql = "SELECT count(*) FROM PHYSCAN WHERE TRAN_DATE = ? and tran_type = 'A'";
+									sql = "SELECT count(*) FROM PHYSCAN WHERE TRAN_DATE = ? ";
 							    	pstmt = conn.prepareStatement( sql );
 									pstmt.setTimestamp(1, date1);						
 									rs = pstmt.executeQuery();	
@@ -1306,17 +1306,21 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 						if(genericUtility.getColumnValue("tran_date", dom1) != null)
 						{
 							date1 = Timestamp.valueOf(genericUtility.getValidDateString( genericUtility.getColumnValue("tran_date", dom1) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
-							sql = "SELECT TRAN_ID,CONFIRMED FROM PHYSCAN WHERE TRAN_DATE = ? and tran_type = 'A'";
+							sql = "SELECT TRAN_ID,CONFIRMED FROM PHYSCAN WHERE TRAN_DATE = ?  AND SITE_CODE=?";
 					    	pstmt = conn.prepareStatement( sql );
-							pstmt.setTimestamp(1, date1);						
+							pstmt.setTimestamp(1, date1);
+							pstmt.setString(2, siteCode);
 							rs = pstmt.executeQuery();	
 							if( rs.next() )
 							{
 								tranId = rs.getString("TRAN_ID");
 								confirmed = rs.getString("CONFIRMED");
-								valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
-								valueXmlString.append( "<tran_date><![CDATA[" ).append( genericUtility.getValidDateString( genericUtility.getColumnValue("tran_date", dom1) , genericUtility.getApplDateFormat()) ).append( "]]></tran_date>\r\n" );
-								valueXmlString.append("<confirmed protect=\"1\">").append("<![CDATA["+confirmed+"]]>").append("</confirmed>");
+								//Commented by manoj dtd 05/10/2012 not required
+								//valueXmlString.append( "<tran_id><![CDATA[" ).append( tranId ).append( "]]></tran_id>\r\n" );
+								
+								valueXmlString.append( "<tran_date><![CDATA[" ).append( genericUtility.getColumnValue("tran_date", dom1) ).append( "]]></tran_date>\r\n" );
+								//valueXmlString.append( "<tran_date><![CDATA[" ).append( genericUtility.getValidDateString( genericUtility.getColumnValue("tran_date", dom1) , genericUtility.getApplDateFormat()) ).append( "]]></tran_date>\r\n" );
+								//valueXmlString.append("<confirmed protect=\"1\">").append("<![CDATA["+confirmed+"]]>").append("</confirmed>");
 							}
 							if(rs != null)
 							{	
@@ -1348,25 +1352,31 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 							pstmt = null;
 						}	
 						valueXmlString.append( "<descr><![CDATA[" ).append( checkNull( siteDescr )).append( "]]></descr>\r\n" );
-						valueXmlString.append( "<chg_user><![CDATA[" ).append( loginCode ).append( "]]></chg_user>\r\n" );
-						valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" );
-						valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
+						//valueXmlString.append( "<chg_user><![CDATA[" ).append( loginCode ).append( "]]></chg_user>\r\n" );
+						//valueXmlString.append( "<chg_date><![CDATA[" ).append( currDateStr ).append( "]]></chg_date>\r\n" );
+						//valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
 	                }
 					valueXmlString.append("</Detail2>");
 				  }	
 	              break;
 				  case 3 :
-				  {	  
+				  {	  SimpleDateFormat sdf1=new SimpleDateFormat(genericUtility.getApplDateFormat());
+				      //date1=Timestamp.valueOf(sdf1.format(sdf1.parse(genericUtility.getColumnValue("tran_date", dom2))));
 					  loginCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ));
 					  System.out.println("loginCode --->["+loginCode+"]");
 					  tranId = genericUtility.getColumnValueFromNode("tran_id", dom2.getElementsByTagName("Detail2").item(0));
-					  System.out.println("tran Id in Detail --->["+tranId+"]");
-					  
+					  date1 = Timestamp.valueOf(genericUtility.getValidDateString( genericUtility.getColumnValue("tran_date", dom2) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+					  //date1=Timestamp.valueOf(sd)
+					  System.out.println("date1 --->["+date1+"]");
+					  siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
 					  if(currentColumn.trim().equalsIgnoreCase("itm_default"))
 					  {
-						    sql = "SELECT count(*) FROM PHYSCANDET WHERE TRAN_ID = ?  ";
+						  
+						  //Commented by manoj dtd05/10/2012 tran_id not required
+						    /*sql = "SELECT count(*) FROM PHYSCANDET WHERE TRAN_ID = ?  ";
 							pstmt = conn.prepareStatement( sql );
-							pstmt.setString( 1, tranId );						
+							pstmt.setString( 1, tranId );
+							
 							rs = pstmt.executeQuery();	
 							if( rs.next() )
 							{
@@ -1382,25 +1392,35 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 								pstmt.close();
 								pstmt = null;
 							}
+							*/
+						  //End Commented by manoj dtd05/10/2012 tran_id not required
 							
-							if (tranId != null && tranId.trim().length() != 0 && cnt > 0) 
-							{
-								sSQL = "SELECT S.STATUS , S.LINE_NO, S.ITEM_CODE,S.SITE_CODE,S.LOC_CODE,S.LOT_NO,S.LOT_SL, S.QUANTITY,S.UNIT,M.DESCR AS ITEM_DESCR, "
-										+ " L.DESCR AS LOC_DESCR, L.PHY_HAN_BASIS, L.PHY_HAN_UOM , S.CYCLE_CRITERIA, S.ANALYSIS_CLASS , S.PHY_INPUT, S.PRIORITY_SEQ"
-										+ " ,CASE WHEN S.PHY_INPUT IS NULL THEN 0 ELSE S.PHY_INPUT END PHY_INPUT "
-										+ " FROM PHYSCANDET S,ITEM M,LOCATION L "
-										+ " WHERE  S.ITEM_CODE = M.ITEM_CODE AND S.LOC_CODE = L.LOC_CODE "
-										+ " AND s.tran_id = ? AND" +
-										" (CASE WHEN S.QUANTITY IS NULL THEN 0 ELSE S.QUANTITY END ) !=(CASE WHEN  S.QTY_PHYSICAL IS NULL THEN 0 ELSE  S.QTY_PHYSICAL END ) " + //change done by kunal  add QTY_PHYSICAL for PHY_INPUT
-										" AND S.STATUS = 'Y' ORDER BY PRIORITY_SEQ ASC";
+								sSQL = "SELECT H.TRAN_ID,S.STATUS , S.LINE_NO, S.ITEM_CODE,S.SITE_CODE,S.LOC_CODE,S.LOT_NO,S.LOT_SL, S.QUANTITY,S.UNIT,M.DESCR AS ITEM_DESCR, "
+									+ " L.DESCR AS LOC_DESCR, L.PHY_HAN_BASIS, L.PHY_HAN_UOM , S.CYCLE_CRITERIA, S.ANALYSIS_CLASS , S.PHY_INPUT, S.PRIORITY_SEQ"
+									+ " ,CASE WHEN S.PHY_INPUT IS NULL THEN 0 ELSE S.PHY_INPUT END PHY_INPUT "
+									+ " FROM PHYSCANDET S,ITEM M,LOCATION L,PHYSCAN H "
+									+ " WHERE H.TRAN_ID=S.TRAN_ID AND  S.ITEM_CODE = M.ITEM_CODE AND S.LOC_CODE = L.LOC_CODE "
+									+ " AND H.tran_date = ? AND " +
+									" (CASE WHEN S.QUANTITY IS NULL THEN 0 ELSE S.QUANTITY END ) !=(CASE WHEN  S.QTY_PHYSICAL IS NULL THEN 0 ELSE  S.QTY_PHYSICAL END ) " + //change done by kunal  add QTY_PHYSICAL for PHY_INPUT
+									" AND S.STATUS = 'Y' AND H.SITE_CODE=? ORDER BY PRIORITY_SEQ ASC";
+								
+//								sSQL = "SELECT S.STATUS , S.LINE_NO, S.ITEM_CODE,S.SITE_CODE,S.LOC_CODE,S.LOT_NO,S.LOT_SL, S.QUANTITY,S.UNIT,M.DESCR AS ITEM_DESCR, "
+//										+ " L.DESCR AS LOC_DESCR, L.PHY_HAN_BASIS, L.PHY_HAN_UOM , S.CYCLE_CRITERIA, S.ANALYSIS_CLASS , S.PHY_INPUT, S.PRIORITY_SEQ"
+//										+ " ,CASE WHEN S.PHY_INPUT IS NULL THEN 0 ELSE S.PHY_INPUT END PHY_INPUT "
+//										+ " FROM PHYSCANDET S,ITEM M,LOCATION L "
+//										+ " WHERE  S.ITEM_CODE = M.ITEM_CODE AND S.LOC_CODE = L.LOC_CODE "
+//										+ " AND s.tran_id = ? AND" +
+//										" (CASE WHEN S.QUANTITY IS NULL THEN 0 ELSE S.QUANTITY END ) !=(CASE WHEN  S.QTY_PHYSICAL IS NULL THEN 0 ELSE  S.QTY_PHYSICAL END ) " + //change done by kunal  add QTY_PHYSICAL for PHY_INPUT
+//										" AND S.STATUS = 'Y' ORDER BY PRIORITY_SEQ ASC";
 		
 								System.out.println("** sSQL **[" + sSQL + "]");
 								pstmt = conn.prepareStatement(sSQL);
-								pstmt.setString(1,tranId);
+								pstmt.setTimestamp(1,date1);
+								pstmt.setString(2,siteCode);
 								rs = pstmt.executeQuery();
 								while (rs.next()) 
 								{
-									lineNo = rs.getInt(2);
+									lineNo = rs.getInt("LINE_NO");
 									System.out.println("Line_no["+lineNo+"]");
 									itemCode = rs.getString("ITEM_CODE");
 									itemDescr = rs.getString("ITEM_DESCR");
@@ -1417,7 +1437,7 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 									analysisClass = checkNullAndTrim(rs.getString("ANALYSIS_CLASS"));
 									prioritySeq = rs.getInt("PRIORITY_SEQ");
 									System.out.println("phyHanBasis - >[" + phyHanBasis	+ "] phyHanUOM [" + phyHanUOM + "]");
-		
+									tranId=rs.getString("TRAN_ID");
 									phyHanBasisDesc = "";
 									if (phyHanBasis != null ) 
 									{
@@ -1482,7 +1502,7 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 									rs.close();
 									rs = null;
 								}
-							}
+							
 							System.out.println("Detail 3 String ["+valueXmlString.toString()+"]");
 							System.out.println("\n&&&&&&&&&&&&&\n");
 						 }	

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

@@ -463,6 +463,29 @@ public class PickIssConf extends ActionHandlerEJB implements PickIssConfLocal, P
 					pstmtUpdPickOrdDet.setInt(3, lineNoOrd);
 									
 
+					updCntPickOrdDet = pstmtUpdPickOrdDet.executeUpdate();
+					
+					if(updCntPickOrdDet > 0)
+					{
+						isUpdatehdr = updatePickOrderHeader(replOrder,conn);
+					}
+					
+					updatePickOrdSql = "UPDATE PICK_ISS_DET SET LOC_CODE = ? "
+						+ " WHERE TRAN_ID = ? AND LINE_NO = ? ";
+						
+					pstmtUpdPickOrdDet = conn.prepareStatement(updatePickOrdSql);
+					if(("A".equalsIgnoreCase(pickType)) || ("M".equalsIgnoreCase(pickType)))
+					{
+						pstmtUpdPickOrdDet.setString(1, stagingLoc);
+					}
+					else
+					{	
+						pstmtUpdPickOrdDet.setString(1, locCodeTo);
+					}	
+					pstmtUpdPickOrdDet.setString(2, tranId);
+					pstmtUpdPickOrdDet.setInt(3, lineNo);
+									
+	
 					updCntPickOrdDet = pstmtUpdPickOrdDet.executeUpdate();
 					
 					if(updCntPickOrdDet > 0)

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

@@ -2831,6 +2831,12 @@ public class PickIssIC extends ValidatorEJB implements PickIssICLocal, PickIssIC
 
 						valueXmlString.append( "<Detail4 domID='"+ domID +"' objContext = '"+currentFormNo+"' objName='"+objName+"' selected=\"Y\">\r\n" );
 						//valueXmlString.append( "<attribute selected=\"Y\"/>\r\n" );
+						if("M".equalsIgnoreCase(pickType))
+						{
+						
+							locCodeTo = distCommon.getDisparams( "999999", "STAGING_LOC_MPK", conn)==null?"":distCommon.getDisparams( "999999", "STAGING_LOC_MPK", conn);
+						}
+						
 						valueXmlString.append( "<loc_code__sys><![CDATA[" ).append( locCodeTo ).append( "]]></loc_code__sys>\r\n" );
 						valueXmlString.append( "<loc_code__to><![CDATA[]]></loc_code__to>\r\n" );
 						valueXmlString.append("</Detail4>\r\n");

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

@@ -242,7 +242,7 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 							System.out.println("---row updated sucessfully of master pick---->"+updCnt);
 						}
 
-					//added by kunal mandhre on 09/08/12 as per S Manoharan Sir instruction 
+					/*//added by kunal mandhre on 09/08/12 as per S Manoharan Sir instruction 
 					sql = "UPDATE PALLET_NO SET STATUS = 'U' WHERE PALLET_NO IN(SELECT PALLET_NO FROM PICK_ISS_HDR WHERE PICK_ORDER =  ? ) ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, pickOrder);
@@ -251,7 +251,7 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 					if(updCnt > 0)
 					{
 						System.out.println("---row updated sucessfully in pallet no ---->"+updCnt);
-					}
+					}*/
 					//end by kunal
 
 					//select no of art from pick_ord_det 
@@ -289,6 +289,19 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
 						//if (!("A".equalsIgnoreCase(pickType)))
 						//if(pickType.equalsIgnoreCase("C")|| pickType.equalsIgnoreCase("M"))
 						//{
+						
+						//added by kunal mandhre on 09/08/12 as per S Manoharan Sir instruction 
+						sql = "UPDATE PALLET_NO SET STATUS = 'U' WHERE PALLET_NO IN(SELECT PALLET_NO FROM PICK_ISS_HDR WHERE PICK_ORDER =  ? ) ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, pickOrder);
+						updCnt = pstmt.executeUpdate();
+						pstmt.close(); pstmt = null;
+						if(updCnt > 0)
+						{
+							System.out.println("---row updated sucessfully in pallet no ---->"+updCnt);
+						}
+						
+						
 						System.out.println("Calling Confirm method..................");
 						errString = pickConf.confirm( tranId, xtraParams, forcedFlag ,conn, toCommit );
 						//}

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

@@ -128,7 +128,7 @@ public class PickOrderPos extends ValidatorEJB implements PickOrderPosLocal, Pic
 				qtyStduom = Double.parseDouble(qtyStduomStr);
 				
 				
-				sqlPick = "SELECT REPL_ORDER,LINE_NO__REPL,QUANTITY  " 
+				/*sqlPick = "SELECT REPL_ORDER,LINE_NO__REPL,QUANTITY  " 
 						 +"FROM PICK_ORD_DET WHERE PICK_ORDER = ? AND LINE_NO = ?";
 			
 				pstmt = conn.prepareStatement(sqlPick);
@@ -177,14 +177,16 @@ public class PickOrderPos extends ValidatorEJB implements PickOrderPosLocal, Pic
 				rs.close();
 				rs = null;
 				
+				System.out.println("Enter in active Repalinshement^^^^^^^^^^^^^66");
+				sqlReplCase = "SELECT R.LOC_CODE LOC_CODE,L.INV_STAT INV_STAT FROM REPL_ORD_DET R,LOCATION L" 
+						 +" WHERE R.LOC_CODE = L.LOC_CODE AND  R.ITEM_CODE = ? AND R.SITE_CODE = ?"
+					      +" AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.LOC_CODE__TO = ?";
+				pstmt = conn.prepareStatement(sqlReplCase);
+				
 				if(casePickLoc.equalsIgnoreCase(invStat))
 				{
 					
-					System.out.println("Enter in active Repalinshement^^^^^^^^^^^^^66");
-					sqlReplCase = "SELECT R.LOC_CODE LOC_CODE,L.INV_STAT INV_STAT FROM REPL_ORD_DET R,LOCATION L" 
-							 +" WHERE R.LOC_CODE = L.LOC_CODE AND  R.ITEM_CODE = ? AND R.SITE_CODE = ?"
-						      +" AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.LOC_CODE__TO = ?";
-					pstmt = conn.prepareStatement(sqlReplCase);
+				
 					
 					pstmt.setString(1,itemCode);
 					pstmt.setString(2,siteCode );
@@ -242,7 +244,7 @@ public class PickOrderPos extends ValidatorEJB implements PickOrderPosLocal, Pic
 				{	
 					pstmt.close();
 					pstmt = null;
-				}
+				}*/
 				/*
 				sqlReplUpt = "UPDATE REPL_ORD_DET SET ACTUAL_QTY = ACTUAL_QTY + ?" 
 						 	+" WHERE REPL_ORDER = ? AND LINE_NO = ?";
@@ -267,8 +269,8 @@ public class PickOrderPos extends ValidatorEJB implements PickOrderPosLocal, Pic
 					pstmt = null;
 				}
 				*/	
-				System.out.println("pick loc code%%%%%%%%%%%%%%%%%%%%%%%5"+locCode);
-				System.out.println("pick QTYe%%%%%%%%%%%%%%%%%%%%%%%5"+pickQty);
+				/*System.out.println("pick loc code%%%%%%%%%%%%%%%%%%%%%%%5"+locCode);
+				System.out.println("pick QTYe%%%%%%%%%%%%%%%%%%%%%%%5"+pickQty);*/
 				//Chnged by Rohna on to change loc Code
 				//Changed as Rate updation is required.start
 				/*sql = "SELECT CASE WHEN RATE IS NULL THEN 0 ELSE RATE END "

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

@@ -311,6 +311,9 @@ public class PickOrderPrs extends ValidatorEJB implements PickOrderPrsLocal, Pic
 						locCode		 = rs.getString("LOC_CODE");	   //Gulzar 10/05/07			
 						lotNo		 = rs.getString("LOT_NO");		   //Gulzar 10/05/07		
 						lotSl		 = rs.getString("LOT_SL");		   //Gulzar 10/05/07
+						lineNoSord = "   " + lineNoSord; 
+						lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
+						
 						
 						//qtyStduomStr = rs.getString("QUANTITY__STDUOM");	
 						qtyStduomStr = rs.getString("QUANTITY");
@@ -318,12 +321,9 @@ public class PickOrderPrs extends ValidatorEJB implements PickOrderPrsLocal, Pic
 						
 						qtyStduom = Double.parseDouble(qtyStduomStr);
 						
-						replOrd = rs.getString("REPL_ORDER");
+						/*replOrd = rs.getString("REPL_ORDER");
 						lineNorepl = rs.getString("LINE_NO__REPL");
 						
-						lineNoSord = "   " + lineNoSord; 
-						lineNoSord = lineNoSord.substring(lineNoSord.length()-3);
-						
 						if(pstmt != null)
 						{	
 							pstmt.close();
@@ -368,12 +368,12 @@ public class PickOrderPrs extends ValidatorEJB implements PickOrderPrsLocal, Pic
 							
 							System.out.println("Enter in active Repalinshement CASE PICK PSO");
 							//Changed by Rohan on 10-04-12 for bug fixing.start
-							/*
+							
 							sqlReplCase = "SELECT R.LOC_CODE LOC_CODE,L.INV_STAT INV_STAT FROM REPL_ORD_DET R,LOCATION L" 
 										 +" WHERE R.LOC_CODE = L.LOC_CODE AND  R.ITEM_CODE = ? AND R.SITE_CODE = ?"
 									      +" AND R.LOT_NO = ? AND R.LOT_SL = ? AND R.LOC_CODE__TO = ?";
 							pstmt = conn.prepareStatement(sqlReplCase);
-							*/
+							
 							//Changed by Rohan on 10-04-12 for bug fixing.end
 							pstmt.setString(1,itemCode);
 							pstmt.setString(2,siteCode );
@@ -484,6 +484,25 @@ public class PickOrderPrs extends ValidatorEJB implements PickOrderPrsLocal, Pic
 							pstmt.close();
 							pstmt = null;
 						}
+						*/
+						
+						sqlItem = "SELECT SHIPPER_SIZE FROM ITEM_LOT_PACKSIZE WHERE ITEM_CODE = ?";
+						
+						pstmt = conn.prepareStatement(sqlItem);
+						pstmt.setString(1,itemCode);
+						
+						
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							caseSize = rs.getDouble("SHIPPER_SIZE");
+						}
+						
+						pstmt.close();
+						pstmt = null;
+						
+						rs.close();
+						rs = null;
 						
 						sqlPickUpt = "UPDATE PICK_ORD_DET SET NO_ART = ?" 
 							 	+" WHERE PICK_ORDER = ? AND LINE_NO = ?";

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

@@ -698,8 +698,9 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 					else
 					{
 						updateSql = "UPDATE SORDALLOC SET LOC_CODE = ? ,LOT_SL = ? "
-								+ " WHERE SALE_ORDER = ? AND LINE_NO = ? "
-								+ " AND ITEM_CODE = ? "
+								+ " WHERE " 
+								//"SALE_ORDER = ? AND LINE_NO = ?  AND " +
+								+ " ITEM_CODE = ? "
 								+ " AND LOC_CODE = ? "
 								+ " AND LOT_NO = ? "
 								+ " AND LOT_SL = ? "
@@ -707,12 +708,14 @@ public class ReplIssConf extends ActionHandlerEJB implements ReplIssConfRemote,
 						pstmtUpd = conn.prepareStatement(updateSql);
 						pstmtUpd.setString(1, locCodeTo);
 						pstmtUpd.setString(2, lotSlNew); //added by Kunal on 11/09/12 as per S Manoharan sir intruction 
-						pstmtUpd.setString(3, saleOrder);
-						pstmtUpd.setString(4, lineNoSord);				
-						pstmtUpd.setString(5, itemCode);				
-						pstmtUpd.setString(6, locCode);				
-						pstmtUpd.setString(7, lotNo);				
-						pstmtUpd.setString(8, lotSl);				
+						//To Check whether th other saleorder exist with replenishmnet.start
+						/*pstmtUpd.setString(3, saleOrder);
+						pstmtUpd.setString(4, lineNoSord);	*/			
+						//To Check whether th other saleorder exist with replenishmnet.end
+						pstmtUpd.setString(3, itemCode);				
+						pstmtUpd.setString(4, locCode);				
+						pstmtUpd.setString(5, lotNo);				
+						pstmtUpd.setString(6, lotSl);				
 
 						updCnt = pstmtUpd.executeUpdate();
 						pstmtUpd.close();

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

@@ -658,11 +658,13 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 							// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
 						}								
 					}
-					else if ( "lot_sl_new".equalsIgnoreCase( childNodeName ) ) //added by kunal mandhre on 05/JUN/12 - WM1ESUN007
+					//else if ( "lot_sl_new".equalsIgnoreCase( childNodeName ) ) //added by kunal mandhre on 05/JUN/12 - WM1ESUN007
+					else if ( "lot_sl__new".equalsIgnoreCase( childNodeName ) && "active_repl_iss".equalsIgnoreCase(getObjNameFromDom(currFormDataDom, "objName", objContext)) ) //added by kunal mandhre on 05/JUN/12 - WM1ESUN007
 					{
 						//String orderType = "";
 
-						lotSlNew =  genericUtility.getColumnValue("lot_sl_new", allFormDataDom, "3" );
+						//lotSlNew =  genericUtility.getColumnValue("lot_sl_new", allFormDataDom, "3" );
+						lotSlNew =  genericUtility.getColumnValue("lot_sl__new", allFormDataDom, "3" );
 						replOrder =  checkNull(genericUtility.getColumnValue("repl_order", allFormDataDom, "3" ));
 						
 						//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
@@ -3155,10 +3157,10 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
 							valueXmlString.append( "<lot_sl><![CDATA[" ).append( genericUtility.getColumnValueFromNode("lot_sl", parentNode)).append( "]]></lot_sl>\r\n" );
 							
 							// 13/09/12 manoharan new lpn number to be matched
-							valueXmlString.append( "<lot_sl__new><![CDATA[" ).append( genericUtility.getColumnValueFromNode("lot_sl__new", parentNode)).append( "]]></lot_sl__new>\r\n" );
+							valueXmlString.append( "<lot_sl__new><![CDATA[" ).append(checkNullAndTrim( genericUtility.getColumnValueFromNode("lot_sl__new", parentNode))).append( "]]></lot_sl__new>\r\n" );
 							// end 13/09/12 manoharan new lpn number to be matched
 							
-							valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(genericUtility.getColumnValueFromNode("loc_code__sys", parentNode)).append( "]]></loc_code__sys>\r\n" );
+							valueXmlString.append( "<loc_code__sys><![CDATA[" ).append(checkNullAndTrim(genericUtility.getColumnValueFromNode("loc_code__sys", parentNode))).append( "]]></loc_code__sys>\r\n" );
 							valueXmlString.append( "<loc_code__to><![CDATA[]]></loc_code__to>\r\n" );
 							valueXmlString.append("</Detail4>\r\n");
 						}

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

@@ -313,7 +313,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 							{
 							// added by cpatil on 14-08-12 end
 							
-							//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
+							/*//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
 							if(!lpnNo.startsWith("NJ") && !lpnNo.startsWith("CN") && !lpnNo.startsWith("DM") && !lpnNo.startsWith("EX"))
 							{
 								errList.add( "VTINVLPN" );
@@ -326,6 +326,7 @@ public class StockTransferGrlIC extends ValidatorEJB implements StockTransferGrl
 								errFields.add( childNodeName.toLowerCase());
 							}
 							//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.end
+							 */
 							siteCode = genericUtility.getColumnValue("site_code", hdrDom );
 							System.out.println("siteCode Number=====>"+siteCode);
 							//Changed by Rohan on 21/07/12 for check stock that present only on grl location

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

@@ -597,6 +597,20 @@ public class StockTransferIC extends ValidatorEJB implements StockTransferICRemo
 								errList.add( "NULLLPNNO" );
 								errFields.add( childNodeName.toLowerCase() );
 							}
+							
+							//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.start
+							if(!lpnNoTo.startsWith("NJ") && !lpnNoTo.startsWith("CN") && !lpnNoTo.startsWith("DM") && !lpnNoTo.startsWith("EX"))
+							{
+								errList.add( "VTINVLPN" );
+								errFields.add( childNodeName.toLowerCase());
+							}
+							
+							if(lpnNoTo.length() != 10)
+							{
+								errList.add( "VTINVLEN" );
+								errFields.add( childNodeName.toLowerCase());
+							}
+							//Chnaged by Rohan on 10-02-12 allow lpn no start with NJ & CN & allow only 10 Character.end
 						}
 						else if( "quantity".equalsIgnoreCase( childNodeName ) )
 						{

webitm-wms/ibase/webitm/utility/wms/PhysicalCountSchedule.java

@@ -700,8 +700,11 @@ public class PhysicalCountSchedule implements Schedule
 					//int rec=generateRec(conn,arr,numberOfItemsPerdayA);
 					
 					rec=generateDetRec(empCode,rec,conn,tranId,dts,arrA,numberOfItemsPerdayA);
+					System.out.println("1---rec----"+rec);
 					rec=generateDetRec(empCode,rec,conn,tranId,dts,arrB,numberOfItemsPerdayB);
+					System.out.println("2--rec----"+rec);
 					rec=generateDetRec(empCode,rec,conn,tranId,dts,arrC,numberOfItemsPerdayC);
+					System.out.println("3--rec----"+rec);
 					}
 					
 					
@@ -1192,7 +1195,7 @@ private String checkNull(String input)
 	return input;
 }*/
 //Changed By Rohan Sakore On 04/04/12 to check null value.end
-private int generateDetRec(String empCode,int rec,Connection conn,String tranId,java.sql.Timestamp dts,ArrayList<ArrayList<SelectItem>> arr,double numberOfItemsPerdayA) throws ITMException
+/*private int generateDetRec(String empCode,int rec,Connection conn,String tranId,java.sql.Timestamp dts,ArrayList<ArrayList<SelectItem>> arr,double numberOfItemsPerdayA) throws ITMException
 {
 	
 	int priority=0;
@@ -1270,6 +1273,85 @@ private int generateDetRec(String empCode,int rec,Connection conn,String tranId,
 	}
 	return rec;
 	
+}*/
+private int generateDetRec(String empCode,int rec,Connection conn,String tranId,java.sql.Timestamp dts,ArrayList<ArrayList<SelectItem>> arr,double numberOfItemsPerdayA) throws ITMException
+{
+	
+	int priority=0;
+	SelectItem aitem=null;
+	String insertItemProcess="";
+	PreparedStatement pstmtInsert=null;
+	try
+	{
+		for(int ctr=0;ctr<arr.size();ctr++)
+		{
+			//if(numberOfItemsPerdayA>=arr.get(ctr).size())
+			
+			System.out.println("ctr---"+ctr+"---"+priority);
+				if(ctr>=priority)
+				{
+					System.out.println("ctr----"+ctr+"---"+arr.get(ctr).isEmpty());
+					for(int ctr1=0;ctr1<arr.get(ctr).size();ctr1++)
+					{
+						System.out.println("ctr1----"+ctr1);
+						
+						//System.out.println("aitem---"+aitem);
+						if(numberOfItemsPerdayA>priority)
+						{
+							priority++;
+							aitem=new SelectItem();
+							aitem=arr.get(ctr).get(ctr1);
+							rec++;
+							System.out.println("lineNo---"+rec);
+							insertItemProcess="insert into PHYSCANDET (TRAN_ID,LINE_NO,SITE_CODE,ITEM_CODE," +
+									"LOC_CODE,LOT_NO,LOT_SL,QUANTITY," +
+									"ANALYSIS_CLASS,PRIORITY_SEQ,CYCLE_CRITERIA,EMP_CODE__USER,UNIT) " +
+							"values(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+							pstmtInsert = conn.prepareStatement(insertItemProcess);
+							pstmtInsert.setString(1,tranId);
+							pstmtInsert.setInt(2,rec);
+							pstmtInsert.setString(3,aitem.getSiteCode());
+							pstmtInsert.setString(4,aitem.getItemCode());
+							pstmtInsert.setString(5,aitem.getLocCode());
+							pstmtInsert.setString(6,aitem.getLotNo());
+							pstmtInsert.setString(7,aitem.getlotSl());
+							pstmtInsert.setDouble(8,aitem.getQuantity());
+							pstmtInsert.setString(9,aitem.getAnalysisClass());
+							pstmtInsert.setInt(10,priority);
+							pstmtInsert.setString(11,aitem.getCycleCriteria());
+							pstmtInsert.setString(12,empCode);
+							pstmtInsert.setString(13,aitem.getUnit());
+							pstmtInsert.executeUpdate();
+							pstmtInsert.close();
+							pstmtInsert=null;
+						}
+						else
+						{
+							break;
+						}
+					}
+				}
+			
+			
+		}
+	}catch(Exception e)
+	{
+		try {
+			conn.rollback();
+			rec=0;
+		} catch (SQLException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		e.printStackTrace();
+		throw new ITMException(e);
+	}
+	finally
+	{
+		
+	}
+	return rec;
+	
 }
 //Changed By 02/10/12 Manoj Sharma Location emptied on pevious day does not come in the cycle count.start
 //public  long countDaysBetween(java.sql.Date startdate, java.util.Date enddate) 
@@ -1325,8 +1407,8 @@ private ArrayList countItemValue(ArrayList<SelectItem> alist) throws ITMExceptio
 		 System.out.println("itemCode---"+itemCode);
 		 System.out.println("lotNo---"+lotNo);
 		 System.out.println("lotSl---"+lotSl);
-		 System.out.println(hmOne.size());
-		 System.out.println(hmOne.toString());
+		 System.out.println(hmThree.size());
+		 System.out.println(hmThree.toString());
 		 //a2list.clear();
 		 if("1".equalsIgnoreCase(cycleCriteria))
 		 {
@@ -1339,7 +1421,7 @@ private ArrayList countItemValue(ArrayList<SelectItem> alist) throws ITMExceptio
 				 
 				 a2list=new ArrayList<SelectItem>();
 				 a2list.add(aitem);
-				 
+				 numberOfItemsA++;
 				 //System.out.println("aitem---"+aitem);
 				 System.out.println("a2list---"+a2list);
 				 System.out.println("Entering for CycleCriteria 1---a2list ----"+a2list.toString());
@@ -1352,20 +1434,53 @@ private ArrayList countItemValue(ArrayList<SelectItem> alist) throws ITMExceptio
 				 System.out.println("Skip the line");
 			 }
 		 }
+//		else if("2".equalsIgnoreCase(cycleCriteria))
+//		 {
+//			 if(!hmTwo.containsKey(itemCode+lotNo))
+//			 {
+//				 a2list=new ArrayList<SelectItem>();
+//				 a2list.add(aitem);
+//				 hmTwo.put(itemCode+lotNo,a2list) ;
+//			 }
+//			 else
+//			 {
+//				 b2list=new ArrayList<SelectItem>();
+//				 b2list=hmTwo.get(itemCode+lotNo);
+//				 b2list.add(aitem);
+//				 hmTwo.put(itemCode+lotNo,b2list) ;
+//				 
+//			 }
+//		 }
 		else if("2".equalsIgnoreCase(cycleCriteria))
 		 {
-			 if(!hmTwo.containsKey(itemCode+lotNo))
+			 if(!hmTwo.containsKey(itemCode))
 			 {
 				 a2list=new ArrayList<SelectItem>();
 				 a2list.add(aitem);
-				 hmTwo.put(itemCode+lotNo,a2list) ;
+				 numberOfItemsA++;
+				 hmTwo.put(itemCode,a2list) ;
 			 }
 			 else
 			 {
 				 b2list=new ArrayList<SelectItem>();
-				 b2list=hmTwo.get(itemCode+lotNo);
-				 b2list.add(aitem);
-				 hmTwo.put(itemCode+lotNo,b2list) ;
+				 b2list=hmTwo.get(itemCode);
+				 int listSize=0;
+				 listSize=b2list.size();
+				 System.out.println("listSize---"+listSize);
+				 for(int p=0;p<listSize;p++)
+				 {
+					 SelectItem sc=b2list.get(p);
+					 System.out.println("getting lotNo from existing list---"+sc.getLotNo());
+					 System.out.println("getting lotNo from current Record---"+aitem.getLotNo());
+					 if((sc.getLotNo()).equalsIgnoreCase(aitem.getLotNo()))
+					 {
+						 b2list.add(aitem); 
+						 numberOfItemsA++;
+						 break;
+					 }
+				 }
+				 
+				 hmTwo.put(itemCode,b2list) ;
 				 
 			 }
 		 }
@@ -1377,6 +1492,7 @@ private ArrayList countItemValue(ArrayList<SelectItem> alist) throws ITMExceptio
 				 System.out.println("1--"+aitem.getItemCode()+"---"+aitem.getLotNo()+"---"+aitem.getlotSl());
 				 a2list=new ArrayList<SelectItem>();
 				 a2list.add(aitem);
+				 numberOfItemsA++;
 				 
 				 hmThree.put(itemCode,a2list) ;
 			 }
@@ -1386,7 +1502,15 @@ private ArrayList countItemValue(ArrayList<SelectItem> alist) throws ITMExceptio
 				 c2list=new ArrayList<SelectItem>();
 				 //Added by manoj dtd 03/10/2012 to append record in map
 				 c2list=hmThree.get(itemCode);
+				 System.out.println("before adding element to c2list.size()--"+c2list.size());
 				 c2list.add(aitem);
+				 numberOfItemsA++;
+				 System.out.println("after adding element to c2list.size()--"+c2list.size());
+				 for(int p=0;p<c2list.size();p++)
+				 {
+					 SelectItem sc=c2list.get(p);
+					 System.out.println("Printing values---"+sc.getItemCode()+"----"+sc.getLotNo()+"---"+sc.getLocCode());
+				 }
 				 hmThree.put(itemCode,c2list) ; 
 			 }
 			 
@@ -1422,9 +1546,11 @@ private ArrayList countItemValue(ArrayList<SelectItem> alist) throws ITMExceptio
 		System.out.println("Printing Key--"+key);
 		a2list=hmOne.get(key);
 		System.out.println("a2list--"+a2list);
-		numberOfItemsA+=a2list.size();
+		//Commented by manoj dtd 06/0/2012 records count during item add
+		//numberOfItemsA+=a2list.size();
 		arr.add(a2list);
 	}
+	System.out.println("Number of records elligible for scanning "+numberOfItemsA);
 	result.add(numberOfItemsA);
 	result.add(arr);
 	}