Index: ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml
===================================================================
diff -u -r29890 -r30220
--- ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml	(.../invoiceSummaryQuery_mainAddSupplierName.jrxml)	(revision 29890)
+++ ssts-web/src/main/webapp/jasperRtp/invoiceSummaryQuery_mainAddSupplierName.jrxml	(.../invoiceSummaryQuery_mainAddSupplierName.jrxml)	(revision 30220)
@@ -1,7 +1,7 @@
 <?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="monthDetail_main_1" language="groovy" pageWidth="941" pageHeight="792" whenNoDataType="AllSectionsNoDetail" columnWidth="941" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
+<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="monthDetail_main_1" language="groovy" pageWidth="1260" pageHeight="792" whenNoDataType="AllSectionsNoDetail" columnWidth="1260" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="a74ded60-fc3f-4435-8389-01e79da74444">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="290"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -42,27 +42,42 @@
 	<field name="serialNum" class="java.lang.Integer">
 		<fieldDescription><![CDATA[serialNum]]></fieldDescription>
 	</field>
+	<field name="invoicePlanDepart" class="java.lang.String">
+		<fieldDescription><![CDATA[invoicePlanDepart]]></fieldDescription>
+	</field>
+	<field name="totalPrice" class="java.lang.Double">
+		<fieldDescription><![CDATA[totalPrice]]></fieldDescription>
+	</field>
+	<field name="amount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[amount]]></fieldDescription>
+	</field>
+	<variable name="sum_amount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
+	</variable>
+	<variable name="sum_totalPrice" class="java.lang.Double" calculation="Sum">
+		<variableExpression><![CDATA[$F{totalPrice}]]></variableExpression>
+	</variable>
 	<background>
 		<band splitType="Stretch"/>
 	</background>
 	<columnHeader>
 		<band height="72" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="226" y="41" width="201" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="326" y="41" width="201" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="721" y="41" width="94" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="821" y="41" width="94" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="815" y="41" width="126" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="914" y="41" width="126" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
@@ -73,42 +88,63 @@
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
-				<text><![CDATA[科室]]></text>
+				<text><![CDATA[申请科室]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ce90b97b-e553-4841-bccb-f3abc32699df" style="table_TH" x="628" y="41" width="93" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="ce90b97b-e553-4841-bccb-f3abc32699df" style="table_TH" x="728" y="41" width="93" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[单价]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6d040844-4c27-4006-975e-a547302162d0" x="0" y="0" width="941" height="41"/>
+				<reportElement uuid="6d040844-4c27-4006-975e-a547302162d0" x="0" y="0" width="1260" height="41"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="16" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货物品查询]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="100" y="41" width="126" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="200" y="41" width="126" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[外部编码]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="427" y="41" width="201" height="31" backcolor="#FFFFFF"/>
+				<reportElement uuid="563b3f2d-e25e-4a27-a83f-d3187a316c1f" style="table_TH" x="527" y="41" width="201" height="31" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
 				</textElement>
 				<text><![CDATA[供应商]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="54809a7e-610e-4341-9da0-ae69f240c5a4" style="table_TH" x="100" y="41" width="100" height="31" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[结算科室]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="d0b4b5ac-b126-45cf-89ad-7947a39777bb" style="table_TH" x="1040" y="41" width="94" height="31" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[数量小计]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="83b84446-4890-495f-a5bb-d69dab60f5fc" style="table_TH" x="1134" y="41" width="126" height="31" backcolor="#FFFFFF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="14" isBold="true" isItalic="false"/>
+				</textElement>
+				<text><![CDATA[金额小计]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="35" splitType="Stretch">
 			<subreport>
-				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="100" y="0" width="841" height="35" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f3f70d46-40b3-4fc6-bf7e-79e0c5516136" x="200" y="0" width="840" height="35" isPrintWhenDetailOverflows="true"/>
 				<subreportParameter name="amountFormat">
 					<subreportParameterExpression><![CDATA[$P{amountFormat}]]></subreportParameterExpression>
 				</subreportParameter>
@@ -122,6 +158,28 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e593844b-3744-4d15-b686-9bd4a09dd9a4" style="table_TD" stretchType="RelativeToBandHeight" x="1040" y="0" width="94" height="35" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e593844b-3744-4d15-b686-9bd4a09dd9a4" style="table_TD" stretchType="RelativeToBandHeight" x="1134" y="0" width="126" height="35" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{totalPrice}]]></textFieldExpression>
+				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="e593844b-3744-4d15-b686-9bd4a09dd9a4" style="table_TD" stretchType="RelativeToBandHeight" x="100" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<columnFooter>
@@ -130,19 +188,66 @@
 	<pageFooter>
 		<band height="20" splitType="Stretch">
 			<textField>
-				<reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="721" y="0" width="94" height="20"/>
+				<reportElement uuid="156af036-3af3-4aa5-895a-6fe6c83dc9e4" x="1040" y="0" width="94" height="20"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["第"+$V{PAGE_NUMBER}+"页"]]></textFieldExpression>
 			</textField>
 			<textField evaluationTime="Report">
-				<reportElement uuid="d06f5aae-be69-49e1-b31d-cc92cb7b3cc1" x="815" y="0" width="126" height="20"/>
+				<reportElement uuid="d06f5aae-be69-49e1-b31d-cc92cb7b3cc1" x="1134" y="0" width="126" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA["共"+$V{PAGE_NUMBER}+"页"]]></textFieldExpression>
 			</textField>
 		</band>
 	</pageFooter>
+	<summary>
+		<band height="50">
+			<staticText>
+				<reportElement uuid="7a786ee4-46e9-415b-b2c9-3ad2a91eb83a" x="0" y="0" width="100" height="20"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[合计]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="7a786ee4-46e9-415b-b2c9-3ad2a91eb83a" x="100" y="0" width="940" height="20"/>
+				<box>
+					<pen lineWidth="0.5"/>
+					<topPen lineWidth="0.5"/>
+					<leftPen lineWidth="0.5"/>
+					<bottomPen lineWidth="0.5"/>
+					<rightPen lineWidth="0.5"/>
+				</box>
+				<textElement textAlignment="Center">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[]]></text>
+			</staticText>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e593844b-3744-4d15-b686-9bd4a09dd9a4" style="table_TD" stretchType="RelativeToBandHeight" x="1040" y="0" width="94" height="20" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression>
+			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="e593844b-3744-4d15-b686-9bd4a09dd9a4" style="table_TD" stretchType="RelativeToBandHeight" x="1134" y="0" width="126" height="20" isPrintWhenDetailOverflows="true"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="false"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sum_totalPrice}]]></textFieldExpression>
+				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
+			</textField>
+		</band>
+	</summary>
 </jasperReport>