set pack_instr from inv_pack_rcp

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

webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java

@@ -30,7 +30,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 {
 
 	ibase.webitm.utility.GenericUtility genericUtility = ibase.webitm.utility.GenericUtility.getInstance();
-
+	String currentActionType="",packInstrStock="",packInstrInvPackRcp="";
 	/*public void ejbCreate() throws RemoteException, CreateException 
 	{
 	} 
@@ -98,12 +98,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				System.out.println("dom1 :"+dom1);
 			}
 			System.out.println("actionType:"+actionType+":");
-						
+			currentActionType = actionType;	
+			System.out.println("currentActionType:["+currentActionType+"]");
+			
 			if (actionType.equalsIgnoreCase("Stock"))
 			{
 				retString = actionStock(dom,dom1,objContext,xtraParams);
 			}
-			else if (actionType.equalsIgnoreCase("Get Pack List"))
+			else if (actionType.equalsIgnoreCase("Get Pack List") ||  actionType.equalsIgnoreCase("Get SPack List") )
 			{
 				retString = actionGetPackList(dom,dom1,objContext,xtraParams);
 			}
@@ -123,6 +125,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 			{
 				retString = actionPacking(dom, dom1, objContext, xtraParams);
 			}
+			
 		}
 	   	catch(Exception e)
 		{
@@ -166,7 +169,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 			{
 				retString = getWoPackListTransform(dom,dom1, objContext, xtraParams, selDataDom);
 			}
-			if (actionType.equalsIgnoreCase("PackList"))//Gulzar 23-04-07 - 
+			if (actionType.equalsIgnoreCase("PackList") ||  actionType.equalsIgnoreCase("SPackList") )//Gulzar 23-04-07 - 
 			{
 				retString = packListTransform(dom,dom1, objContext, xtraParams, selDataDom);
 			}
@@ -1878,11 +1881,22 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				// 27/02/10 manoharan changed as per PB code
 				//sqlOrderNoDo = "SELECT ORDER_NO FROM INV_PACK WHERE ORDER_NO IN (SELECT DIST_ORDER FROM DISTORDER "
 				//			  +"WHERE SALE_ORDER ='"+saleOrder+"' ) AND ORDER_TYPE ='D' AND CONFIRMED = 'Y'";	
+				System.out.println("currentActionType:::::::::::::::::[[[["+currentActionType+"]]]]");
+				if( currentActionType.equalsIgnoreCase("Get SPack List"))
+				{
+					sqlOrderNoDo = "select order_no from inv_pack  "
+						+ " where order_no 	in ( select dist_order from distorder where sale_order = '" + saleOrder + "') "
+						+ " and order_type	= 'S'  "
+						+ " and confirmed 	= 'Y' ";	
+				}
+				else
+				{	
 				sqlOrderNoDo = "select order_no from inv_pack  "
 					+ " where order_no 	in ( select dist_order from distorder where sale_order = '" + saleOrder + "') "
 					+ " and order_type	= 'I'  "
 					+ " and confirmed 	= 'Y' ";
-					//+ " and order_type	in	('D','I')  "
+				}
+				//+ " and order_type	in	('D','I')  "
 				// end 27/02/10 manoharan
 				System.out.println("sqlOrderNoDo :"+sqlOrderNoDo);
 				stmt = conn.createStatement();
@@ -1965,9 +1979,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					valueXmlString.append("<quantity>").append("<![CDATA[").append(rs.getDouble(9)).append("]]>").append("</quantity>\r\n");
 					valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString(10)).append("]]>").append("</unit>\r\n");
 					valueXmlString.append("<pack_code>").append("<![CDATA[").append(rs.getString(11)).append("]]>").append("</pack_code>\r\n");
-					
 					valueXmlString.append("<pack_instr>").append("<![CDATA[").append((rs.getString(12) == null) ? "":rs.getString(12)).append("]]>").append("</pack_instr>\r\n");
-					
+					packInstrInvPackRcp =rs.getString(12);
 					valueXmlString.append("<gross_weight>").append("<![CDATA[").append(rs.getDouble(13)).append("]]>").append("</gross_weight>\r\n");
 					valueXmlString.append("<tare_weight>").append("<![CDATA[").append(rs.getDouble(14)).append("]]>").append("</tare_weight>\r\n");
 					valueXmlString.append("<net_weight>").append("<![CDATA[").append(rs.getDouble(15)).append("]]>").append("</net_weight>\r\n");
@@ -2026,8 +2039,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		String lineNoOrd ="", itemCode = "", locCode = "", lotNo = "", lotSL = "", packInstr  = "", dimension = "", dimension1 = "";   
 		String grossWt = "", tareWt = "", netWt = "", noArt1 = "";
 		String sExpDate="" , sMfgDate="" ,sRetestDate ="" ,siteCode = "";
-		String sql ="", tempStr = "";
-		PreparedStatement pstmt = null;
+		String sql ="", tempStr = "",sql2="";
+		PreparedStatement pstmt = null,pstmt1=null;
 		Timestamp retestDate = null ,mfgDate = null, expDate = null;
 		double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0; 
 		double detQty = 0, noArt = 0;
@@ -2044,7 +2057,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		Connection conn = null;
 		Statement stmt = null;
 		ResultSet rs = null;
-		ResultSet rs1 = null;
+		ResultSet rs1 = null,rs2=null;
 		Statement stmt1 = null;
 		ConnDriver connDriver = new ConnDriver();
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
@@ -2291,8 +2304,33 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				setNodeValue( dom, "lot_sl", (lotSL == null) ? "":lotSL );
 				valueXmlString.append("<status isSrvCallOnChg='0'>").append("<![CDATA[").append(" ").append("]]>").append("</status>\r\n");
 				setNodeValue( dom, "status",  " " );
-				valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append((packInstr == null) ? "":packInstr).append("]]>").append("</pack_instr>\r\n");
-				setNodeValue( dom, "pack_instr", (packInstr == null) ? "":packInstr );
+				System.out.println("@@@@@@1 packInstr["+packInstr+"]::::packInstrStock["+packInstrStock+"]");
+				valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append((packInstr == null) ? packInstrStock:packInstr).append("]]>").append("</pack_instr>\r\n");
+				if(packInstr == null || packInstr.trim().length() == 0)
+				{
+					sql2 = "select pack_instr from stock where  item_code = ? and "
+								+" site_code = ? and  loc_code  = ? and  "	
+								+"lot_no = ? and  lot_sl 	= ? ";
+							pstmt1 = conn.prepareStatement(sql2);
+							pstmt1.setString(1,itemCode);
+							pstmt1.setString(2,siteCode);
+							pstmt1.setString(3,locCode);
+							pstmt1.setString(4,lotNo);
+							pstmt1.setString(5,lotSL);
+												
+							rs2 = pstmt1.executeQuery();
+							if(rs2.next())
+							{	
+							  	packInstrStock = rs2.getString(1);
+							}
+							rs2.close();
+							rs2 =null;
+							pstmt1.close();
+							pstmt1 = null;
+							
+				}
+				System.out.println("@@@@@@2 packInstr["+packInstr+"]::::packInstrStock["+packInstrStock+"]");
+				setNodeValue( dom, "pack_instr", (packInstr == null) ? packInstrStock:packInstr );
 				valueXmlString.append("<gross_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(grossWeight).append("]]>").append("</gross_weight>\r\n");
 				setNodeValue( dom, "gross_weight", grossWeight );
 				valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
@@ -5244,10 +5282,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		String quantity ="0.0";
 		String itemCode="";
 		String itemDescr="";
-		PreparedStatement pstmt=null;
-		ResultSet rs=null;
+		PreparedStatement pstmt=null,pstmt1=null;
+		ResultSet rs=null,rs1=null;
 		Connection conn=null;
-		String sql=null;
+		String sql=null,sql1=null;
         String lineNo = "", tempStr = "";
         String locCode = "",lotNo = "",lotSl = "";
 
@@ -7229,6 +7267,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						//siteMfg  = rs.getString(12);        
 						siteMfg  = ( rs.getString(12) == null ?"":rs.getString(12));   
 						System.out.println("@@@@ siteMfg:["+siteMfg+"]");
+						packInstrStock = packInstr;
+						System.out.println("@@@@ packInstrStock:["+packInstrStock+"]");
 						// commented by cpatil on 31/JAN/13 as per suggestion modified end
 						palletWt = rs.getDouble(13);
 						
@@ -7363,8 +7403,17 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						setNodeValue( dom, "nett_weight", nettWeight );
 						valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(tareWeight).append("]]>").append("</tare_weight>\r\n");
 						setNodeValue( dom, "tare_weight", tareWeight );
+						if( packInstrInvPackRcp == null || packInstrInvPackRcp.trim().length()==0 )
+						{
 						valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(blanknull(packInstr)).append("]]>").append("</pack_instr>\r\n");
 						setNodeValue( dom, "pack_instr", (packInstr == null) ? " " : packInstr );
+						}
+						else
+						{
+							valueXmlString.append("<pack_instr isSrvCallOnChg='0'>").append("<![CDATA[").append(blanknull(packInstrInvPackRcp)).append("]]>").append("</pack_instr>\r\n");
+							setNodeValue( dom, "pack_instr", (packInstrInvPackRcp == null) ? " " : packInstrInvPackRcp );
+								
+						}
 						valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(blanknull(dimension)).append("]]>").append("</dimension>\r\n");
 						setNodeValue( dom, "dimension", (dimension == null) ? " " : dimension );
 						valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
@@ -7722,5 +7771,6 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		}
 		return retString;
 	}
-
+	
+	
 }
\ No newline at end of file