Index: ssts-web/src/main/webapp/jasperRtp/stocktakereport.jasper
===================================================================
diff -u -r13182 -r13210
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml
===================================================================
diff -u -r13182 -r13210
--- ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml	(.../stocktakereport.jrxml)	(revision 13182)
+++ ssts-web/src/main/webapp/jasperRtp/stocktakereport.jrxml	(.../stocktakereport.jrxml)	(revision 13210)
@@ -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="stocktakereport" language="groovy" pageWidth="1115" pageHeight="842" columnWidth="1115" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" isIgnorePagination="true" uuid="a813b6db-4e55-4ef8-a8ce-e83c651d3cdf">
 	<property name="ireport.zoom" value="1.0"/>
-	<property name="ireport.x" value="30"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<style name="table">
 		<box>
@@ -114,119 +114,119 @@
 	<columnHeader>
 		<band height="40" splitType="Stretch">
 			<staticText>
-				<reportElement uuid="46391ac5-396c-4bfa-8df5-205aa905ba64" style="table_CH" x="0" y="0" width="110" height="40"/>
+				<reportElement uuid="46391ac5-396c-4bfa-8df5-205aa905ba64" style="table_CH" x="0" y="0" width="110" height="40" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[物品类型]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="ab1ca81d-da24-4f55-b471-ad1bd7b75888" style="table_CH" x="110" y="0" width="71" height="40"/>
+				<reportElement uuid="ab1ca81d-da24-4f55-b471-ad1bd7b75888" style="table_CH" x="110" y="0" width="71" height="40" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[存货编号]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="136f9d3e-c303-4ac7-908b-acc7d0524de8" style="table_CH" x="181" y="0" width="183" height="40"/>
+				<reportElement uuid="136f9d3e-c303-4ac7-908b-acc7d0524de8" style="table_CH" x="181" y="0" width="183" height="40" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[物品名称]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="628ee579-96ec-4e5a-94ea-7da4d7070bf5" style="table_CH" x="364" y="0" width="100" height="40"/>
+				<reportElement uuid="628ee579-96ec-4e5a-94ea-7da4d7070bf5" style="table_CH" x="364" y="0" width="100" height="40" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[规格]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="38591c6f-7d53-472c-afaa-fdd1ec05ae17" style="table_CH" x="464" y="0" width="50" height="40"/>
+				<reportElement uuid="38591c6f-7d53-472c-afaa-fdd1ec05ae17" style="table_CH" x="464" y="0" width="50" height="40" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[单位]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="514" y="0" width="150" height="20"/>
+				<reportElement uuid="1e0c467e-091c-40d8-a788-73524bcb22ec" style="table_CH" x="514" y="0" width="150" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[期初库存]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="664" y="0" width="150" height="20"/>
+				<reportElement uuid="c2874ef2-6a3e-46a6-894c-8ca3478aadc3" style="table_CH" x="664" y="0" width="150" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[本期入库]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="814" y="0" width="150" height="20"/>
+				<reportElement uuid="5af7e6a2-e03e-484a-8b9f-527fab68757a" style="table_CH" x="814" y="0" width="150" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[本期出库]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="964" y="0" width="150" height="20"/>
+				<reportElement uuid="a539df98-c0b1-4a94-b5f4-f94c36eb973f" style="table_CH" x="964" y="0" width="150" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[期末余数]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="e8d84f53-f4f6-408b-8393-9d6a661e4b24" style="table_CH" x="514" y="20" width="75" height="20"/>
+				<reportElement uuid="e8d84f53-f4f6-408b-8393-9d6a661e4b24" style="table_CH" x="514" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="78bc4a86-3d5c-4d7c-b57e-5f30a14a2ddc" style="table_CH" x="589" y="20" width="75" height="20"/>
+				<reportElement uuid="78bc4a86-3d5c-4d7c-b57e-5f30a14a2ddc" style="table_CH" x="589" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[金额]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="c7920710-66c2-4247-86eb-48781f277220" style="table_CH" x="664" y="20" width="75" height="20"/>
+				<reportElement uuid="c7920710-66c2-4247-86eb-48781f277220" style="table_CH" x="664" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="09aeea6a-6a40-461f-9332-fb24b9fefaac" style="table_CH" x="739" y="20" width="75" height="20"/>
+				<reportElement uuid="09aeea6a-6a40-461f-9332-fb24b9fefaac" style="table_CH" x="739" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[金额]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="50ae18ea-d997-4b1b-b248-e509921e0029" style="table_CH" x="814" y="20" width="75" height="20"/>
+				<reportElement uuid="50ae18ea-d997-4b1b-b248-e509921e0029" style="table_CH" x="814" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="a53a3102-dc49-4b56-a79f-5a521519576f" style="table_CH" x="889" y="20" width="75" height="20"/>
+				<reportElement uuid="a53a3102-dc49-4b56-a79f-5a521519576f" style="table_CH" x="889" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[金额]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="6d710490-c0a3-493a-b847-dcaf8fc095a3" style="table_CH" x="964" y="20" width="75" height="20"/>
+				<reportElement uuid="6d710490-c0a3-493a-b847-dcaf8fc095a3" style="table_CH" x="964" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
 				<text><![CDATA[数量]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="0a932323-f4ea-4e68-9bb2-d62f96fc5498" style="table_CH" x="1039" y="20" width="75" height="20"/>
+				<reportElement uuid="0a932323-f4ea-4e68-9bb2-d62f96fc5498" style="table_CH" x="1039" y="20" width="75" height="20" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14" isBold="true"/>
 				</textElement>
@@ -332,63 +332,63 @@
 	<summary>
 		<band height="46" splitType="Stretch">
 			<textField>
-				<reportElement uuid="f1f9b1da-77be-4e76-aff9-f4257ead703d" style="table_CH" x="514" y="0" width="75" height="25"/>
+				<reportElement uuid="f1f9b1da-77be-4e76-aff9-f4257ead703d" style="table_CH" x="514" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tAmount1}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="8c9274a4-5688-450e-bfc9-e767f043f3ca" style="table_CH" x="589" y="0" width="75" height="25"/>
+			<textField pattern="###0.00;-###0.00">
+				<reportElement uuid="8c9274a4-5688-450e-bfc9-e767f043f3ca" style="table_CH" x="589" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tPrice1}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="4bdb4873-b36a-4ccd-93c5-325a370a2876" style="table_CH" x="664" y="0" width="75" height="25"/>
+				<reportElement uuid="4bdb4873-b36a-4ccd-93c5-325a370a2876" style="table_CH" x="664" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tAmount2}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="42ffe661-0300-4bde-8faf-0b54f0d4e562" style="table_CH" x="739" y="0" width="75" height="25"/>
+			<textField pattern="###0.00;-###0.00">
+				<reportElement uuid="42ffe661-0300-4bde-8faf-0b54f0d4e562" style="table_CH" x="739" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tPrice2}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="3482860a-6617-4d48-aeb6-463517847711" style="table_CH" x="814" y="0" width="75" height="25"/>
+				<reportElement uuid="3482860a-6617-4d48-aeb6-463517847711" style="table_CH" x="814" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tAmount3}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="d163fb0a-e81a-4e05-80f4-6a0259af3515" style="table_CH" x="889" y="0" width="75" height="25"/>
+			<textField pattern="###0.00;-###0.00">
+				<reportElement uuid="d163fb0a-e81a-4e05-80f4-6a0259af3515" style="table_CH" x="889" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tPrcie3}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a56c82a9-1351-4fd3-ae87-15a083679995" style="table_CH" x="964" y="0" width="75" height="25"/>
+				<reportElement uuid="a56c82a9-1351-4fd3-ae87-15a083679995" style="table_CH" x="964" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tAmount4}]]></textFieldExpression>
 			</textField>
-			<textField>
-				<reportElement uuid="bc6f9367-ca6c-43f0-887c-1a888521ce74" style="table_CH" x="1039" y="0" width="75" height="25"/>
+			<textField pattern="###0.00;-###0.00">
+				<reportElement uuid="bc6f9367-ca6c-43f0-887c-1a888521ce74" style="table_CH" x="1039" y="0" width="75" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$V{tPrice4}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="c0891057-1a4b-4ec3-bb74-578887292def" style="table_CH" x="0" y="0" width="514" height="25"/>
+				<reportElement uuid="c0891057-1a4b-4ec3-bb74-578887292def" style="table_CH" x="0" y="0" width="514" height="25" backcolor="#FFFFFF"/>
 				<textElement textAlignment="Center" verticalAlignment="Middle">
 					<font size="14"/>
 				</textElement>