W15JSUN006 updated for comma separated disparm location and considering other...

W15JSUN006 updated for comma separated disparm location and considering other location for D-SO/S-ORD for stock transfer.


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

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

@@ -295,7 +295,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 							+" S.NET_WEIGHT, S.DIMENSION, S.RETEST_DATE, S.SUPP_CODE__MFG, S.PACK_INSTR,S.RATE "
 							+" FROM DISTORDER_ALLOC D,DISTORDER H,DISTORDER_DET DT,STOCK S "
 							//+" WHERE D.DIST_ORDER = ? AND D.LINE_NO = ? AND S.QUANTITY > 0 "
-							+" WHERE D.DIST_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ? AND S.QUANTITY > 0 "
+							+" WHERE D.DIST_ORDER = ? AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0 "
 							+" AND D.DIST_ORDER = H.DIST_ORDER AND H.DIST_ORDER = DT.DIST_ORDER AND D.LINE_NO = DT.LINE_NO AND"
 							+" D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE"
 							+" AND S.SITE_CODE = H.SITE_CODE ";
@@ -305,15 +305,15 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			{
 				sql = "SELECT S.ITEM_CODE,D.LINE_NO,S.QUANTITY,S.ALLOC_QTY,D.QTY_ALLOC,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE,S.NO_ART" 
 						+" FROM SORDALLOC D,SORDER H,STOCK S "
-						//+" WHERE D.SALE_ORDER = ? AND D.LINE_NO = ? AND S.QUANTITY > 0"
-						+" WHERE D.SALE_ORDER = ? AND D.LOC_CODE = ? AND D.LINE_NO = ? AND S.QUANTITY > 0"
+					  //+" WHERE D.SALE_ORDER = ? AND D.LINE_NO = ? AND S.QUANTITY > 0"
+						+" WHERE D.SALE_ORDER = ? AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0"
 						+" AND D.SALE_ORDER = H.SALE_ORDER"
 						+" AND D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL"
 						+" AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE AND D.SITE_CODE = S.SITE_CODE";
 			}
 			else if("PR".equalsIgnoreCase(refSer))
 			{
-				sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,P.LOC_CODE,S.LOC_CODE AS LOC_CODE_FROM,S.ALLOC_QTY,P.NO_ART," 
+				sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.ALLOC_QTY,P.NO_ART," 
 						+" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE" 
 						+" P.TRAN_ID = ? AND P.LINE_NO = ? AND"
 					    +" (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ?) "
@@ -321,7 +321,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 			}
 			else if("PRS".equalsIgnoreCase(refSer))
 			{
-				sql = "SELECT P.ITEM_CODE,S.QUANTITY,P.LOT_NO,P.LOT_SL,P.LOC_CODE,S.LOC_CODE AS LOC_CODE_FROM,H.SITE_CODE,S.ALLOC_QTY,P.NO_ART"
+				sql = "SELECT P.ITEM_CODE,S.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,S.ALLOC_QTY,P.NO_ART"
 						+" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?" 
 						+" AND P.TRAN_ID = H.TRAN_ID AND P.ITEM_CODE = S.ITEM_CODE" 
 						//+" AND H.SITE_CODE = S.SITE_CODE AND (P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ? )" 
@@ -398,12 +398,18 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 				if("D-SO".equalsIgnoreCase(refSer) && countDso > 0)
 				{
 					pstmt.setString(2, locCodeFrom);
-					pstmt.setString(3, lineNoInterface);
+					pstmt.setString(3, locCodeFrom+"X");
+					pstmt.setString(4, locCodeFrom+"B");
+					pstmt.setString(5, locCodeFrom+"P");
+					pstmt.setString(6, lineNoInterface);
 				}
 				else if("S-ORD".equalsIgnoreCase(refSer))
 				{
 					pstmt.setString(2, locCodeFrom);
-					pstmt.setString(3, lineNoInterface);
+					pstmt.setString(3, locCodeFrom+"X");
+					pstmt.setString(4, locCodeFrom+"B");
+					pstmt.setString(5, locCodeFrom+"P");
+					pstmt.setString(6, lineNoInterface);
 				}
 				else if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
 				{
@@ -435,33 +441,18 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 					siteCode  = checkNullAndTrim(rs.getString("SITE_CODE"));
 					noArt  = checkNullAndTrim(rs.getString("NO_ART"));
 					
-					if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
-					{
-						//Changed by wasim on 04-12-2014 to take loc_code from stock as loc_code from
-						//locCodeFrom  = checkNullAndTrim(rs.getString("PALLET_NO"));
-						locCodeFrom  = checkNullAndTrim(rs.getString("LOC_CODE_FROM"));
-						//locCodeTo  = checkNullAndTrim(rs.getString("LOC_CODE"));
-						//locCodeTo = getLocCodeTo(itemCode,conn);
-						allocQty  = rs.getDouble("ALLOC_QTY");//Changed by wasim on 02-11-2015 to get alloc quantity
-						//noArt  = checkNullAndTrim(rs.getString("NO_ART"));//Changed by wasim on 03-12-2015 
+					locCodeFrom  = checkNullAndTrim(rs.getString("LOC_CODE"));
+					allocQty  = rs.getDouble("ALLOC_QTY");
+					
+					if(countDso > 0 && "D-SO".equalsIgnoreCase(refSer))
+					{	
+						distOrderAlloc  = rs.getDouble("QTY_ALLOC");
 					}
-					else
+					if("S-ORD".equalsIgnoreCase(refSer))
 					{
-						//locCodeFrom  = checkNullAndTrim(rs.getString("LOC_CODE"));
-						allocQty  = rs.getDouble("ALLOC_QTY");
-						//noArt  = checkNullAndTrim(rs.getString("NO_ART"));//Changed by wasim on 07-12-2015 
-						if(countDso > 0 && "D-SO".equalsIgnoreCase(refSer))
-						{	
-							//tranIdIssList.add(checkNullAndTrim(rs.getString("TRAN_ID")));//Added by wasim on 10-11-2015
-							distOrderAlloc  = rs.getDouble("QTY_ALLOC");
-						}
-						if("S-ORD".equalsIgnoreCase(refSer))
-						{
-							sordAllocQty  = rs.getDouble("QTY_ALLOC");
-						}
-						//locCodeTo = getLocCodeTo(itemCode,conn);
-						//locCodeTo  = distComm.getDisparams("999999",refSer,conn); 
+						sordAllocQty  = rs.getDouble("QTY_ALLOC");
 					}
+					
 					System.out.println("Loc code to recieved=["+locCodeTo+"]Loc Code From["+locCodeFrom+"]PalletNo["+palletNo+"]");
 
 					lineNo++;
@@ -763,253 +754,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
 		}
 		return errString;
 	}
-	private String inventoryHold(HashMap interfaceMap,String siteCode, String xtraParams,Connection conn) throws SQLException, ITMException
-	{
-		PreparedStatement pstmt= null,pstmtHold = null,pstmtHolddet = null,pstmtInterface= null,pstmtUpdate = null,pstmtDso = null;
-		ResultSet rs = null,rsInterface = null,rsDso = null;
-
-		String sql = "",loginSiteCode = "",userId = "",sqlInterface = "",sqlDso = "",chgTerm = "";
-		int updCnt = 0,lineNo = 0,caseCount = 0,countDso = 0;
-
-		String holdInsertSql = "",holddetInsertSql = "",invtranId = "",invLockDetsql = "",errString = "",sqlUpdate = "",locCodeQuarnt = "";
-
-		String refSer = "",refId = "",itemCode = "",locCode = "",lotNo = "",lotSl = "",locCodeStock = "";
-
-		loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
-		userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
-		chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
-
-		String lockCodeName = "AWMS_LOCK",lockCode = "",lineNoInterface = "";
-		boolean headerFlag = true;
-
-		try
-		{
-			System.out.println("Inside inventory hold");
-
-			java.sql.Timestamp currDate = getCurrtDate();
-			System.out.println("Current date for inventory hold is"+currDate);
-
-			lockCode = distComm.getDisparams("999999",lockCodeName,conn); 
-			System.out.println("Lock code is ="+lockCode);
-
-			SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
-			String currDateStr = sdfAppl.format(currDate);
-
-			refSer = checkNullAndTrim((String) interfaceMap.get("REF_SER"));
-			refId = checkNullAndTrim((String) interfaceMap.get("REF_ID"));
-			locCodeStock = checkNullAndTrim((String) interfaceMap.get("PALLET_NO"));
-			//locCode = checkNullAndTrim((String) interfaceMap.get("PALLET_NO"));
-
-			holddetInsertSql = "INSERT INTO INV_HOLD_DET(TRAN_ID,LINE_NO,ITEM_CODE,SITE_CODE,LOC_CODE,LOT_NO,LOT_SL,HOLD_STATUS,SCH_REL_DATE)"
-					+ "	VALUES(?,?,?,?,?,?,?,?,?)";
-			pstmtHolddet = conn.prepareStatement(holddetInsertSql);
-
-			if("D-SO".equalsIgnoreCase(refSer))
-			{
-				sqlDso = "SELECT COUNT(*) AS COUNT FROM DISTORDER_ALLOC WHERE DIST_ORDER = ?";
-				pstmtDso = conn.prepareStatement(sqlDso);
-				pstmtDso.setString(1, refId);
-				rsDso = pstmtDso.executeQuery();
-				if(rsDso.next())
-				{
-					countDso = rsDso.getInt("COUNT");
-				}
-				if(pstmtDso != null){pstmtDso.close();pstmtDso = null;}
-				if(rsDso != null){rsDso.close();rsDso = null;}
-
-				System.out.println("Count DSO ="+countDso);
-
-				if(countDso == 0)
-				{
-					sql = "SELECT D.ITEM_CODE,D.LINE_NO,D.QUANTITY,D.LOT_NO,D.LOT_SL,D.LOC_CODE,H.SITE_CODE"
-							+" FROM DISTORD_ISSDET D,DISTORD_ISS H  WHERE D.TRAN_ID = H.TRAN_ID AND H.CONFIRMED = 'N' AND D.DIST_ORDER = ?"
-							+ "AND D.LINE_NO = ? AND D.QUANTITY > 0";
-				}
-				else
-				{
-					sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,H.SITE_CODE"
-							+" FROM DISTORDER_ALLOC D,DISTORDER H,STOCK S WHERE D.DIST_ORDER = ? AND D.LINE_NO = ?"
-							+" AND D.DIST_ORDER = H.DIST_ORDER AND S.SITE_CODE = H.SITE_CODE AND S.ITEM_CODE = D.ITEM_CODE"
-							+" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_SL = D.LOT_SL AND S.LOT_NO = D.LOT_NO";
-				}
-			}
-			else if("S-ORD".equalsIgnoreCase(refSer))
-			{
-				sql = "SELECT ITEM_CODE,LINE_NO,QUANTITY,LOT_NO,LOT_SL,LOC_CODE,"
-						+ "SITE_CODE FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ?";
-			}
-			else if("PZ".equalsIgnoreCase(refSer))
-			{
-				sql = "SELECT P.ITEM_CODE,P.LOT_NO,P.LOT_SL,"
-						+ "	P.LOC_CODE,P.SITE_CODE,P.PALLET_NO FROM PALLET_DET P,STOCK S WHERE TRAN_ID = ? AND P.LINE_NO = ?"
-						+ " AND P.ITEM_CODE = S.ITEM_CODE AND P.SITE_CODE = S.SITE_CODE AND S.QUANTITY > 0"
-						+ " AND P.LOC_CODE = S.LOC_CODE AND P.LOT_NO = S.LOT_NO AND P.LOT_SL = S.LOT_SL";
-			}
-			else if("PR".equalsIgnoreCase(refSer))
-			{
-				sql = "SELECT S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.LOC_CODE,P.PALLET_NO,"+ 
-						" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE " +
-						" P.TRAN_ID = ? AND P.LINE_NO = ? AND S.QUANTITY > 0 AND (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ?)";
-			}
-			else if("PRS".equalsIgnoreCase(refSer))
-			{
-				sql = "SELECT P.ITEM_CODE,P.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,P.PALLET_NO"
-						+" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?" 
-						+" AND P.TRAN_ID = H.TRAN_ID "
-						+" AND P.ITEM_CODE = S.ITEM_CODE AND H.SITE_CODE = S.SITE_CODE AND ( P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ?) AND P.LOT_NO = S.LOT_NO" 
-						+" AND P.LOT_SL = S.LOT_SL AND S.QUANTITY > 0";
-			}
-			pstmt = conn.prepareStatement(sql);
-
-			sqlInterface = "SELECT DISTINCT (LINE_NO),PALLET_NO FROM WMS_TO_HOST WHERE REF_ID = ? AND IN_OUT = 'P'" 
-					+ " AND LINE_NO IN (SELECT LINE_NO FROM SWMS_TO_AWMS WHERE REF_ID = ? AND SCHEDULE_STATUS = 'N')"
-					+ " AND PALLET_NO = ?";
-			pstmtInterface = conn.prepareStatement(sqlInterface);
-			pstmtInterface.setString(1, refId);
-			pstmtInterface.setString(2, refId);
-			pstmtInterface.setString(3, locCodeStock);
-			rsInterface = pstmtInterface.executeQuery();
-			while(rsInterface.next())
-			{
-				if("S-ORD".equalsIgnoreCase(refSer))//this is because sordalloc has char(3) in line_no
-				{
-					lineNoInterface = checkNullAndTrim(rsInterface.getString("LINE_NO"));
-					lineNoInterface = "   " + lineNoInterface;
-					lineNoInterface = lineNoInterface.substring( lineNoInterface.length()-3 );
-				}
-				else
-				{
-					lineNoInterface = checkNullAndTrim(rsInterface.getString("LINE_NO"));
-				}
-
-				System.out.println("Line no in inH["+lineNoInterface+"]");
-			
-				if(headerFlag)
-				{	
-					holdInsertSql = "INSERT INTO INV_HOLD(TRAN_ID,TRAN_DATE,SITE_CODE,CONFIRMED,REF_ID,REF_SER,CHG_USER,CHG_DATE,CHG_TERM, LOCK_CODE,REF_NO) "
-							+ "VALUES(?,?,?,?,?,?,?,?,?,?,?)";
-					pstmtHold = conn.prepareStatement(holdInsertSql);
-					invtranId = generateTranTd("w_inv_hold",currDateStr, loginSiteCode, conn);
-
-					pstmtHold.setString( 1, invtranId );
-					pstmtHold.setTimestamp( 2, currDate);
-					pstmtHold.setString( 3, siteCode );
-					pstmtHold.setString( 4, "N" );
-					pstmtHold.setString( 5, refId );
-					pstmtHold.setString( 6, refSer );
-					pstmtHold.setString( 7, userId );
-					pstmtHold.setTimestamp( 8, currDate );
-					pstmtHold.setString( 9, chgTerm );
-					pstmtHold.setString( 10, lockCode );
-					pstmtHold.setString( 11, "" );	
-					updCnt = pstmtHold.executeUpdate();
-					pstmtHold.clearParameters();
-				}	
-
-				pstmt.setString(1, refId);
-				pstmt.setString(2, lineNoInterface);
-				
-				if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
-				{
-					locCodeQuarnt = checkNullAndTrim(rsInterface.getString("PALLET_NO"));
-					pstmt.setString(3, locCodeQuarnt+"Q");
-				}
-
-				rs = pstmt.executeQuery();
-				while(rs.next())
-				{
-					itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
-					lotNo  = checkNullAndTrim(rs.getString("LOT_NO"));
-					lotSl  = checkNullAndTrim(rs.getString("LOT_SL"));
-
-					if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
-					{
-						locCode  = checkNullAndTrim(rs.getString("LOC_CODE"));
-					}
-					else
-					{
-						locCode  = checkNullAndTrim(rs.getString("LOC_CODE"));
-					}
-
-					siteCode  = checkNullAndTrim(rs.getString("SITE_CODE"));
-
-					lineNo++;
-
-					pstmtHolddet.setString( 1, invtranId );
-					pstmtHolddet.setInt( 2, lineNo );
-					pstmtHolddet.setString( 3, itemCode );
-					pstmtHolddet.setString( 4, siteCode );
-					pstmtHolddet.setString( 5, locCode );
-					pstmtHolddet.setString( 6, lotNo );
-					pstmtHolddet.setString( 7, lotSl );
-					pstmtHolddet.setString( 8, "H" );
-					pstmtHolddet.setTimestamp( 9, currDate);
-					pstmtHolddet.addBatch();
-					pstmtHolddet.clearParameters();
-				}
-				pstmtHolddet.executeBatch();
-				pstmtHolddet.clearBatch();
-
-				rs.close();rs = null;
-				pstmt.clearParameters();
-
-				sqlUpdate = "UPDATE SWMS_TO_AWMS SET SCHEDULE_STATUS = 'Y' WHERE REF_ID = ? AND LINE_NO = ?";
-				pstmtUpdate = conn.prepareStatement(sqlUpdate);
-				pstmtUpdate.setString(1, refId);
-				pstmtUpdate.setString(2, lineNoInterface.trim());
-				caseCount = pstmtUpdate.executeUpdate();
-				System.out.println("Updated ="+caseCount);
-				pstmtUpdate.close();pstmtUpdate = null;
-
-				if("PR".equalsIgnoreCase(refSer) || "PRS".equalsIgnoreCase(refSer))
-				{	
-					sqlUpdate = "UPDATE PALLET_REQ_DET SET STATUS = 'R' WHERE TRAN_ID = ? AND LINE_NO = ?";
-					pstmtUpdate = conn.prepareStatement(sqlUpdate);
-					pstmtUpdate.setString(1, refId);
-					pstmtUpdate.setString(2, lineNoInterface);
-					caseCount = pstmtUpdate.executeUpdate();
-					System.out.println("Updated ="+caseCount);
-					pstmtUpdate.close();pstmtUpdate = null;
-				}	
-				headerFlag = false;
-			}
-			rsInterface.close();rsInterface = null;
-			pstmtInterface.close();pstmtInterface = null;	
-
-			InvHoldConf invHoldConf = new InvHoldConf();
-			errString = invHoldConf.confirm( invtranId, xtraParams, "" , conn ,false);//VTCNFSUCC
-
-			System.out.println("Return String from inventory holdr="+errString);
-			if( errString != null &&  errString.indexOf( "VTCNFSUCC" ) > -1)
-			{
-				System.out.println("Inventory successfully go to hold and committed transaction"+invtranId);
-				conn.commit();
-			}
-			else
-			{
-				throw new Exception(errString);
-			}
-		}
-		catch(Exception e)
-		{
-			throw new ITMException(e);
-		}
-		finally
-		{
-			try
-			{
-				if(pstmtHold != null){pstmtHold.close();pstmtHold = null;}
-				if(pstmtHolddet != null){pstmtHolddet.close();pstmtHolddet = null;}
-				if(pstmt != null){pstmt.close();pstmt = null;}
-				if(rs != null){rs.close();rs = null;}
-			}
-			catch(Exception ex)
-			{
-				throw new ITMException(ex); 
-			}
-		}
-		return errString;
-	}
+	
 	private String generateTranTd(String windowName,String tranDate,String siteCode, Connection  conn )throws ITMException
 	{		
 		System.out.println("inside generateTranTd@@.........");