Index: ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jrxml
===================================================================
diff -u -r28075 -r29890
--- ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jrxml	(.../departmentMonthDetailSupplierNameAndDiscountPrice.jrxml)	(revision 28075)
+++ ssts-web/src/main/webapp/jasperRtp/departmentMonthDetailSupplierNameAndDiscountPrice.jrxml	(.../departmentMonthDetailSupplierNameAndDiscountPrice.jrxml)	(revision 29890)
@@ -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="DepartmentMonthDetail" language="groovy" pageWidth="1440" pageHeight="875" columnWidth="1440" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="701ff2f7-7ef5-4278-be9c-7a914bd1521b">
 	<property name="ireport.zoom" value="0.75"/>
-	<property name="ireport.x" value="0"/>
+	<property name="ireport.x" value="52"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -28,6 +28,9 @@
 	<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
 		<defaultValueExpression><![CDATA["D:\\TDDOWNLOAD\\报表\\"]]></defaultValueExpression>
 	</parameter>
+	<parameter name="amountFormat" class="java.lang.String">
+		<defaultValueExpression><![CDATA[amountFormat]]></defaultValueExpression>
+	</parameter>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -174,28 +177,33 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{depart}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.0000;-###0.0000">
+			<textField pattern="">
 				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="1240" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalPrice}]]></textFieldExpression>
+				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
 			</textField>
 			<subreport runToBottom="false">
 				<reportElement uuid="17170695-399b-4463-ac82-477c70660490" stretchType="RelativeToBandHeight" mode="Transparent" x="100" y="0" width="1140" height="35"/>
 				<subreportParameter name="depart">
 					<subreportParameterExpression><![CDATA[$F{depart}]]></subreportParameterExpression>
 				</subreportParameter>
+				<subreportParameter name="amountFormat">
+					<subreportParameterExpression><![CDATA[$P{amountFormat}]]></subreportParameterExpression>
+				</subreportParameter>
 				<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($F{items})]]></dataSourceExpression>
 				<returnValue subreportVariable="totalAmount" toVariable="sum_amount" calculation="Sum"/>
 				<subreportExpression><![CDATA[$P{SUBREPORT_DIR} + "DepartmentMonthDetailSupplierNameAndDiscountPrice_child.jasper"]]></subreportExpression>
 			</subreport>
-			<textField pattern="###0.0000;-###0.0000">
+			<textField pattern="">
 				<reportElement uuid="3bf0b3ba-9ae6-4900-a6a4-24e5d640c09a" style="table_TD" stretchType="RelativeToBandHeight" x="1340" y="0" width="100" height="35" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalPriceDiscount}]]></textFieldExpression>
+				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
 			</textField>
 		</band>
 	</detail>
@@ -226,19 +234,21 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sum_amount}]]></textFieldExpression>
 			</textField>
-			<textField pattern="###0.0000;-###0.0000" isBlankWhenNull="true">
+			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="1240" y="0" width="100" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sum_totalPrice}]]></textFieldExpression>
+				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
 			</textField>
-			<textField pattern="###0.0000;-###0.0000" isBlankWhenNull="true">
+			<textField pattern="" isBlankWhenNull="true">
 				<reportElement uuid="b2102e6b-98c3-4da0-a39c-76db976a74ce" style="table_TH" x="1340" y="0" width="100" height="35" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="12" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{sum_totalPriceDiscount}]]></textFieldExpression>
+				<patternExpression><![CDATA[$P{amountFormat}]]></patternExpression>
 			</textField>
 		</band>
 	</summary>