Index: ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
===================================================================
diff -u -r13158 -r13160
--- ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml	(.../stocktakeSummaryReport.jrxml)	(revision 13158)
+++ ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml	(.../stocktakeSummaryReport.jrxml)	(revision 13160)
@@ -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="stocktakereport" language="groovy" pageWidth="1015" pageHeight="842" columnWidth="1015" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="a813b6db-4e55-4ef8-a8ce-e83c651d3cdf">
+<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="stocktakereport" language="groovy" pageWidth="630" pageHeight="842" columnWidth="630" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="a813b6db-4e55-4ef8-a8ce-e83c651d3cdf">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -25,6 +25,9 @@
 	</style>
 	<subDataset name="Table Dataset 1" uuid="1d60c27f-f266-4f38-a6ee-180bd14f7cc3"/>
 	<parameter name="title" class="java.lang.String"/>
+	<parameter name="dateTime" class="java.lang.String"/>
+	<parameter name="type" class="java.lang.String"/>
+	<parameter name="warehouse" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -101,88 +104,127 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="39" splitType="Stretch">
+		<band height="49" splitType="Stretch">
 			<textField>
-				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="1015" height="39"/>
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="630" height="29"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="16" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{title}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="218" y="29" width="412" height="20"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{dateTime}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="57" y="29" width="161" height="20"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{warehouse}]]></textFieldExpression>
+			</textField>
+			<staticText>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" x="6" y="29" width="40" height="20" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
+				<text><![CDATA[仓库:]]></text>
+			</staticText>
 		</band>
 	</title>
 	<detail>
-		<band height="127">
+		<band height="101">
 			<staticText>
-				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="362" y="31" width="150" height="20"/>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="0" y="21" width="300" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[期初库存]]></text>
 			</staticText>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="512" y="31" width="180" height="20"/>
+				<reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="300" y="21" width="330" height="19"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{startStockPrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="512" y="11" width="180" height="20"/>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="300" y="1" width="330" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[金额]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="362" y="51" width="150" height="20"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="40" width="300" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[本期入库]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="362" y="71" width="150" height="20"/>
+				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="0" y="60" width="300" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[本期出库]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="362" y="91" width="150" height="20"/>
+				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="0" y="80" width="300" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[期末余数]]></text>
 			</staticText>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="512" y="51" width="180" height="20"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="40" width="330" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{inStoragePrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="512" y="71" width="180" height="20"/>
+				<reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="300" y="60" width="330" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{outStoragePrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.00;-###0.00">
-				<reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="512" y="91" width="180" height="20"/>
+				<reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="300" y="80" width="330" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{endStockPrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="362" y="11" width="150" height="20"/>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="0" y="1" width="300" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[统计项]]></text>
 			</staticText>
 		</band>
 	</detail>
+	<pageFooter>
+		<band height="24">
+			<staticText>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" x="6" y="2" width="70" height="20" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="false"/>
+				</textElement>
+				<text><![CDATA[材料类别:]]></text>
+			</staticText>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="86" y="2" width="191" height="20"/>
+				<textElement textAlignment="Left" verticalAlignment="Middle">
+					<font size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{type}]]></textFieldExpression>
+			</textField>
+		</band>
+	</pageFooter>
 </jasperReport>