Index: ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
===================================================================
diff -u -r13297 -r28075
--- ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml	(.../stocktakeSummaryReport.jrxml)	(revision 13297)
+++ ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml	(.../stocktakeSummaryReport.jrxml)	(revision 28075)
@@ -1,8 +1,8 @@
 <?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="635" pageHeight="660" columnWidth="635" 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="660" 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="177"/>
+	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -163,228 +163,221 @@
 	<title>
 		<band height="51" splitType="Stretch">
 			<textField>
-				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="3" y="0" width="630" height="29"/>
+				<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="221" y="30" width="412" height="20"/>
-				<textElement textAlignment="Left" verticalAlignment="Middle">
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="300" y="29" width="330" height="20"/>
+				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{dateTime}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="60" y="30" width="161" height="20"/>
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="29" width="300" height="20"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{warehouse}]]></textFieldExpression>
 			</textField>
-			<staticText>
-				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" x="9" y="30" 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="494">
+		<band height="492">
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="303" y="37" width="330" height="35"/>
+				<reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="300" y="37" width="330" height="35"/>
 				<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="303" y="2" width="330" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="300" y="2" width="330" height="35" backcolor="#FFFFFF"/>
 				<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="3" y="212" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="212" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[本期入库]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="3" y="422" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="0" y="422" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[本期出库]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="3" y="457" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="0" y="457" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[期末余额]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="212" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="212" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{inStoragePrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="303" y="422" width="330" height="35"/>
+				<reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="300" y="422" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{outStoragePrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="303" y="457" width="330" height="35"/>
+				<reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="300" y="457" width="330" height="35"/>
 				<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="3" y="2" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="0" y="2" width="300" height="35" backcolor="#FFFFFF"/>
 				<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="3" y="37" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="37" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[期初余额]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="72" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="72" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                购入入库]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="72" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="72" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{buyInStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="107" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="107" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[               调拨入库]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="107" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="107" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{moveInStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="142" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="142" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                盘盈入库]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="142" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="142" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockTakeInStoragePrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="177" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="177" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{returnBackToSupplierStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="177" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="177" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                  退到供应商]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="247" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="247" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{sendOutStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="247" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="247" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                科室发货]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="282" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="282" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                   供应室领用]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="282" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="282" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{receiveRecordStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="317" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="317" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                调拨出库]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="317" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="317" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{moveOutStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="352" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="352" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                盘亏出库]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="352" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="352" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{stockTakeOutStoragePrice}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="3" y="387" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="0" y="387" width="300" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>
 				<text><![CDATA[                科室退货]]></text>
 			</staticText>
 			<textField pattern="###0.0000;-###0.0000">
-				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" y="387" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="300" y="387" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -393,16 +386,9 @@
 		</band>
 	</detail>
 	<pageFooter>
-		<band height="27">
-			<staticText>
-				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" x="9" y="3" width="70" height="20" backcolor="#FFFFFF"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="false"/>
-				</textElement>
-				<text><![CDATA[材料类别:]]></text>
-			</staticText>
+		<band height="20">
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="89" y="3" width="191" height="20"/>
+				<reportElement uuid="689fc869-a193-40c9-a4d0-a20389948eaf" x="0" y="0" width="300" height="20"/>
 				<textElement textAlignment="Left" verticalAlignment="Middle">
 					<font size="14" isBold="false"/>
 				</textElement>