Index: ssts-web/src/main/webapp/jasperRtp/disposableGoodsInvoiceStatistics.jrxml
===================================================================
diff -u -r27617 -r29860
--- ssts-web/src/main/webapp/jasperRtp/disposableGoodsInvoiceStatistics.jrxml	(.../disposableGoodsInvoiceStatistics.jrxml)	(revision 27617)
+++ ssts-web/src/main/webapp/jasperRtp/disposableGoodsInvoiceStatistics.jrxml	(.../disposableGoodsInvoiceStatistics.jrxml)	(revision 29860)
@@ -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="monthReprot" language="groovy" pageWidth="745" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="745" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0bd290f4-d9af-4361-beab-c67d72ddd234">
+<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="monthReprot" language="groovy" pageWidth="895" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="895" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="0bd290f4-d9af-4361-beab-c67d72ddd234">
 	<property name="ireport.zoom" value="1.0"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
@@ -116,6 +116,7 @@
 	<field name="amount" class="java.lang.Integer"/>
 	<field name="price" class="java.lang.Double"/>
 	<field name="totalPrice" class="java.lang.Double"/>
+	<field name="type" class="java.lang.String"/>
 	<variable name="totalAmountSummary" class="java.lang.Integer" calculation="Sum">
 		<variableExpression><![CDATA[$F{amount}]]></variableExpression>
 		<initialValueExpression><![CDATA[0]]></initialValueExpression>
@@ -130,7 +131,7 @@
 	<title>
 		<band height="34" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="711beec7-ac6a-4f51-a2a3-29cde6e39065" x="0" y="0" width="745" height="34"/>
+				<reportElement uuid="711beec7-ac6a-4f51-a2a3-29cde6e39065" x="0" y="0" width="895" height="34"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="18"/>
 				</textElement>
@@ -151,14 +152,14 @@
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="643ce9ac-71f9-49ef-a5ff-36b919d5af17" style="table_CH" x="275" y="50" width="150" height="25" backcolor="#D9EEDE"/>
+				<reportElement uuid="643ce9ac-71f9-49ef-a5ff-36b919d5af17" style="table_CH" x="425" y="50" width="150" height="25" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[规格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="7cba217c-f55e-49da-958f-0b48f82fcd60" style="table_CH" x="425" y="50" width="80" height="25" backcolor="#D9EEDE"/>
+				<reportElement uuid="7cba217c-f55e-49da-958f-0b48f82fcd60" style="table_CH" x="575" y="50" width="80" height="25" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12" isBold="true"/>
 				</textElement>
@@ -172,33 +173,40 @@
 				<text><![CDATA[序号]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="347e1193-6559-4321-91be-bbf2453f3868" x="0" y="15" width="745" height="24"/>
+				<reportElement uuid="347e1193-6559-4321-91be-bbf2453f3868" x="0" y="15" width="895" height="24"/>
 				<textElement verticalAlignment="Middle">
 					<font size="12" isBold="false"/>
 				</textElement>
 				<textFieldExpression><![CDATA["统计时间："+$P{startDay} + "~" +$P{endDay}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="40653210-a37f-4c33-9666-ebd687c04782" style="table_CH" x="585" y="50" width="80" height="25" backcolor="#D9EEDE"/>
+				<reportElement uuid="40653210-a37f-4c33-9666-ebd687c04782" style="table_CH" x="735" y="50" width="80" height="25" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="8693cfdc-bfba-4d64-8a17-68c002349640" style="table_CH" x="505" y="50" width="80" height="25" backcolor="#D9EEDE"/>
+				<reportElement uuid="8693cfdc-bfba-4d64-8a17-68c002349640" style="table_CH" x="655" y="50" width="80" height="25" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[价格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="8693cfdc-bfba-4d64-8a17-68c002349640" style="table_CH" x="665" y="50" width="80" height="25" backcolor="#D9EEDE"/>
+				<reportElement uuid="8693cfdc-bfba-4d64-8a17-68c002349640" style="table_CH" x="815" y="50" width="80" height="25" backcolor="#D9EEDE"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font fontName="宋体" size="12" isBold="true"/>
 				</textElement>
 				<text><![CDATA[金额]]></text>
 			</staticText>
+			<staticText>
+				<reportElement uuid="643ce9ac-71f9-49ef-a5ff-36b919d5af17" style="table_CH" x="275" y="50" width="150" height="25" backcolor="#D9EEDE"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font fontName="宋体" size="12" isBold="true"/>
+				</textElement>
+				<text><![CDATA[类型]]></text>
+			</staticText>
 		</band>
 	</columnHeader>
 	<detail>
@@ -211,14 +219,14 @@
 				<textFieldExpression><![CDATA[$F{goodsName}]]></textFieldExpression>
 			</textField>
 			<textField isBlankWhenNull="true">
-				<reportElement uuid="13b8cb68-fab2-4ae2-9744-9a3314211528" style="table_TD" x="275" y="0" width="150" height="24"/>
+				<reportElement uuid="13b8cb68-fab2-4ae2-9744-9a3314211528" style="table_TD" x="425" y="0" width="150" height="24"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{specification}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="a1e63503-a7f7-4f07-87d7-d188d639726e" style="table_TD" x="425" y="0" width="80" height="24"/>
+				<reportElement uuid="a1e63503-a7f7-4f07-87d7-d188d639726e" style="table_TD" x="575" y="0" width="80" height="24"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -232,32 +240,39 @@
 				<textFieldExpression><![CDATA[$F{sequence}]]></textFieldExpression>
 			</textField>
 			<textField pattern="">
-				<reportElement uuid="58118d8d-7be9-4943-a63b-e0c855e103bd" style="table_TD" x="585" y="0" width="80" height="24"/>
+				<reportElement uuid="58118d8d-7be9-4943-a63b-e0c855e103bd" style="table_TD" x="735" y="0" width="80" height="24"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{amount}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000">
-				<reportElement uuid="79092d3f-8166-4f1b-bca4-9ac044500f6d" style="table_TD" x="665" y="0" width="80" height="24"/>
+				<reportElement uuid="79092d3f-8166-4f1b-bca4-9ac044500f6d" style="table_TD" x="815" y="0" width="80" height="24"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalPrice}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000">
-				<reportElement uuid="79092d3f-8166-4f1b-bca4-9ac044500f6d" style="table_TD" x="505" y="0" width="80" height="24"/>
+				<reportElement uuid="79092d3f-8166-4f1b-bca4-9ac044500f6d" style="table_TD" x="655" y="0" width="80" height="24"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{price}]]></textFieldExpression>
 			</textField>
+			<textField isBlankWhenNull="true">
+				<reportElement uuid="13b8cb68-fab2-4ae2-9744-9a3314211528" style="table_TD" x="275" y="0" width="150" height="24"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle">
+					<font size="12"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$F{type}]]></textFieldExpression>
+			</textField>
 		</band>
 	</detail>
 	<summary>
 		<band height="50">
 			<staticText>
-				<reportElement uuid="11b12d61-88be-4942-822f-91d7a7e263fa" style="table_TH" x="50" y="0" width="535" height="25" backcolor="#F1FAF0"/>
+				<reportElement uuid="11b12d61-88be-4942-822f-91d7a7e263fa" style="table_TH" x="50" y="0" width="685" height="25" backcolor="#F1FAF0"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
@@ -271,15 +286,15 @@
 				<text><![CDATA[合计]]></text>
 			</staticText>
 			<textField pattern="###0" isBlankWhenNull="false">
-				<reportElement uuid="77795735-b5f8-4c90-a914-0633ef3dcdc6" style="table_TH" mode="Opaque" x="585" y="0" width="80" height="25" forecolor="#000000" backcolor="#F1FAF0"/>
+				<reportElement uuid="77795735-b5f8-4c90-a914-0633ef3dcdc6" style="table_TH" mode="Opaque" x="735" y="0" width="80" height="25" forecolor="#000000" backcolor="#F1FAF0"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{totalAmountSummary}]]></textFieldExpression>
 			</textField>
 			<textField pattern="###0.0000" isBlankWhenNull="false">
-				<reportElement uuid="77795735-b5f8-4c90-a914-0633ef3dcdc6" style="table_TH" mode="Opaque" x="665" y="0" width="80" height="25" forecolor="#000000" backcolor="#F1FAF0"/>
+				<reportElement uuid="77795735-b5f8-4c90-a914-0633ef3dcdc6" style="table_TH" mode="Opaque" x="815" y="0" width="80" height="25" forecolor="#000000" backcolor="#F1FAF0"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none">
 					<font fontName="SansSerif" size="12" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
 					<paragraph lineSpacing="Single"/>