Request ID:W15HSUN003,palletrequest with stocks details

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

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

@@ -71,6 +71,7 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 		String lineNo = "",itemCode="",lotNo="",lotSl="",noArt="",quantity="" ;
 		String empCodeAprv="",siteCode ="";
 		String loginSite="",qtyPerArt="",refSer="PRS";
+		String descr="",unit="",itemType="",mfgDate="",expiryDate="";
 		ArrayList<String> palletList = new ArrayList();
 		ArrayList<String> lineList = new ArrayList();
 		int count , cntPal = 0;
@@ -155,7 +156,6 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 				pstmt = null;
 			}
 
-
 			/*sql="SELECT TRAN_DATE FROM PALLET_REQ_HDR WHERE TRAN_ID=?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, tranId);
@@ -171,7 +171,8 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 			//Changed for pallet request with stock details [Start]Request Id:W15HSUN003
 			//sql="SELECT PALLET_NO ,LINE_NO FROM PALLET_REQ_DET WHERE TRAN_ID=?";
 
-			sql = "SELECT D.PALLET_NO ,D.LINE_NO,D.ITEM_CODE,D.LOT_NO,D.LOT_SL,D.NO_ART,D.QUANTITY FROM PALLET_REQ_DET D WHERE TRAN_ID=?";
+			sql = "SELECT D.PALLET_NO ,D.LINE_NO,D.ITEM_CODE,D.LOT_NO,D.LOT_SL,D.NO_ART,D.QUANTITY " +
+			"FROM PALLET_REQ_DET D WHERE TRAN_ID=?";
 			//Changed for pallet request with stock details [End]Request Id:W15HSUN003
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranId );
@@ -200,11 +201,17 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 
 				if(itemCode!= null && itemCode.length() > 0)	
 				{
-					sql="SELECT S.QTY_PER_ART FROM STOCK S WHERE S.SITE_CODE=?"
+					/*sql="SELECT S.QTY_PER_ART FROM STOCK S WHERE S.SITE_CODE=?"
 						+" AND S.LOC_CODE = ?"
 						+" AND S.ITEM_CODE=?"
 						+" AND S.LOT_NO=? "
-						+" AND S.LOT_SL=?";
+						+" AND S.LOT_SL=?";*/
+
+					sql="SELECT S.QTY_PER_ART,I.DESCR ,S.UNIT,I.ITEM_TYPE ,S.MFG_DATE,S.EXP_DATE " +
+					"FROM STOCK S ,ITEM I WHERE S.SITE_CODE=? AND S.LOC_CODE = ?  " +
+					"AND S.ITEM_CODE= ? AND S.LOT_NO= ? " +
+					"AND S.LOT_SL= ? AND S.ITEM_CODE=I.ITEM_CODE";
+
 					pstmt1 = conn.prepareStatement(sql);
 					pstmt1.setString(1, siteCode);
 					pstmt1.setString(2, palletNo);
@@ -216,6 +223,11 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 					if(rs1.next())
 					{	
 						qtyPerArt = checkNullAndTrim(rs1.getString("QTY_PER_ART"));
+						descr= checkNullAndTrim(rs1.getString("DESCR"));
+						unit = checkNullAndTrim(rs1.getString("UNIT"));
+						itemType = checkNullAndTrim(rs1.getString("ITEM_TYPE"));
+						mfgDate = checkNullAndTrim(rs1.getString("MFG_DATE"));
+						expiryDate = checkNullAndTrim(rs1.getString("EXP_DATE"));
 						palletStatus=commonWmsUtility.getFullOrPrtialPalletOut(palletNo,refSer,tranId,siteCode, conn) ;
 						System.out.println("palletStatus for PRS"+palletStatus);
 						HashMap hm = new HashMap();
@@ -230,14 +242,14 @@ public class PalletReqConf extends ActionHandlerEJB implements PalletReqConfLoca
 						hm.put("TOTAL_QTY", quantity);
 						hm.put("PALLET_NO", palletNo);
 						hm.put("LINE_NO", lineNo);
-						hm.put("DESCR", "");
-						hm.put("UNIT", "");
-						hm.put("ITEM_TYPE", "");
+						hm.put("DESCR", descr);
+						hm.put("UNIT", unit);
+						hm.put("ITEM_TYPE", itemType);
 						hm.put("FAMILY_GRP", "");
 						hm.put("TRAN_ID", "");
 						hm.put("IN_OUT", "O");
-						hm.put("EXP_DATE", "");
-						hm.put("MFG_DATE", "");
+						hm.put("EXP_DATE", expiryDate);
+						hm.put("MFG_DATE", mfgDate);
 						hm.put("PALLET_STATUS", palletStatus);
 						hm.put("MSG_STAT", "N");
 						hm.put("LOCK_STAT", "");

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

@@ -36,7 +36,7 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 	{
 		Document dom = null;
 		Document dom1 = null;
-		String retString = null;
+		String retString = "";
 		System.out.println("actionHandler:" +actionType);
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		try {
@@ -76,7 +76,7 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 
 	public String stockExpiry( Document dom,Document dom1, String forcedFlag , Connection conn, boolean conStat ) throws Exception
 	{
-		String sql = "",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="";;
+		String sql = "",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="",siteCode="";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
 		String locCode = "" ,status = "";
@@ -86,20 +86,19 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 		StringBuffer xmlString = new StringBuffer("<Root>");
 		try 
 		{
-			String siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
+			siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
 			//Changed for pallet request with stock detail [Start]Request Id:W15HSUN003
 			//sql = " SELECT D.LOC_CODE AS PALLET_NO ,D.ITEM_CODE,D.SITE_CODE,D.LOT_NO,D.LOT_SL" + " FROM  INV_HOLD_DET D,INV_HOLD I ,LOCATION L WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND D.HOLD_STATUS != ?" + " AND I.LOCK_CODE = ?" + "AND L.INV_STAT=? AND D.SITE_CODE= ?";//EXP_LOCK
 			//sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY," +
 			//		"S.NO_ART   FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S " +
 			//		"WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY>0";//EXP_LOCK
 
-
 			sql="SELECT S.LOC_CODE AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY," +
 			"S.NO_ART FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE  S.ITEM_CODE = D.ITEM_CODE" +
 			" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL " +
 			"AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE  AND I.TRAN_ID = D.TRAN_ID " +
 			"AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  " +
-			"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";
+			"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";//EXP_LOCK
 			//Changed for pallet request with stock detail [End] Request Id:W15HSUN003
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, "R");
@@ -156,24 +155,25 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 
 	public String stockNearExpiry( Document dom,Document dom1, String forcedFlag , Connection conn, boolean conStat ) throws Exception
 	{
-		String locCode="", status="",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="",sql="";
+		String locCode="", status="",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="",sql="",siteCode="";
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		StringBuffer xmlString = new StringBuffer("<Root>");
 		ConnDriver connDriver = new ConnDriver();
 		conn = connDriver.getConnectDB("DriverITM");
 		try 
 		{
-			String siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
+			siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
 
 			//Changed for pallet request with stock detail [Start]Request Id:W15HSUN003
 			//String sql = " SELECT D.LOC_CODE AS PALLET_NO ,D.ITEM_CODE,D.SITE_CODE,D.LOT_NO,D.LOT_SL" + " FROM  INV_HOLD_DET D,INV_HOLD I ,LOCATION L WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND D.HOLD_STATUS != ?" + " AND I.LOCK_CODE = ?" + "AND L.INV_STAT=? AND D.SITE_CODE= ?";//NEXP_LOCK
 			//String sql="SELECT DISTINCT (S.LOC_CODE) AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY,S.NO_ART   FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE D.LOC_CODE=L.LOC_CODE AND I.TRAN_ID = D.TRAN_ID AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY>0";//NEXP_LOCK
+
 			sql="SELECT S.LOC_CODE AS PALLET_NO ,S.ITEM_CODE, S.LOT_NO,S.LOT_SL,S.QUANTITY," +
 			"S.NO_ART FROM  INV_HOLD_DET D,INV_HOLD I , LOCATION L ,STOCK S WHERE  S.ITEM_CODE = D.ITEM_CODE" +
 			" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO AND S.LOT_SL = D.LOT_SL " +
 			"AND S.SITE_CODE = D.SITE_CODE AND D.LOC_CODE=L.LOC_CODE  AND I.TRAN_ID = D.TRAN_ID " +
 			"AND L.LOC_CODE=S.LOC_CODE AND D.HOLD_STATUS != ?  AND I.LOCK_CODE = ?  " +
-			"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";
+			"AND L.INV_STAT=? AND S.SITE_CODE= ? AND S.QUANTITY > 0";//NEXP_LOCK
 			//Changed for pallet request with stock detail [End]Request Id:W15HSUN003
 			PreparedStatement pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, "R");
@@ -231,14 +231,14 @@ public class PalletReqExpiryAct extends ActionHandlerEJB implements PalletReqExp
 	//Changed for pallet request with stock detail [Start]Request Id:W15HSUN003
 	public String defaultData( Document dom,Document dom1, String forcedFlag , Connection conn, boolean conStat ) throws Exception
 	{
-		String locCode="", status="",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="";
+		String locCode="", status="",palletNo = "",itemCode="",lotNo="",lotSl="",quantity="",noArt="",siteCode="";
 		GenericUtility genericUtility = GenericUtility.getInstance();
 		StringBuffer xmlString = new StringBuffer("<Root>");
 		ConnDriver connDriver = new ConnDriver();
 		conn = connDriver.getConnectDB("DriverITM");
 		try 
 		{
-			String siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
+			siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code",dom1));
 			String sql = " SELECT  DISTINCT (S.LOC_CODE) AS PALLET_NO,S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.QUANTITY," +
 			"S.NO_ART FROM STOCK S ,LOCATION L WHERE L.INV_STAT=? AND  S.SITE_CODE=? " +
 			"AND S.LOC_CODE=L.LOC_CODE AND S.QUANTITY>0 ";