Index: ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jrxml
===================================================================
diff -u -r13217 -r27617
--- ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jrxml	(.../godownEntrySummary.jrxml)	(revision 13217)
+++ ssts-web/src/main/webapp/jasperRtp/godownEntrySummary.jrxml	(.../godownEntrySummary.jrxml)	(revision 27617)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="godownReport" language="groovy" pageWidth="760" pageHeight="820" orientation="Landscape" columnWidth="760" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9a09e844-d6fd-4d34-825d-915c3d2f9f6c">
+<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="godownReport" language="groovy" pageWidth="757" pageHeight="820" orientation="Landscape" columnWidth="757" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="9a09e844-d6fd-4d34-825d-915c3d2f9f6c">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -98,7 +98,7 @@
 	<title>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="3cca729e-1d55-4498-bc2a-c0ba95c23873" x="3" y="0" width="757" height="30"/>
+				<reportElement uuid="3cca729e-1d55-4498-bc2a-c0ba95c23873" x="0" y="0" width="757" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -109,19 +109,12 @@
 	<pageHeader>
 		<band height="21">
 			<textField>
-				<reportElement uuid="ca288d7a-43ff-4bd2-a465-2fca7df2f57d" x="441" y="0" width="319" height="21"/>
+				<reportElement uuid="e63df478-caca-444e-946e-0f568974b567" x="0" y="0" width="757" height="21"/>
 				<textElement verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA["制表单位: " + $P{orgUnit}]]></textFieldExpression>
+				<textFieldExpression><![CDATA["统计时间: " + $P{timeStart}.substring( 0, 10 ) + " 到 " + $P{timeEnd}.substring( 0, 10 )+"                                                                    制表单位: " + $P{orgUnit}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="e63df478-caca-444e-946e-0f568974b567" x="0" y="0" width="398" height="21"/>
-				<textElement verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA["统计时间: " + $P{timeStart}.substring( 0, 10 ) + " 到 " + $P{timeEnd}.substring( 0, 10 )]]></textFieldExpression>
-			</textField>
 		</band>
 	</pageHeader>
 	<columnHeader>
@@ -191,23 +184,16 @@
 	<pageFooter>
 		<band height="36">
 			<textField>
-				<reportElement uuid="2f684393-5056-4066-9501-d4530cddd870" x="1" y="0" width="690" height="36"/>
+				<reportElement uuid="2f684393-5056-4066-9501-d4530cddd870" x="0" y="0" width="757" height="36"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
-				<textFieldExpression><![CDATA["第" + $V{PAGE_NUMBER} + "页"]]></textFieldExpression>
+				<textFieldExpression><![CDATA["第" + $V{PAGE_NUMBER} + "页"+"     共" + $V{PAGE_NUMBER} + "页"]]></textFieldExpression>
 			</textField>
-			<textField evaluationTime="Report">
-				<reportElement uuid="002faf66-81aa-4b34-8f23-3725255684fe" x="691" y="0" width="66" height="36"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
-				</textElement>
-				<textFieldExpression><![CDATA["共" + $V{PAGE_NUMBER} + "页"]]></textFieldExpression>
-			</textField>
 		</band>
 	</pageFooter>
 	<summary>
-		<band height="33" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<staticText>
 				<reportElement uuid="e2513c35-e2d2-4394-b84f-fc5c13ce4244" style="table_CH" mode="Opaque" x="0" y="0" width="495" height="30" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">