changes regarding bug fixing for wavegen,unit add in report and sql size inrcese of pack size

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

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

@@ -52,6 +52,7 @@ public class InventoryDispInfoDB implements InventoryDispInfoDBRemote,InventoryD
 				String locationCode="";
 				String itemDescr="";
 				String condWhere="";
+				String unit="";
 				double noArt=0.0;
 				double packWT=0.0;
 				
@@ -78,7 +79,7 @@ public class InventoryDispInfoDB implements InventoryDispInfoDBRemote,InventoryD
 				
 				System.out.println("condWhere$$$$$$$$$$$$$$$$$ "+condWhere);
 				query = "SELECT STOCK.LOC_CODE,STOCK.LOT_NO,nvl(QUANTITY,0) as QUANTITY,nvl(ALLOC_QTY,0) as ALLOC_QTY ,nvl(HOLD_QTY,0) as HOLD_QTY,"
-					   +" (nvl(QUANTITY,0)-nvl(ALLOC_QTY,0))as AVAIL_QTY,nvl(NO_ART,0) as NO_ART,STOCK.ITEM_CODE,STOCK.LOT_SL,ITEM.DESCR "
+					   +" (nvl(QUANTITY,0)-nvl(ALLOC_QTY,0))as AVAIL_QTY,nvl(NO_ART,0) as NO_ART,STOCK.ITEM_CODE,STOCK.LOT_SL,ITEM.DESCR,ITEM.UNIT "
 	            	   +" FROM STOCK,ITEM WHERE STOCK.ITEM_CODE=ITEM.ITEM_CODE AND QUANTITY>0 AND STOCK.SITE_CODE= ? "+condWhere+"  ORDER BY LOC_CODE,ITEM_CODE,LOT_NO,LOT_SL ";//PENDING......FROM JOINS 
 				
 			/*pstmt = conn.prepareStatement(query);
@@ -101,9 +102,9 @@ public class InventoryDispInfoDB implements InventoryDispInfoDBRemote,InventoryD
 				availQuantity=rs.getString("AVAIL_QTY");
 				allocQuantity=rs.getString("ALLOC_QTY");
 				locationCode=rs.getString("LOC_CODE");
-				LotSl=rs.getString("LOT_SL");
+				LotSl= rs.getString("LOT_SL");
 				noArt=Double.parseDouble(rs.getString("NO_ART"));
-				
+				unit = rs.getString("UNIT");
 				itemDescr=rs.getString("DESCR");
 				System.out.println(" 55555555555555555555 "+quantity);
 				HashMap itemVolMap = getItemVoumeMap(itemCode, LotNo, conn);
@@ -138,6 +139,7 @@ public class InventoryDispInfoDB implements InventoryDispInfoDBRemote,InventoryD
 				valueXmlString.append("<hold_qty><![CDATA[").append(holdQty).append("]]></hold_qty>\r\n");
 				valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
 				valueXmlString.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>\r\n");
+				valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
 				
 				valueXmlString.append("</Detail1>\r\n");
 			}

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

@@ -19192,8 +19192,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		
 		try
 		{
-			
-			sql = "SELECT MAX(LINE_NO) AS MAX FROM SORDITEM WHERE SALE_ORDER = ? " ;
+			//Changed by Pragyan to check 29/11/14 To proper checking sorder count
+			//sql = "SELECT MAX(LINE_NO) AS MAX FROM SORDITEM WHERE SALE_ORDER = ? " ;
+			sql = "SELECT COUNT(LINE_NO) AS MAX FROM SORDITEM WHERE SALE_ORDER = ? " ;
 			pstmt = conn.prepareStatement(sql);
 			
 			sqlSorAlloc = "SELECT QUANTITY FROM SORD_ALLOC_DET WHERE SALE_ORDER = ? AND LINE_NO__SORD = ? ";

webitm-wms/module-resource/sql/update.sql

@@ -50073,7 +50073,8 @@ VALUES ('VTINVPOLIN', 'Invalid PO Line NO!',  'PO Line NO is not valid.',   'E',
 --- Validation form In PO amendment  line_no__ord '0' (zero) should not be allowed VALLABH KADAM 20-NOV-14 END---
 
 
-
+---alter size increse of pack size sun usa requirement
+alter table asn_det modify pack_size number(14,3);
 
   
 

webitm-wms/module-resource/web/jsp/InventoryDetailsInfo.jsp

@@ -81,7 +81,7 @@ try
 			String childNodeName = "";
 			String locationCode="";
 			String item="";
-			int tdCount=5;
+			int tdCount=6;
 			boolean scanbyLotSl = true;//false;
 			boolean locFlg=true;
 			boolean lotFlg=true;
@@ -163,6 +163,7 @@ try
 		    	     	<TD Title="Allocation Quantity" >Alloc Qty</TD>
 		    	     	<TD Title="Available Quantity">Bal Qty</TD>
 		    	     	<TD Title="Pallet Weight">Pallet Wt</TD>
+		    	     	<TD Title="Unit">Unit</TD>
 		    	     </TR>
 		    	     <%}%>
 	    	     	<%-- <%}else{%>
@@ -295,6 +296,12 @@ try
 										System.out.println(" From Xml itemDescr is===>"+itemDescr);
 									    
 									}
+									else if (subchildNodeName.trim().equals("unit")) // gross_wt
+									{
+										String unit = subChildNode.getFirstChild().getNodeValue();
+										System.out.println(" From Xml unit is===>"+unit);
+										 %> <TD  align="left"><%=unit%> </TD><% 
+									}
 									
 							    }//My Codi close
 							}//TD FOR Close