Order by was missing on last merging again merge the old one.

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

webitm-wms/module-resource/jrxml/window jrxml/wave_task_det_1.jrxml

@@ -9,17 +9,18 @@
 		<defaultValueExpression><![CDATA["E:\\manohar\\reports\\"]]></defaultValueExpression>
 	</parameter>
 	<queryString>
-		<![CDATA[SELECT WAVE_TASK_DET.WAVE_ID,
-                 FN_WAVE_DESCRIPTION(REFSER.REF_SER,WAVE_TASK_DET.REF_ID,WAVE_TASK_DET.PTCN) DESCR,
+		<![CDATA[SELECT WAVE_TASK_DET.WAVE_ID,REFSER.DESCR,
 (CASE  WHEN WAVE_TASK_DET.wave_status ='C' THEN 'Created' when WAVE_TASK_DET.wave_status ='W' then 'Held'
        when  WAVE_TASK_DET.wave_status ='V' then 'Verified' ELSE NULL END) WAVESTATUS,WAVE_SEQ.PRIORITY,COUNT(*) CNT
 FROM   WAVE_TASK_DET,REFSER, WAVE_SEQ
 WHERE  WAVE_TASK_DET.REF_SER= REFSER.REF_SER
 AND    WAVE_ID =$P{P_wave_id}
 AND    WAVE_TASK_DET.REF_SER = WAVE_SEQ.REF_SER
-GROUP BY WAVE_TASK_DET.WAVE_ID, FN_WAVE_DESCRIPTION(REFSER.REF_SER,WAVE_TASK_DET.REF_ID,WAVE_TASK_DET.PTCN),
-(CASE  WHEN WAVE_TASK_DET.wave_status ='C' THEN 'Created' when WAVE_TASK_DET.wave_status ='W' then 'Held'
-       when  WAVE_TASK_DET.wave_status ='V' then 'Verified' ELSE NULL END), WAVE_SEQ.PRIORITY]]>
+GROUP BY REFSER.DESCR,
+         WAVE_TASK_DET.WAVE_ID,
+(CASE WHEN WAVE_TASK_DET.wave_status ='C' THEN 'Created' when WAVE_TASK_DET.wave_status ='W' then 'Held'
+        when  WAVE_TASK_DET.wave_status ='V' then 'Verified' ELSE NULL END) ,WAVE_SEQ.PRIORITY
+order by WAVE_SEQ.PRIORITY,REFSER.DESCR,WAVESTATUS,CNT]]>
 	</queryString>
 	<field name="WAVE_ID" class="java.lang.String"/>
 	<field name="DESCR" class="java.lang.String"/>
@@ -103,14 +104,14 @@ GROUP BY WAVE_TASK_DET.WAVE_ID, FN_WAVE_DESCRIPTION(REFSER.REF_SER,WAVE_TASK_DET
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{WAVE_ID}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{WAVE_ID}]]></textFieldExpression>
 			</textField>
-			<textField isBlankWhenNull="true">
+			<textField>
 				<reportElement positionType="Float" stretchType="RelativeToBandHeight" x="68" y="0" width="162" height="20"/>
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{DESCR}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{DESCR}]]></textFieldExpression>
 			</textField>
 			<line>
 				<reportElement x="2" y="19" width="362" height="1"/>
@@ -135,7 +136,7 @@ GROUP BY WAVE_TASK_DET.WAVE_ID, FN_WAVE_DESCRIPTION(REFSER.REF_SER,WAVE_TASK_DET
 				<textElement>
 					<font size="8"/>
 				</textElement>
-				<textFieldExpression class="java.lang.String"><![CDATA[$F{WAVESTATUS}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$F{WAVESTATUS}]]></textFieldExpression>
 			</textField>
 			<line>
 				<reportElement x="304" y="-1" width="1" height="20"/>