changes for hold qty and single shipment

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

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

@@ -1159,9 +1159,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							retTabSepStrBuff.append( "<hold_qty><![CDATA[" ).append("0.0").append( "]]></hold_qty>\r\n" );
 						}					
 						*/
-						sql = "SELECT SUM(HOLD_QTY) AS HOLD_QTY FROM STOCK WHERE ITEM_CODE = ?";
+						sql = "SELECT SUM(HOLD_QTY) AS HOLD_QTY FROM STOCK WHERE ITEM_CODE = ? AND SITE_CODE = ?";
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, itemCode);
+						pstmt1.setString(2, siteCode);
 						rs2 = pstmt1.executeQuery();
 						if(rs2.next())
 						{
@@ -17129,7 +17130,16 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sordInfoMap.put("STAN_CODE", stanCode);
 			sordInfoMap.put("SHIP_CODE", siteCodeShip);
 			sordInfoMap.put("STATE_DLV", stateCodeDlv);
+			
+			if(shipConsGrp != null && shipConsGrp.length() > 0 )
+			{
 				sordInfoMap.put("SHIP_CONS_GRP", shipConsGrp);
+			}
+			else
+			{
+				sordInfoMap.put("SHIP_CONS_GRP", custCode);
+			}
+		
 			
 			if( rs != null )
 			{