Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml
===================================================================
diff -u -r25493 -r27520
--- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 25493)
+++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml	(.../tousseWorkLoad.jrxml)	(revision 27520)
@@ -1,6 +1,6 @@
 <?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="1150" pageHeight="800" columnWidth="1150" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="5cc580bd-cd6f-4e34-8f78-a05ac8f31ce8">
-	<property name="ireport.zoom" value="0.7513148009015783"/>
+<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">
+	<property name="ireport.zoom" value="0.6830134553650712"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
@@ -18,6 +18,7 @@
 	<parameter name="remark" class="java.lang.String">
 		<parameterDescription><![CDATA[remark]]></parameterDescription>
 	</parameter>
+	<parameter name="materialColumnName" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -57,17 +58,18 @@
 	<variable name="total0" class="java.lang.Integer" calculation="Count"/>
 	<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"/>
 	<title>
 		<band height="40" splitType="Stretch">
 			<textField>
-				<reportElement uuid="82fb5e35-5276-4016-b991-a27f889fc151" x="990" y="20" width="160" height="20"/>
+				<reportElement uuid="82fb5e35-5276-4016-b991-a27f889fc151" x="1070" 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="1150" height="40"/>
+				<reportElement uuid="3ef5ef90-ca6c-42eb-855c-ff2336f47b62" x="0" y="0" width="1230" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -78,14 +80,14 @@
 	<columnHeader>
 		<band height="40" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="990" y="0" width="80" height="40"/>
+				<reportElement uuid="20a35ece-83c5-4c59-b660-3c40e8335230" style="table_TH" x="1070" y="0" width="80" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[发货数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="510" y="0" width="160" height="20"/>
+				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="590" y="0" width="160" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -106,31 +108,17 @@
 				<text><![CDATA[器械包名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="510" y="20" width="80" height="20"/>
+				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="590" y="20" width="80" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械包数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a1538a54-4305-4db7-a6db-20f3be3dd406" style="table_TH" mode="Opaque" x="590" y="20" width="80" height="20"/>
+				<reportElement uuid="6c562c6e-21bb-46dc-8f79-6e2c4c833e9d" style="table_TH" x="990" y="0" width="80" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械件数]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="430" y="0" width="80" height="40"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
-				<text><![CDATA[清点数量]]></text>
-			</staticText>
-			<staticText>
-				<reportElement uuid="6c562c6e-21bb-46dc-8f79-6e2c4c833e9d" style="table_TH" x="910" y="0" width="80" height="40"/>
-				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="14" isBold="true"/>
-				</textElement>
 				<text><![CDATA[灭菌数量]]></text>
 			</staticText>
 			<staticText>
@@ -141,14 +129,14 @@
 				<text><![CDATA[申请数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1070" y="0" width="80" height="40"/>
+				<reportElement uuid="ffbc55db-d060-4d8f-87d4-2a3efc4cf5ff" style="table_TH" x="1150" y="0" width="80" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[签收数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="830" y="0" width="80" height="40"/>
+				<reportElement uuid="fa4a9f27-80da-4353-a2d8-20bb59e59b96" style="table_TH" x="910" y="0" width="80" height="40"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -170,32 +158,60 @@
 				<text><![CDATA[器械包类型]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a1538a54-4305-4db7-a6db-20f3be3dd406" style="table_TH" mode="Opaque" x="750" y="20" width="80" height="20"/>
+				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="750" y="0" width="160" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械件数]]></text>
+				<text><![CDATA[装配数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="670" y="0" width="160" height="20"/>
+				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="750" y="20" width="80" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
-				<text><![CDATA[装配数量]]></text>
+				<text><![CDATA[器械包数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="670" y="20" width="80" height="20"/>
+				<reportElement uuid="082cfe7a-9c72-4a5b-958b-7d2fb64304f7" style="table_TH" x="430" y="0" width="160" height="20"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
+				<text><![CDATA[清点数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="c1ed7efb-9797-4b2e-9024-4103b8d2d3e0" style="table_TH" mode="Opaque" x="430" 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="510" 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>
+			<textField>
+				<reportElement uuid="65b15b19-1a27-46d3-8d59-dba992f950af" style="table_TH" mode="Opaque" x="670" 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>
+			<textField>
+				<reportElement uuid="65b15b19-1a27-46d3-8d59-dba992f950af" style="table_TH" mode="Opaque" x="830" 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="1060" height="40"/>
+				<reportElement uuid="9dd15949-fa7f-4d03-8dac-a567fa4583b4" x="90" y="0" width="1140" 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"/>
@@ -209,6 +225,7 @@
 				<returnValue subreportVariable="tousseNameCount" toVariable="total0" calculation="Sum"/>
 				<returnValue subreportVariable="inventoryAmountCount" toVariable="total10" calculation="Sum"/>
 				<returnValue subreportVariable="packingMaterialAmountCount" toVariable="total11" calculation="Sum"/>
+				<returnValue subreportVariable="inventoryMaterialAmountCount" toVariable="total12" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "tousseWorkLoad_child.jasper"]]></subreportExpression>
 			</subreport>
 			<textField>
@@ -268,7 +285,7 @@
 				<textFieldExpression><![CDATA[$V{total2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="278d45a8-fc86-4ceb-af8b-80d742642992" mode="Opaque" x="510" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="278d45a8-fc86-4ceb-af8b-80d742642992" mode="Opaque" x="590" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -283,7 +300,7 @@
 				<textFieldExpression><![CDATA[$V{total3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="0fe97816-bfbe-432e-8a78-2560fc65f4d6" mode="Opaque" x="590" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="0fe97816-bfbe-432e-8a78-2560fc65f4d6" mode="Opaque" x="670" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -298,7 +315,7 @@
 				<textFieldExpression><![CDATA[$V{total4}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d97d7e8e-60fd-421e-9e6f-4ad099ffd1ec" mode="Opaque" x="670" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="d97d7e8e-60fd-421e-9e6f-4ad099ffd1ec" mode="Opaque" x="750" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -313,7 +330,7 @@
 				<textFieldExpression><![CDATA[$V{tatal5}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b83daed1-e24f-49a7-a79f-0841e3c91f53" mode="Opaque" x="830" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="b83daed1-e24f-49a7-a79f-0841e3c91f53" mode="Opaque" x="910" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -328,7 +345,7 @@
 				<textFieldExpression><![CDATA[$V{total6}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8f5ba9f4-fe4d-40b4-9614-b0c1377a7f3a" mode="Opaque" x="910" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="8f5ba9f4-fe4d-40b4-9614-b0c1377a7f3a" mode="Opaque" x="990" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -343,7 +360,7 @@
 				<textFieldExpression><![CDATA[$V{total7}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="02cdd91d-dc60-44f1-aa4b-345a42d723b8" mode="Opaque" x="990" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="02cdd91d-dc60-44f1-aa4b-345a42d723b8" mode="Opaque" x="1070" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -358,7 +375,7 @@
 				<textFieldExpression><![CDATA[$V{total8}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="04dacf11-4a2d-4c44-ba94-25e320a8ccec" mode="Opaque" x="1070" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="d97d7e8e-60fd-421e-9e6f-4ad099ffd1ec" mode="Opaque" x="830" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
 				<box>
 					<pen lineWidth="1.0"/>
 					<topPen lineWidth="1.0"/>
@@ -370,6 +387,21 @@
 					<font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
+				<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"/>
+				<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{total9}]]></textFieldExpression>
 			</textField>
 			<textField>
@@ -403,19 +435,18 @@
 				<textFieldExpression><![CDATA[$V{total1}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="d97d7e8e-60fd-421e-9e6f-4ad099ffd1ec" mode="Opaque" x="750" y="0" width="80" height="40" forecolor="#000000" backcolor="#F0F8FF"/>
+				<reportElement uuid="255b348c-9509-4830-af54-23a5c023f6ba" mode="Opaque" x="510" y="0" width="80" height="40" 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 textAlignment="Center" verticalAlignment="Middle" markup="none">
+					<font size="14" isBold="true"/>
 				</textElement>
-				<textFieldExpression><![CDATA[$V{total11}]]></textFieldExpression>
+				<textFieldExpression><![CDATA[$V{total12}]]></textFieldExpression>
 			</textField>
 		</band>
 	</summary>