changes in source code to null indent no

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

webitm-dis/ibase/webitm/ejb/dis/BillofQuantityAct.java

@@ -133,7 +133,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 		String itemCode = ""; String itemSer = ""; String unit = ""; String sql = ""; String sql1 = ""; String unitStd = ""; String unitRate = ""; String convRateStduom = ""; String packCode = ""; String remarks = ""; String amount = ""; String siteCode = ""; String indentNo = "";
 		String packInstr = ""; String specInstr = ""; String splInstr = ""; String hremarks = ""; String currCode = ""; String exchRate = ""; String projCode = ""; String hstatus = ""; String amountBc = ""; String suppCodePref = ""; String hunit = ""; String hamount = ""; String splInstrh = ""; String hsplInstr = "";
 		String hRate = ""; String tranId = ""; String hItemCode = ""; String htranType = ""; String hindentNo = ""; String hunitStd = ""; String hpackCode = ""; String hpackInstr = ""; String netAmountBc = ""; String hunitRate = ""; String hspecInstr = "",hsitecode = "",hitemSer = "",ditemCode = "",dItemCode = "",confirm = "", errString = "" ;
-		String loginSite = "";
+		String loginSite = "",itemCodeI = "";
 
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
 		PreparedStatement pstmt = null; PreparedStatement pstmt1 = null;
@@ -171,7 +171,6 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 			pstmt.close();
 			pstmt = null;
 			//end of changes 
-			//ADDED FOR GETTING PRICE LIST FROM PRICELIST MASTER 
 			//END OF ADDITION ON 05/03/2013
 			if("Y".equalsIgnoreCase(confirm))
 			{
@@ -197,7 +196,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 						"(case when h.site_code is null then ' ' else h.site_code end) as hsitecode , " +
 						//selecting proj code from hder boq
 						"(case when h.proj_code is null then ' ' else h.proj_code end) as proj_code , " +
-						"(case when h.indent_no is null then ' ' else h.indent_no end) as hindentno , " +
+					//	" '' as hindentno , " +
 						"(case when d.rate__stduom is null then 0 else d.rate__stduom end) as rate__stduom," +
 						"(case when d.amount is null then 0 else d.amount end) as amount  from boqdet d,boqhdr h where d.tran_id = h.tran_id  and h.indent_no = ? and h.site_code = ?";
 
@@ -232,12 +231,12 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 					specInstr = checkNull(rs.getString("spec_instr"));
 					splInstr = checkNull(rs.getString("spl_instr"));
 					amount = checkNull(rs.getString("amount"));
-					hItemCode = checkNull(rs.getString("hitemcode"));
+					hItemCode = checkNull(rs.getString("hitemcode"));//
 					System.out.println("hItemCode-->>["+hItemCode+"]");
 					siteCode = checkNull(rs.getString("hsitecode"));
 					System.out.println("siteCode-->>["+siteCode+"]");
-					hindentNo = checkNull(rs.getString("hindentno"));
-					System.out.println("indentNo-->>["+indentNo+"]");
+					//hindentNo = checkNull(rs.getString("hindentno"));
+					//System.out.println("indentNo-->>["+indentNo+"]");
 					projCode = checkNull(rs.getString("proj_code"));
 					System.out.println("proj_code-->>["+projCode+"]");
 					rateStduom = rs.getDouble("rate__stduom");
@@ -262,19 +261,18 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 					valueXmlString.append("<unit__std>").append("<![CDATA[").append(unitStd).append("]]>").append("</unit__std>\r\n");
 					valueXmlString.append("<quantity__stduom>").append("<![CDATA[").append(quantityStduom).append("]]>").append("</quantity__stduom>\r\n");
 					valueXmlString.append("<rate__stduom>").append("<![CDATA[").append(rateStduom).append("]]>").append("</rate__stduom>\r\n");
-					valueXmlString.append("<ind_no>").append("<![CDATA[").append(hindentNo).append("]]>").append("</ind_no>\r\n");
-					//aded project code to set on purchase order detial table 
+					System.out.println("ITEM CODE FROM INDENT  ["+itemCodeI+"] AND BILL OF QUANITIY ["+dItemCode+"] ");
+					valueXmlString.append("<ind_no>").append("<![CDATA["+" "+"]]>").append("</ind_no>\r\n");
 					valueXmlString.append("<proj_code>").append("<![CDATA[").append(projCode).append("]]>").append("</proj_code>\r\n");
 					valueXmlString.append("<remarks>").append("<![CDATA[").append(remarks).append("]]>").append("</remarks>\r\n");
 					valueXmlString.append("</Detail>\r\n");
 				}
-
 				rs.close();
 				rs = null;
 				pstmt.close();
 				pstmt = null;
 				sql1 = "select " +
-						//"(case when d.item_code is null then ' ' else d.item_code end) as item_code ," +
+						"(case when h.item_code is null then ' ' else h.item_code end) as item_code ," +
 						"(case when h.quantity is null then 0 else h.quantity end) as quantity," +
 						"(case when h.item_ser is null then ' ' else h.item_ser end ) as item_ser ," +
 						"(case when h.site_code is null then ' ' else h.site_code end) as site_code," +
@@ -317,7 +315,7 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 				rs = pstmt1.executeQuery();
 				while (rs.next())
 				{
-					//	dItemCode = rs.getString("item_code");
+					hItemCode = rs.getString("item_code");
 					hitemSer = checkNull(rs.getString("item_ser"));
 					hquantity = rs.getDouble("quantity");
 					hremarks = checkNull(rs.getString("remarks"));
@@ -367,7 +365,8 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 					valueXmlString.append("<unit__std>").append("<![CDATA[").append(hunitStd).append("]]>").append("</unit__std>\r\n");
 					valueXmlString.append("<quantity__stduom>").append("<![CDATA[").append(hquantityStduom).append("]]>").append("</quantity__stduom>\r\n");
 					valueXmlString.append("<rate__stduom>").append("<![CDATA[").append(hrateStduom).append("]]>").append("</rate__stduom>\r\n");
-					System.out.println("remove comment from according to item change -----04/02/2013----->>>>>>>. ");
+					System.out.println("remove comment from according to item change -----06/02/2013----->>>>>>>. ");
+					System.out.println("item code from indent ["+itemCodeI+"]and item code from bill of .["+dItemCode+"] ");
 					valueXmlString.append("<ind_no>").append("<![CDATA[").append(hindentNo).append("]]>").append("</ind_no>\r\n");
 					//added project code to set on purchase order  
 					valueXmlString.append("<proj_code>").append("<![CDATA[").append(projCode).append("]]>").append("</proj_code>\r\n");
@@ -425,7 +424,6 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 			NodeList detailList = selDataDom.getElementsByTagName("Detail");
 			//Node parentNode = parentNodeList.item(0);
 			int noOfDetails = detailList.getLength();
-
 			for (int ctr = 0; ctr < noOfDetails; ctr++)
 			{
 				currDetail = detailList.item(ctr);
@@ -436,7 +434,6 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 				{
 					valueXmlString.append("<Detail>");
 					currDetail1 = detailList.item(ctr);
-                     //"<dist_order isSrvCallOnChg='0' >"
 					valueXmlString.append("<item_ser isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("item_ser", currDetail1)).append("]]>").append("</item_ser>\r\n");
 					valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("item_code", currDetail1)).append("]]>").append("</item_code>\r\n");
 					valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("quantity", currDetail1)).append("]]>").append("</quantity>\r\n");
@@ -451,8 +448,9 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 					valueXmlString.append("<site_code isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("site_code", currDetail1)).append("]]>").append("</site_code>\r\n");
 					valueXmlString.append("<unit__rate isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("unit__rate", currDetail1)).append("]]>").append("</unit__rate>\r\n");
                      //commented according to manoj sir on 27/02/13
-					//valueXmlString.append("<ind_no isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("ind_no", currDetail1)).append("]]>").append("</ind_no>\r\n");
-					valueXmlString.append("<remarks>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("remarks", currDetail1)).append("]]>").append("</remarks>\r\n");
+					
+					valueXmlString.append("<ind_no isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("ind_no", currDetail1).trim()).append("]]>").append("</ind_no>\r\n");
+					valueXmlString.append("<remarks isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("remarks", currDetail1)).append("]]>").append("</remarks>\r\n");
 					valueXmlString.append("<unit__std isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("unit__std", currDetail1)).append("]]>").append("</unit__std>\r\n");
 					valueXmlString.append("<unit__std isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("unit__std", currDetail1)).append("]]>").append("</unit__std>\r\n");
 					valueXmlString.append("<conv__qty_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(genericUtility.getColumnValueFromNode("conv__qty_stduom", currDetail1)).append("]]>").append("</conv__qty_stduom>\r\n");
@@ -464,7 +462,6 @@ implements BillofQuantityActLocal, BillofQuantityActRemote
 					valueXmlString.append("</Detail>");
 				}
 			}//rate__stduom
-
 			valueXmlString.append("</Root>");
 		}
 		catch (ITMException itme)