REQID-D15LSUN033 FOR DATAWARE HOUSE,IC

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

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

@@ -351,12 +351,16 @@ public class DwhProdItemIC extends ValidatorEJB implements DwhProdItemICLocal,Dw
 				}
 				if (currentColumn.trim().equalsIgnoreCase("item_code")) {
 					itemCode = genericUtility.getColumnValue("item_code", dom);
-					sql = " select descr from item where item_code = ? ";
+					itemUnit = genericUtility.getColumnValue("item_unit", dom);
+					sql = " select descr,unit,item_parnt from item where item_code = ? ";
 					pStmt = conn.prepareStatement(sql);
 					pStmt.setString(1, itemCode);
+					//pStmt.setString(1, itemUnit);
 					rs = pStmt.executeQuery();
 					if (rs.next()) {
 						itemdescr = (rs.getString("descr"));
+						itemUnitDesc= (rs.getString("unit"));
+						item_parntDesc = (rs.getString("item_parnt"));
 					}
 					System.out.println("Site Description" + itemdescr);
 					rs.close();
@@ -365,6 +369,19 @@ public class DwhProdItemIC extends ValidatorEJB implements DwhProdItemICLocal,Dw
 					pStmt = null;
 					itemdescr = (itemdescr == null) ? "" : itemdescr.trim();
 					valueXmlString.append("<descr >").append("<![CDATA[" + itemdescr + "]]>").append("</descr>");
+					itemUnitDesc = (itemUnitDesc == null) ? "" : itemUnitDesc.trim();
+					valueXmlString.append("<unit_1 >").append("<![CDATA[" + itemUnitDesc + "]]>").append("</unit_1>");
+					valueXmlString.append("<item_unit >").append("<![CDATA[" + itemUnitDesc + "]]>").append("</item_unit>");
+					item_parntDesc = (item_parntDesc == null) ? "" : item_parntDesc.trim();
+					valueXmlString.append("<item_parent >").append("<![CDATA[" + item_parntDesc + "]]>").append("</item_parent>");
+					item_parntDesc = (item_parntDesc == null) ? "" : item_parntDesc.trim();
+					valueXmlString.append("<item_parnt >").append("<![CDATA[" + item_parntDesc + "]]>").append("</item_parnt>");
+					item_parntDesc = (item_parntDesc == null) ? "" : item_parntDesc.trim();
+					valueXmlString.append("<item_family_unit >").append("<![CDATA[" + itemUnitDesc + "]]>").append("</item_family_unit>");
+					item_parntDesc = (item_parntDesc == null) ? "" : item_parntDesc.trim();
+					valueXmlString.append("<item_parent_unit >").append("<![CDATA[" + itemUnitDesc + "]]>").append("</item_parent_unit>");
+			
+					
 				}else if(currentColumn.trim().equalsIgnoreCase("item_unit")){
 
 

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

@@ -424,7 +424,7 @@ public class DwhProdPlanIC extends ValidatorEJB implements DwhProdPlanICLocal,Dw
 		String itemGrade = "", gradeDescr="";
 		
 		 String acctPrd="";
-		String acctPrdDescr="";
+		String acctPrdDescr="",itemUnitDesc="";
 		String itemDescr="";
 		
 		String sitedescr="";
@@ -502,12 +502,13 @@ public class DwhProdPlanIC extends ValidatorEJB implements DwhProdPlanICLocal,Dw
 				else if(currentColumn.trim().equalsIgnoreCase("item_code")) {
 				 itemCode = genericUtility.getColumnValue("item_code", dom);
 
-					sql = " SELECT descr FROM item WHERE item_code= ? ";
+					sql = " SELECT descr,unit FROM item WHERE item_code= ? ";
 					pStmt = conn.prepareStatement(sql);
 					pStmt.setString(1, itemCode);
 					rs = pStmt.executeQuery();
 					if (rs.next()) {
 						itemDescr = rs.getString("descr") == null ? "" : rs.getString("descr");
+						itemUnitDesc= rs.getString("unit")==null ? "" :rs.getString("unit");
 					}
 
 					rs.close();
@@ -517,7 +518,12 @@ public class DwhProdPlanIC extends ValidatorEJB implements DwhProdPlanICLocal,Dw
 					itemDescr = (itemDescr == null) ? "" : itemDescr.trim();
 					System.out.println("item description" + itemDescr);
 					valueXmlString.append("<item_descr>").append(itemDescr).append("</item_descr>\r\n");
-
+					//unit
+					itemUnitDesc = (itemUnitDesc == null) ? "" : itemUnitDesc.trim();
+					System.out.println("item description" + itemUnitDesc);
+					valueXmlString.append("<unit>").append(itemUnitDesc).append("</unit>\r\n");
+				
+					
 				}			
 				else if(currentColumn.trim().equalsIgnoreCase("grade")) {
 				itemGrade = genericUtility.getColumnValue("grade", dom);