Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml
===================================================================
diff -u -r15178 -r16965
--- ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml	(.../tousseDeliverStatistics.jrxml)	(revision 15178)
+++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverStatistics.jrxml	(.../tousseDeliverStatistics.jrxml)	(revision 16965)
@@ -35,13 +35,11 @@
 		<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
 	</parameter>
 	<queryString>
-		<![CDATA[select * from
-(
-       select t.settleAccountsDepart as depart, count(*) as amount, i.tousseName as goodsName from TousseInstance i, Invoice t,invoiceplan p
-       where i.invoice_id = t.id and p.id = t.invoiceplan_id
-       $P!{querySql}
-       and (t.status = '已发货' or t.status = '收货签收')
-       group by t.settleAccountsDepart, i.tousseName
+		<![CDATA[select * from(
+	select i.settleAccountsDepart depart, count(*) amount, ti.tousseName goodsName
+	from TousseInstance ti
+	inner join  Invoice i on i.id=ti.invoice_id where 1=1 $P!{querySql}
+	group by i.settleAccountsDepart, ti.tousseName
 )tempTable $P!{filterSql}]]>
 	</queryString>
 	<field name="DEPART" class="java.lang.String"/>
@@ -123,7 +121,7 @@
 									<rightPen lineWidth="1.0"/>
 								</box>
 								<textElement textAlignment="Center" verticalAlignment="Middle">
-									<font size="12"/>
+									<font size="12" isBold="true"/>
 								</textElement>
 								<text><![CDATA[合计]]></text>
 							</staticText>
@@ -237,7 +235,7 @@
 								<rightPen lineWidth="1.0"/>
 							</box>
 							<textElement verticalAlignment="Middle">
-								<font size="12"/>
+								<font size="12" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{AMOUNTMeasure}]]></textFieldExpression>
 						</textField>
@@ -258,7 +256,7 @@
 								<rightPen lineWidth="1.0"/>
 							</box>
 							<textElement verticalAlignment="Middle">
-								<font size="12"/>
+								<font size="12" isBold="true"/>
 							</textElement>
 							<textFieldExpression><![CDATA[$V{AMOUNTMeasure}]]></textFieldExpression>
 						</textField>