set pallet wt,dimension

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

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

@@ -1932,7 +1932,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						 +"INV_PACK_RCP.NET_WEIGHT, "   
 						 +"INV_PACK_RCP.NO_ART, "   
 						 +"INV_PACK_RCP.DIMENSION, "   
-						 +"'Y' AS PROCESS_YN  "  ///+" STOCK.MFG_DATE, STOCK.EXP_DATE " 
+						 +"'Y' AS PROCESS_YN ,INV_PACK_RCP.PALLET_WT  "  ///+" STOCK.MFG_DATE, STOCK.EXP_DATE " 
 					+"FROM INV_PACK, INV_PACK_RCP, STOCK "  
 					+"WHERE INV_PACK.TRAN_ID = INV_PACK_RCP.TRAN_ID "
 					+"AND INV_PACK_RCP.ITEM_CODE = STOCK.ITEM_CODE "
@@ -1982,6 +1982,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					// end 03/12/10
 					valueXmlString.append("<process_yn>").append("<![CDATA[").append(rs.getString(18)).append("]]>").append("</process_yn>\r\n");
 					
+					//added by kunal on 13/02/13 add pallet wt.
+					valueXmlString.append("<pallet_wt>").append("<![CDATA[").append(rs.getDouble(19)).append("]]>").append("</pallet_wt>\r\n");
+					
 					valueXmlString.append("</Detail>\r\n");
 				}//while end
 				valueXmlString.append("</Root>\r\n");			
@@ -2020,7 +2023,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		String sqlStr = "", origInvOrderNo = "", sorder = "N";
 		String orderType = "",spaces = "",expLev = "",saleOrd = "";
 		String taxClass = "", taxChap = "", taxEnv = "", unit = "",unitStd = "";  
-		String lineNoOrd ="", itemCode = "", locCode = "", lotNo = "", lotSL = "", packInstr  = "", dimension = "";   
+		String lineNoOrd ="", itemCode = "", locCode = "", lotNo = "", lotSL = "", packInstr  = "", dimension = "", dimension1 = "";   
 		String grossWt = "", tareWt = "", netWt = "", noArt1 = "";
 		String sExpDate="" , sMfgDate="" ,sRetestDate ="" ,siteCode = "";
 		String sql ="", tempStr = "";
@@ -2028,7 +2031,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		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;
-		double palletWt = 0 ;//added by kunal on 1/02/13
+		double palletWt = 0 ,palletWt1 = 0 ;//added by kunal on 1/02/13
 		NodeList detailList = null;
 		Node currDetail = null;
 		int detailListLength = 0;
@@ -2251,8 +2254,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					packQty = df.parse(df.format(packQty)).doubleValue(); 
 				}
 				//
-				dimension	= genericUtility.getColumnValueFromNode("dimension",currDetail);
-				dimension = (dimension == null ? " ": dimension );
+				dimension1	= genericUtility.getColumnValueFromNode("dimension",currDetail);
+				dimension1 = (dimension1 == null ? " ": dimension1 );
+				palletWt1	= Double.parseDouble(genericUtility.getColumnValueFromNode("pallet_wt",currDetail) == null?"0":genericUtility.getColumnValueFromNode("pallet_wt",currDetail).trim());
+				
+				System.out.println("dimension::"+dimension1+"   palletWt::"+palletWt1);
+			
 				System.out.println("Double.parseDouble(qty.get(1).toString())"+Double.parseDouble(qty.get(1).toString()));
 				//valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(qty.get(1)).append("]]>").append("</quantity>\r\n");
 				setNodeValue( dom, "quantity",quantity);
@@ -2351,6 +2358,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				
 				System.out.println("dimension=="+dimension+"   palletWt="+palletWt);
 				
+				//added by kunal on 13/02/13 dimension ,palletWt set from inv_pack_rcp if not in stock
+				if(dimension == null || dimension.trim().length() == 0)
+				{
+					dimension = dimension1;
+				}
+				if(palletWt == 0)
+				{
+					palletWt = palletWt1;
+				}
+				
 				if(retestDate !=null)
 				{
 					sRetestDate = sdf.format(retestDate).toString();

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

@@ -673,7 +673,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 		String itemCode = "",siteCode = "",packCode = "",distOrder = "",tranType = "",noArt = "";
 		String checkIntegralQty = "",lineNoOrd ="",sql = "",pickQtyStr = "", batchNo = "", grade = "", mfgDate1 = "";
 		String locCode = "",lotNo = "",lotSl = "",errCode = "", errString = "", expDate1 = null, retestDate1 = "";
-		String dimension = "",descr = "";
+		String dimension = "",descr = "",dimension1 = "";
 		NodeList detailList = null;
 		Node currDetail = null;
 		int detailListLength = 0, cnt = 0;
@@ -682,7 +682,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 		ResultSet rs = null, rs1 = null;
 		ConnDriver connDriver = new ConnDriver();
 		double ordQty = 0,pickQty = 0,integralQty = 0, stkQty = 0, remainingQty = 0, rate = 0, amount = 0, netAmt = 0, taxAmt = 0, potencyPerc = 0;
-		double palletWt = 0 ;//added by kunal on 06/02/12
+		double palletWt = 0,palletWt1 = 0  ;//added by kunal on 06/02/12
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
 		ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB(); 
 		ArrayList tranIdArrList = new ArrayList();
@@ -725,7 +725,7 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 			}
 			
 			sql = "SELECT i.LINE_NO__ORD, i.ITEM_CODE, i.LOT_NO, i.LOT_SL, i.QUANTITY,i.UNIT, i.PACK_CODE, "
-				 +"i.PACK_INSTR,i.LOC_CODE,i.GROSS_WEIGHT, i.TARE_WEIGHT, i.NET_WEIGHT, i.DIMENSION, i.NO_ART "
+				 +"i.PACK_INSTR,i.LOC_CODE,i.GROSS_WEIGHT, i.TARE_WEIGHT, i.NET_WEIGHT, i.DIMENSION, i.NO_ART ,i.PALLET_WT  "
 				 +"FROM INV_PACK_RCP  i, inv_pack h "
 				 +"WHERE h.tran_id = i.tran_id "
 				 + " and i.TRAN_ID in (" + tranIds + " ) "
@@ -810,9 +810,13 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 				valueXmlString.append("<tare_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(11)).append("]]>").append("</tare_weight>\r\n");
 				valueXmlString.append("<net_weight isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(12)).append("]]>").append("</net_weight>\r\n");
 				//valueXmlString.append("<dimension isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(13)).append("]]>").append("</dimension>\r\n");
+				dimension1 = rs.getString(13) == null ?" ":rs.getString(13);
 				//added by kunal on 31/01/12 set no art 
 				System.out.println("no art = "+rs.getInt(14));
 				valueXmlString.append("<no_art isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getInt(14)).append("]]>").append("</no_art>\r\n");
+				palletWt1 = rs.getDouble(15);
+				
+				System.out.println("dimension:::"+dimension1+"  palletWt1:::"+palletWt1);
 				
 				valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(rs.getString(5)).append("]]>").append("</quantity>\r\n");
 				valueXmlString.append("<tax_class isSrvCallOnChg='0'>").append("<![CDATA[").append(taxClass == null ? "": taxClass).append("]]>").append("</tax_class>\r\n");
@@ -858,6 +862,17 @@ public class DistIssueAct extends ActionHandlerEJB implements DistIssueActLocal,
 				pstmt1.close();
 				pstmt1 = null;
 				
+				System.out.println("dimension s:::"+dimension+"  palletWt s:::"+palletWt);
+				//added by kunal on 13/02/13 dimension ,palletWt set from inv_pack_rcp if not in stock 
+				if(dimension == null || dimension.trim().length() == 0)
+				{
+					dimension = dimension1;
+				}
+				if(palletWt == 0)
+				{
+					palletWt = palletWt1;
+				}
+				
 				
 				//change done by kunal ON 25/01/13 for  null date  
 				if (mfgDate != null)