Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
===================================================================
diff -u -r27520 -r28816
--- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 27520)
+++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 28816)
@@ -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="tousseWorkLoad" language="groovy" pageWidth="1230" pageHeight="800" columnWidth="1230" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
+<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="tousseWorkLoad" language="groovy" pageWidth="1310" pageHeight="800" columnWidth="1310" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
 	<property name="ireport.zoom" value="0.6830134553650712"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -59,17 +59,18 @@
 	<variable name="total10" class="java.lang.Integer" calculation="Sum"/>
 	<variable name="total11" class="java.lang.Integer" calculation="Sum"/>
 	<variable name="total12" class="java.lang.Integer" calculation="Sum"/>
+	<variable name="total13" class="java.lang.Integer" calculation="Sum"/>
 	<title>
 		<band height="40" splitType="Stretch">
 			<textField>
-				<reportElement uuid="82fb5e35-5276-4016-b991-a27f889fc151" x="1070" y="20" width="160" height="20"/>
+				<reportElement uuid="82fb5e35-5276-4016-b991-a27f889fc151" x="1150" y="20" width="160" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{remark}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="1230" height="40"/>
+				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="1310" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -80,7 +81,7 @@
 	<columnHeader>
 		<band height="40" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="1070" y="0" width="80" height="40"/>
+				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="1070" y="0" width="160" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -129,7 +130,7 @@
 				<text><![CDATA[申请数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1150" y="0" width="80" height="40"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1230" y="0" width="80" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -206,12 +207,26 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$P{materialColumnName}]]></textFieldExpression>
 			</textField>
+			<staticText>
+				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="1070" y="20" width="80" height="20"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<text><![CDATA[器械包数]]></text>
+			</staticText>
+			<textField>
+				<reportElement uuid="65b15b19-1a27-46d3-8d59-dba992f950af" style="table_TH" mode="Opaque" x="1150" y="20" width="80" height="20" backcolor="#F0F8FF"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="14" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{materialColumnName}]]></textFieldExpression>
+			</textField>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="40" splitType="Stretch">
 			<subreport>
-				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" x="90" y="0" width="1140" height="40"/>
+				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" x="90" y="0" width="1220" height="40"/>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{childrens})]]></dataSourceExpression>
 				<returnValue subreportVariable="applicationAmountCount" toVariable="total1" calculation="Sum"/>
 				<returnValue subreportVariable="recycleAmountCount" toVariable="total2" calculation="Sum"/>
@@ -226,6 +241,7 @@
 				<returnValue subreportVariable="inventoryAmountCount" toVariable="total10" calculation="Sum"/>
 				<returnValue subreportVariable="packingMaterialAmountCount" toVariable="total11" calculation="Sum"/>
 				<returnValue subreportVariable="inventoryMaterialAmountCount" toVariable="total12" calculation="Sum"/>
+				<returnValue subreportVariable="invoiceMaterialAmountCount" toVariable="total13" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tousseWorkLoad_child.jasper"]]></subreportExpression>
 			</subreport>
 			<textField>
@@ -390,7 +406,7 @@
 				<textFieldExpression><![CDATA[$V{total11}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="04dacf11-4a2d-4c44-ba94-25e320a8ccec" mode="Opaque" x="1150" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="04dacf11-4a2d-4c44-ba94-25e320a8ccec" mode="Opaque" x="1230" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -448,6 +464,21 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{total12}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="02cdd91d-dc60-44f1-aa4b-345a42d723b8" mode="Opaque" x="1150" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<box>
+					<pen lineWidth="1.0"/>
+					<topPen lineWidth="1.0"/>
+					<leftPen lineWidth="1.0"/>
+					<bottomPen lineWidth="1.0"/>
+					<rightPen lineWidth="1.0"/>
+				</box>
+				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
+					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
+					<paragraph lineSpacing="Single"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{total13}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>