Index: ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml
===================================================================
diff -u -r12331 -r12607
--- ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml	(.../tousseDeliverDetailReport.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/tousseDeliverDetailReport.jrxml	(.../tousseDeliverDetailReport.jrxml)	(revision 12607)
@@ -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="tousseDeliverDetailReport" language="groovy" pageWidth="500" pageHeight="842" columnWidth="460" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="d128e6ed-b032-4c73-9a65-b0a6c94a3b23">
-	<property name="ireport.zoom" value="1.5"/>
+<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="tousseDeliverDetailReport" language="groovy" pageWidth="820" pageHeight="660" columnWidth="820" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="d128e6ed-b032-4c73-9a65-b0a6c94a3b23">
+	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table_TH" mode="Opaque" backcolor="#F0F8FF">
@@ -13,16 +13,42 @@
 			<pen lineWidth="0.5" lineColor="#000000"/>
 		</box>
 	</style>
+	<style name="table">
+		<box>
+			<pen lineWidth="1.0" lineColor="#000000"/>
+		</box>
+	</style>
+	<style name="table_CH" mode="Opaque" backcolor="#BFE1FF">
+		<box>
+			<pen lineWidth="0.5" lineColor="#000000"/>
+		</box>
+	</style>
+	<subDataset name="Table Dataset 1" uuid="9a10c424-21e5-4322-8bed-3e130df23655"/>
 	<parameter name="title" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
 	<field name="materialAmount" class="java.lang.Integer">
 		<fieldDescription><![CDATA[materialAmount]]></fieldDescription>
 	</field>
+	<field name="packingAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[packingAmount]]></fieldDescription>
+	</field>
+	<field name="recyclingAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[recyclingAmount]]></fieldDescription>
+	</field>
+	<field name="reviewAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[reviewAmount]]></fieldDescription>
+	</field>
+	<field name="sendOutAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sendOutAmount]]></fieldDescription>
+	</field>
 	<field name="serialNumber" class="java.lang.Integer">
 		<fieldDescription><![CDATA[serialNumber]]></fieldDescription>
 	</field>
+	<field name="sterilizationAmount" class="java.lang.Integer">
+		<fieldDescription><![CDATA[sterilizationAmount]]></fieldDescription>
+	</field>
 	<field name="tousseAmount" class="java.lang.Integer">
 		<fieldDescription><![CDATA[tousseAmount]]></fieldDescription>
 	</field>
@@ -35,10 +61,22 @@
 	<variable name="mAmount" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{materialAmount}]]></variableExpression>
 	</variable>
+	<variable name="rAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{recyclingAmount}]]></variableExpression>
+	</variable>
+	<variable name="pAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{packingAmount}]]></variableExpression>
+	</variable>
+	<variable name="reAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{reviewAmount}]]></variableExpression>
+	</variable>
+	<variable name="sAmount" class="java.lang.Integer" calculation="Sum">
+		<variableExpression><![CDATA[$F{sterilizationAmount}]]></variableExpression>
+	</variable>
 	<title>
-		<band height="40" splitType="Stretch">
+		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="460" height="40"/>
+				<reportElement uuid="5286744f-96b7-4890-aec7-99ef9eb1a7b3" x="0" y="0" width="799" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -49,90 +87,174 @@
 	<columnHeader>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="63311c44-fa9e-46ac-92b9-56a100d0b96f" style="table_TH" x="0" y="0" width="80" height="30"/>
+				<reportElement uuid="63311c44-fa9e-46ac-92b9-56a100d0b96f" style="table_TH" x="0" y="0" width="56" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[序号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ca54655f-2bb8-425b-9903-f42630e74465" style="table_TH" x="80" y="0" width="180" height="30"/>
+				<reportElement uuid="ca54655f-2bb8-425b-9903-f42630e74465" style="table_TH" x="56" y="0" width="204" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[器械包名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="260" y="0" width="100" height="30"/>
+				<reportElement uuid="7e199088-76ed-4abd-b0d8-48ac92f129e2" style="table_TH" x="619" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械包数量]]></text>
+				<text><![CDATA[发货数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="360" y="0" width="100" height="30"/>
+				<reportElement uuid="b7709dc1-5b04-4320-b580-07dd8b6092a1" style="table_TH" x="709" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
-				<text><![CDATA[器械材料数量]]></text>
+				<text><![CDATA[发货器械数量]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="e175ace2-26cc-4f31-8175-e858554a772d" style="table_TH" x="260" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[回收数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="96b2b440-c01f-41c5-b355-89635c08bcce" style="table_TH" x="349" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[装配数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="3b548f4b-bd46-4358-8eb1-dd4cee91f549" style="table_TH" x="439" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[审核数量]]></text>
+			</staticText>
+			<staticText>
+				<reportElement uuid="67af36bc-f6bc-40f9-9c1a-5acac42f9b45" style="table_TH" x="529" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[灭菌数量]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
 		<band height="30" splitType="Stretch">
 			<textField>
-				<reportElement uuid="0576eced-33f4-4ada-85a6-ebdf49f79080" style="table_TD" x="0" y="0" width="80" height="30"/>
+				<reportElement uuid="0576eced-33f4-4ada-85a6-ebdf49f79080" style="table_TD" x="0" y="0" width="56" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{serialNumber}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="f800d674-5ea5-4108-ac94-9f34d9e7a53b" style="table_TD" x="80" y="0" width="180" height="30"/>
+				<reportElement uuid="f800d674-5ea5-4108-ac94-9f34d9e7a53b" style="table_TD" x="56" y="0" width="204" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseName}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="260" y="0" width="100" height="30"/>
+				<reportElement uuid="da045ae7-2d36-46b1-a8b8-a58212e4a186" style="table_TD" x="619" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{tousseAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="360" y="0" width="100" height="30"/>
+				<reportElement uuid="b92774f8-3224-45f4-aab8-95b6ad2ba2bf" style="table_TD" x="709" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{materialAmount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="2b5008cf-800d-4476-82c1-64403e67f6fc" style="table_TD" x="260" y="0" width="89" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{recyclingAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="cd906c58-422b-4aaa-ad26-201597026308" style="table_TD" x="439" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{reviewAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="cf64ddaf-566e-411b-af7a-f3c51a845c1a" style="table_TD" x="529" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{sterilizationAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="0e898ad6-77eb-4dd8-943c-be899267c173" style="table_TD" x="349" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{packingAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
 		<band height="30" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="85766b43-0bf1-4f42-9c16-0b1026261597" style="table_TD" x="0" y="0" width="260" height="30"/>
+				<reportElement uuid="85766b43-0bf1-4f42-9c16-0b1026261597" style="table_CH" x="0" y="0" width="260" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
+					<font size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_TD" x="260" y="0" width="100" height="30"/>
+				<reportElement uuid="ae3d31fc-9be6-49af-b773-3cc591934f1b" style="table_CH" x="619" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
+					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tAmount}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_TD" x="360" y="0" width="100" height="30"/>
+				<reportElement uuid="29461f63-fd70-4147-abeb-37682027fcd7" style="table_CH" x="709" y="0" width="90" height="30"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
-					<font size="12"/>
+					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{mAmount}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="001a07c0-d9e9-4451-a9e8-498bee7585b3" style="table_CH" x="260" y="0" width="89" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{rAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="4a259d60-fb06-43f6-950f-eb6abf19026c" style="table_CH" x="349" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{pAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="faac7f2d-65df-4ee1-8d25-4e6c572c4a66" style="table_CH" x="439" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{reAmount}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="602cd463-0838-48ae-878f-e5aafb8f80d2" style="table_CH" x="529" y="0" width="90" height="30"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12" isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$V{sAmount}]]></textFieldExpression>
+			</textField>
 		</band>
 	</summary>
 </jasperReport>