Index: ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml
===================================================================
diff -u -r13212 -r13295
--- ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml	(.../stocktakeSummaryReport.jrxml)	(revision 13212)
+++ ssts-web/src/main/webapp/jasperRtp/stocktakeSummaryReport.jrxml	(.../stocktakeSummaryReport.jrxml)	(revision 13295)
@@ -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="260" 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="635" pageHeight="660" columnWidth="635" 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"/>
+	<property name="ireport.y" value="213"/>
 	<style name="table">
 		<box>
 			<pen lineWidth="1.0" lineColor="#000000"/>
@@ -31,51 +31,108 @@
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
-	<field name="inStoragePrice" class="java.lang.Double">
-		<fieldDescription><![CDATA[inStoragePrice]]></fieldDescription>
+	<field name="buyInStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[buyInStorageAmount]]></fieldDescription>
 	</field>
+	<field name="buyInStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[buyInStoragePrice]]></fieldDescription>
+	</field>
+	<field name="class" class="java.lang.Class">
+		<fieldDescription><![CDATA[class]]></fieldDescription>
+	</field>
+	<field name="departmentReturnStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[departmentReturnStorageAmount]]></fieldDescription>
+	</field>
+	<field name="departmentReturnStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[departmentReturnStoragePrice]]></fieldDescription>
+	</field>
 	<field name="endStockAmount" class="java.lang.Long">
 		<fieldDescription><![CDATA[endStockAmount]]></fieldDescription>
 	</field>
+	<field name="endStockPrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[endStockPrice]]></fieldDescription>
+	</field>
+	<field name="externalCode" class="java.lang.String">
+		<fieldDescription><![CDATA[externalCode]]></fieldDescription>
+	</field>
 	<field name="inAutoStorageAmount" class="java.lang.Long">
 		<fieldDescription><![CDATA[inAutoStorageAmount]]></fieldDescription>
 	</field>
+	<field name="inAutoStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[inAutoStoragePrice]]></fieldDescription>
+	</field>
 	<field name="inStorageAmount" class="java.lang.Long">
 		<fieldDescription><![CDATA[inStorageAmount]]></fieldDescription>
 	</field>
-	<field name="endStockPrice" class="java.lang.Double">
-		<fieldDescription><![CDATA[endStockPrice]]></fieldDescription>
+	<field name="inStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[inStoragePrice]]></fieldDescription>
 	</field>
-	<field name="outStorageAmount" class="java.lang.Long">
-		<fieldDescription><![CDATA[outStorageAmount]]></fieldDescription>
+	<field name="moveInStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[moveInStorageAmount]]></fieldDescription>
 	</field>
-	<field name="externalCode" class="java.lang.String">
-		<fieldDescription><![CDATA[externalCode]]></fieldDescription>
+	<field name="moveInStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[moveInStoragePrice]]></fieldDescription>
 	</field>
-	<field name="type" class="java.lang.String">
-		<fieldDescription><![CDATA[type]]></fieldDescription>
+	<field name="moveOutStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[moveOutStorageAmount]]></fieldDescription>
 	</field>
-	<field name="startStockPrice" class="java.lang.Double">
-		<fieldDescription><![CDATA[startStockPrice]]></fieldDescription>
+	<field name="moveOutStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[moveOutStoragePrice]]></fieldDescription>
 	</field>
+	<field name="name" class="java.lang.String">
+		<fieldDescription><![CDATA[name]]></fieldDescription>
+	</field>
+	<field name="outStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[outStorageAmount]]></fieldDescription>
+	</field>
 	<field name="outStoragePrice" class="java.lang.Double">
 		<fieldDescription><![CDATA[outStoragePrice]]></fieldDescription>
 	</field>
-	<field name="startStockAmount" class="java.lang.Long">
-		<fieldDescription><![CDATA[startStockAmount]]></fieldDescription>
+	<field name="receiveRecordStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[receiveRecordStorageAmount]]></fieldDescription>
 	</field>
-	<field name="inAutoStoragePrice" class="java.lang.Double">
-		<fieldDescription><![CDATA[inAutoStoragePrice]]></fieldDescription>
+	<field name="receiveRecordStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[receiveRecordStoragePrice]]></fieldDescription>
 	</field>
-	<field name="unit" class="java.lang.String">
-		<fieldDescription><![CDATA[unit]]></fieldDescription>
+	<field name="returnBackToSupplierStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[returnBackToSupplierStorageAmount]]></fieldDescription>
 	</field>
+	<field name="returnBackToSupplierStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[returnBackToSupplierStoragePrice]]></fieldDescription>
+	</field>
+	<field name="sendOutStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[sendOutStorageAmount]]></fieldDescription>
+	</field>
+	<field name="sendOutStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[sendOutStoragePrice]]></fieldDescription>
+	</field>
 	<field name="specification" class="java.lang.String">
 		<fieldDescription><![CDATA[specification]]></fieldDescription>
 	</field>
-	<field name="name" class="java.lang.String">
-		<fieldDescription><![CDATA[name]]></fieldDescription>
+	<field name="startStockAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[startStockAmount]]></fieldDescription>
 	</field>
+	<field name="startStockPrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[startStockPrice]]></fieldDescription>
+	</field>
+	<field name="stockTakeInStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[stockTakeInStorageAmount]]></fieldDescription>
+	</field>
+	<field name="stockTakeInStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[stockTakeInStoragePrice]]></fieldDescription>
+	</field>
+	<field name="stockTakeOutStorageAmount" class="java.lang.Long">
+		<fieldDescription><![CDATA[stockTakeOutStorageAmount]]></fieldDescription>
+	</field>
+	<field name="stockTakeOutStoragePrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[stockTakeOutStoragePrice]]></fieldDescription>
+	</field>
+	<field name="type" class="java.lang.String">
+		<fieldDescription><![CDATA[type]]></fieldDescription>
+	</field>
+	<field name="unit" class="java.lang.String">
+		<fieldDescription><![CDATA[unit]]></fieldDescription>
+	</field>
 	<variable name="tAmount1" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{startStockAmount}]]></variableExpression>
 	</variable>
@@ -136,7 +193,7 @@
 		</band>
 	</title>
 	<detail>
-		<band height="181">
+		<band height="494">
 			<textField pattern="###0.0000;-###0.0000">
 				<reportElement uuid="70a4b028-8172-4e0c-bfdd-fcaf116ecf0f" style="table_TD" x="303" y="37" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
@@ -152,42 +209,42 @@
 				<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="3" 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="107" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="3" 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="142" width="300" height="35" backcolor="#FFFFFF"/>
+				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="3" 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="72" width="330" height="35"/>
+				<reportElement uuid="aca8e4fb-ea84-4191-80a5-1fd8bf152d73" style="table_TD" x="303" 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="107" width="330" height="35"/>
+				<reportElement uuid="f7f5600a-e394-43cb-b267-1fed0d1490e7" style="table_TD" x="303" 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="142" width="330" height="35"/>
+				<reportElement uuid="8975351d-6b9a-4f22-85b8-75f99f3a0770" style="table_TD" x="303" y="457" width="330" height="35"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -207,10 +264,136 @@
 				</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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<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"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{departmentReturnStoragePrice}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<pageFooter>
-		<band height="28">
+		<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">